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

440 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
Jonathas Costa
5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -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
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -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
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
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
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
9b6028028a Clean up RenderEngine 2017-10-24 03:16:29 -07:00
Jonathas Costa
d36e32e560 Merged master into NewAtmosphere. 2017-10-17 20:14:41 -04:00
Alexander Bock
aa969795cc Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296) 2017-10-10 14:16:55 -04:00
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350) 
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
 2017-09-22 12:03:23 +02:00
Alexander Bock
0ceab49df7 Update gitignore to include Mars texture 
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
 2017-08-30 14:56:02 -04:00
Jonathas Costa
2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Jonathas Costa
758ee8bd6d Pull request changes. 2017-08-15 18:15:56 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381) 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
 2017-08-14 09:38:32 -04:00
Alexander Bock
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Jonathas Costa
a55110e286 Merged master info NewAtmosphere. 2017-07-27 17:13:42 -04:00
Alexander Bock
59bccd040d Cleanup changes 2017-07-26 17:29:57 -04:00
Alexander Bock
1a475ef570 Started documenting properties 
Cleanup of Nagivationhandler properties
 2017-07-24 00:15:45 -04:00
Jonathas Costa
20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Alexander Bock
008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Alexander Bock
0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Jonathas Costa
4842b21db4 Fixed atmosphere module name header guard. 2017-07-17 16:54:13 -04:00