mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,148 Commits 99 Branches 46 Tags
eead4b7f25fb00f970135adea4c45b89b54067e2
Commit Graph

1336 Commits

Author SHA1 Message Date
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Alexander Bock
167222c814 Feature/dashboard (#431) 
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable

* Add Onscreen Dashboard
  * Add Dashboard class
  * Add DashboardItem classes and subclasses
  * Added font and fontsize customization to dashboarditems
  * Add default dashboard specifications to all scenes
  * Add tests.scene to test dashboard items
  * Add configuration options to DashboardItemDistance
  * Fix distance conversion to correctly use singular or plural values
  * Make DashboardItems unique when adding them to a dashboard
  * Correctly position test with different font sizes
  * Add Dashboard Item that enables spacing between other items
  * Add performance measurement to dashboard rendering
  * Add method to DashboardItemDistance that computes distance to surface
  * Add DashboardItemAngle that computes and prints the angle between three objects
  * Add DashboardItemInstruments that shows the instruments on New Horizons
  * Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
  * Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
 2017-12-13 17:11:54 -05:00
Alexander Bock
7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -05:00
Alexander Bock
2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere 
# Conflicts:
#	modules/imgui/src/renderproperties.cpp
 2017-12-11 09:12:13 -05:00
Alexander Bock
c9aedb084b Add Lua functions to query keyboard bindings and remove individual keybinds 
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
 2017-12-08 14:58:18 -05:00
Alexander Bock
0af3233f53 Move Space/Time component into simple menu version 
Move regular menu to F3
Move easy menu to F2
Remove extra text
 2017-12-07 17:06:55 -05:00
Jonathas Costa
5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -05:00
Alexander Bock
a406aaf039 Merge branch 'feature/guisorting' 
# Conflicts:
#	modules/imgui/include/guipropertycomponent.h
#	modules/imgui/src/guipropertycomponent.cpp
 2017-12-07 01:15:52 -05:00
Alexander Bock
20bdb7b2b4 Use the 4K milkyway texture on default for better performance 
Make featured properties and space/time widget easy to disable
Add setting for setting the bounds of the delta time slider
Add exponent to all numerical properties and use where appropriate
Add properties to Guicomponents that collapse the title bar
Add new F2 key to only display the main property window
 2017-12-07 01:05:03 -05:00
Alexander Bock
be98c3d784 Add TemplateProperty<std::vector<std::string>> as StringListProperty 
Add default gui sorting to all scenes
 2017-12-06 17:04:10 -05:00
Alexander Bock
6be6149e02 Remove deprecation warning from camera functions 
Fix compile warning
 2017-12-06 17:00:50 -05:00
Jonathas Costa
a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Alexander Bock
87b4ec03eb Display error message on loading screen in case of catastrophic scene loading (closes #423) 2017-11-30 21:49:39 -05:00
Alexander Bock
38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock
8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue) 
Add Dashboard for on-screen information (#closes 201)
 2017-11-26 14:46:54 -05:00
Jonathas Costa
6363fc0bb2 Added missing include and merged master into NewAtmosphere. 2017-11-25 22:39:18 -05:00
Alexander Bock
026f51735b Show distance from current focus object 
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
 2017-11-25 18:30:13 -05:00
Alexander Bock
0c18263de7 Issue/417 (#421) 
Added support for multiple windows in ImGui
 2017-11-24 11:00:53 -05:00
Alexander Bock
719130b6b7 Jenkinswarnings (#419) 
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
 2017-11-16 21:19:28 -05:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -05:00
Alexander Bock
3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05:00
Alexander Bock
f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
 2017-11-12 10:50:11 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock
f183b9536f Implement GUI button and featured elements on touchbar 2017-11-10 13:19:46 -05:00
Alexander Bock
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line 
More work on coding style
 2017-11-09 23:47:51 -05:00
Alexander Bock
aa20c677dd Move onscreen rendering into SGCT's render2D function (closes #181) 
Same fix makes GUI windows work again (closes #412)
 2017-11-09 18:12:13 -05:00
Jonathas Costa
929bd9ae05 Merged. 2017-11-09 15:46:46 -05:00
Alexander Bock
0015cbb6f6 Finalize the loadingscreen before initializing GL part of the scene 
Correctly use screen aspect ratio to render the loading screen box
 2017-11-09 12:47:28 -05:00
Alexander Bock
dc85ee6cd7 Highlight nodes if they have an error 2017-11-09 10:51:07 -05:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
 2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351 Cleanup for coding style 
Add strict mode to check_style_guide script
 2017-11-08 10:35:39 -06:00
Alexander Bock
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson
3d9481a4fc Make screen log thread safe 2017-11-07 00:14:50 +01:00
Alexander Bock
bc4e0e4af0 Refactor item overlap and add standoff distance 2017-11-06 11:02:58 -06:00
Alexander Bock
dc9831b6a6 Add progress bar to the loading screen 
Add configuration options to customize the loading screen
 2017-11-05 14:49:46 -05:00
Alexander Bock
6ecb180ac0 Some more work on rendering loading screen information 2017-11-04 11:12:22 -04:00
Alexander Bock
735d6378d9 More work on loading screen 
Multithreaded SceneGraphNode initialization
 2017-11-03 14:06:51 -04:00
Alexander Bock
9577f2dd49 Start adding loading screen code 2017-11-02 16:56:49 -04:00
Jonathas Costa
45df1d498a Fixed ATM acne after changing the MSAA patterns. 2017-11-02 15:05:32 -04:00
Alexander Bock
78e3320cde Separate Renderable::initialize into initialize and initializeGL functions 
Handle initialize in a separate thread and display rudimentary loading screen
 2017-11-02 14:27:35 -04:00
Jonathas Costa
024e53e738 Merge branch 'master' into feature/NewAtmosphere 2017-11-01 16:08:12 -04:00
Alexander Bock
0f8adec9aa Show on-screen information about friction status 2017-10-30 14:28:03 -04:00
Jonathas Costa
698bb25342 Access to the number of samples in msaa. 2017-10-25 15:05:33 -04:00
Jonathas Costa
72e6474816 Added MSAA sampling pattern retriever. 2017-10-25 14:11:20 -04:00
Jonathas Costa
2b0d00b785 Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-10-24 21:15:20 -04:00
Jonathas Costa
0b49973971 Fixing MSAA problems with ATM. 2017-10-24 19:20:37 -04:00
Alexander Bock
50fd9309ba Merge branch 'master' into feature/NewAtmosphere 
# Conflicts:
#	src/rendering/renderengine.cpp
 2017-10-24 15:30:22 -04:00
Alexander Bock
1c2622248c Remove unused shaders 2017-10-24 03:35:41 -07:00