Emil Axelsson
4c2f72226f
Performance Optimizations ( #450 )
...
* Make derived transform classes less involved in simulation state
* Add performance measurements in openspaceengine
* Avoid redundant transformation lookups
* Fix bug causing redundant calls to GPULayerManager::bind
* Move water reflectance to alpha component of normal buffer. Remove otherData buffer.
2018-01-08 09:43:41 +01:00
Alexander Bock
4d58a2ae98
Render On-Screne Dashboard also for non-linear projections
2018-01-01 13:17:32 -05:00
Alexander Bock
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
Alexander Bock
cc178d03f3
Remove clang warnings
...
Update SGCT repository
2017-12-29 19:47:33 +01:00
Alexander Bock
c9a3c68f19
Fix style guide issues
...
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
1ddde4b6e1
Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
...
# Conflicts:
# data/scene/default.scene
# data/scene/digitaluniverse/abell/abell.mod
# data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
# data/scene/digitaluniverse/constellations/constellations.mod
# data/scene/digitaluniverse/grids/grids.mod
# data/scene/digitaluniverse/quasars/quasars.mod
# data/scene/digitaluniverse/sloandss/sloandss.mod
# data/scene/digitaluniverse/tully/tully.data
# data/scene/digitaluniverse/tully/tully.mod
# data/scene/earth/earth.mod
# data/scene/grids/grids.mod
# data/scene/mars/mars.mod
# data/scene/milkyway/digitaluniverse/digitaluniverse.mod
# data/scene/moon/moon.mod
# data/scene/satellites/tle/geo.txt
# data/scene/satellites/tle/gps-ops.txt
# data/scene/satellites/tle/stations.txt
# modules/imgui/src/renderproperties.cpp
# modules/sync/ext/libtorrent
# openspace.cfg
# src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
Alexander Bock
59916bc0c1
Renaming path tokens
...
- ${BASE_PATH} -> ${BASE}
- ${OPENSPACE_DATA} -> ${DATA}
- Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01:00
Emil Axelsson
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
Jonathas Costa
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
Alexander Bock
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -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
952f8e8e13
Merged master into NewAtmosphere.
2017-12-12 13:43:40 -05:00
Alexander Bock
a631b7e0a3
Making most logger categories constexpr
2017-12-11 23:46:34 -05:00
Jonathas Costa
5eb11cfc49
Merged master into NewAtmosphere.
2017-12-07 11:31:51 -05:00
Emil Axelsson
f33b24d551
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-07 11:44:14 +01:00
Alexander Bock
6be6149e02
Remove deprecation warning from camera functions
...
Fix compile warning
2017-12-06 17:00:50 -05:00
Jonathas Costa
f698a3de09
Merged master into NewAtmosphere.
2017-12-04 12:19:40 -05:00
Emil Axelsson
fb675dfeab
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-04 10:52:12 +01:00
Alexander Bock
12ddfae337
Compile fix in TimeConversion
...
Reenable display of shutdown timer
Add prompt informing the user of ability to abort
2017-11-30 21:20:16 -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
Jonathas Costa
67033c4583
Tentative fix for billbords alingment problems.
2017-11-15 17:35:00 -05:00
Emil Axelsson
19812af629
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-11 19:10:42 +01:00
Alexander Bock
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
Emil Axelsson
916f94d70e
Terminate torrent thread on destruction
2017-11-10 16:42:55 +01:00
Emil Axelsson
cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01: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
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Jonathas Costa
9885c00beb
Performance improved atmosphere.
2017-11-07 15:57:25 -05:00
Alexander Bock
80f5706049
Remove warnings on Clang
2017-11-07 09:19:45 -06:00
Emil Axelsson
43664d34b7
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-05 20:04:47 +01: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
Emil Axelsson
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02: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
637e74a9dc
Merged master into NewAtmosphere.
2017-10-19 14:23:06 -04:00
Emil Axelsson
97f78a09df
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-19 10:27:34 +02:00
Alexander Bock
5a3bec253f
Merge branch 'master' into feature/DU
2017-10-18 18:51:51 -04:00
Alexander Bock
b3baf72f49
Correctly align shutdown information
2017-10-18 10:18:03 -04:00
Alexander Bock
7377d63794
Clean up digitaluniverse data folder
...
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
Jonathas Costa
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
Alexander Bock
7520edab83
Added first version of mission visualization
2017-10-16 10:23:00 -04:00
Emil Axelsson
4cdae984e9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-09-11 11:52:31 +02:00
Alexander Bock
c3825cc81e
Only display commit hash text overlay if there is information available
...
Add version and commit information into a global property
2017-08-31 11:37:22 -04: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