785d0ad294
Changes in framebuffer and atm code fixing wrong merge (still need clean up).
2018-03-19 12:29:05 -04:00
df68ab557d
* Rudimentary fix to make side_by_side stereo work in master
...
* Fix Triton asset file
* Display an error if no Property matches a regex in setPropertyValue
* Correct user-facing name for some Moon assets
* Add fade in and fade out helping functions
* Reenable label fading in New Horizons
* Added GUI hint to hide uninteresting nodes
* Set Hidden Hint on barycenter nodes
2018-03-17 16:54:42 -04:00
721bdfa752
Merged.
2018-03-16 15:17:13 -04:00
db7ae7e384
Issue/453 ( #556 )
...
* Introduced guiName to PropertyOwner
* Added requirement that PropertyOwner::identifier may not contain whitespaces
* Changed Name to Identifier in asset and scene files
* Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
* Moved Name and GuiPath into GUI group
* Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
34187bc065
Update use of stb_image flags (and ghoul ref)
2018-03-15 16:25:07 -04:00
7b99519ec4
Merge branch 'master' into feature/PerformanceATM_and_Stereo
2018-03-15 10:58:51 -04:00
d1cdc3d26f
Merge branch 'master' into feature/PerformanceATM
...
# Conflicts:
# data/assets/default.scene
# data/assets/scene/solarsystem/planets/earth/earth.asset
2018-03-14 23:26:56 -04:00
d34244ddca
Fixed merging between PerformanceATM and Stereo.
2018-03-14 14:56:51 -04:00
cc81c125b4
Merged with problems.
2018-03-14 14:43:16 -04:00
2bfab657f3
Various small fixes
2018-03-14 13:13:23 -04:00
1feb3ea771
Merge branch 'master' into feature/PerformanceATM
2018-03-13 16:51:51 -04:00
737e82584a
Issue/24 ( #549 )
...
* Implemented property animation mechanism
* Added easing functions to Ghoul and make them usable in animation
* Make sure that we don't leave properties around if SceneGraphNodes are deleted
* Adding opacity settings to base renderables
2018-03-13 10:35:10 -04:00
f38c26eff0
Remove warnings
2018-03-12 22:31:01 +01:00
9709b22bac
Turn Configuration keys from std::string to constexpr const char* for better startup performance
2018-03-08 19:24:03 +01:00
ae3b6fe850
Support stb_image based texture reader ( closes #541 )
2018-03-08 17:38:35 +01:00
5a3ef0fda2
Apply coding styles
2018-03-08 05:32:46 -05:00
c5c95a5640
Introduce property to toggle dashboard globally ( closes #545 )
2018-03-08 03:04:57 -05:00
a744bce0bd
Merge branch 'master' into feature/PerformanceATMOnline
2018-03-07 19:07:45 -05:00
a3c849843f
Feature/new formatting ( #547 )
...
* Change to new logging format (closes #542 )
* Adds a screenshots folder that uses the application startup time
* Creating focus nodes for VRT files if the info files contain location information
* Fix issue with removing virtual properties
* Add a method for returning the cartesian coordinates for a geolocation on a planet
2018-03-07 18:10:32 -05:00
1b9622c7dd
Improved performance in shaders and transformations.
2018-03-01 16:24:20 -05:00
35fd2f79a8
Include additional performance measurement hooks into the Framebufferenderer
2018-02-28 09:07:26 -05:00
9a00f38e09
Feature/jenkins warnings ( #538 )
...
* Remove warnings from Jenkins
* Improve Jenkins behavior
2018-02-28 08:41:55 -05:00
9f90c6c39d
Reuse the same font renderer program object between DU rendering classes
...
Working towards #525
2018-02-26 23:13:04 -05:00
58f79a8851
Issue/518 ( #529 )
...
* Adding ScreenSpaceSpout object to display spout textures in screen space
* Enable the clearing of option properties
* Fix crash in ScreenSpaceImageLocal specification
* Split RenderablePlane into RenderablePlaneImageLocal and RenderablePlaneImageOnline
* Add RenderablePlane Spout
* Rename Texture parameter in ScreenSpaceImageOnline into URL
Closes #518
2018-02-23 13:24:35 -05:00
5a23a3e93f
Fix atmosphere stereo bugs
2018-02-19 22:11:12 +01:00
0f7ca1790f
Do not clear the default fbo in framebuffer renderer. Already handled by SGCT.
2018-02-19 14:22:57 +01:00
6d76080370
Simplify script precondition argument checks
2018-02-15 17:56:12 -05:00
475a9f6937
Hide the overlay information on slave nodes
2018-02-15 10:37:49 -05:00
b4a6fa2308
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/stereo
2018-02-14 15:06:12 +01:00
499879c84e
Start to implement stereo support with adaptive stereoscopic depth
2018-02-14 15:05:52 +01:00
a85eddff4e
Clean up lua stack and weak pointers
2018-02-09 16:44:34 +01:00
001dea3a62
Add resource synchronization percentage to loading screen
2018-01-11 09:41:39 +01:00
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
4d58a2ae98
Render On-Screne Dashboard also for non-linear projections
2018-01-01 13:17:32 -05:00
47233b8e6f
Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases
2017-12-31 17:31:10 -05:00
6089449bba
Fix crash with MSAA buffer generation when compiling in Debug on Windows
...
Cleanup of logging behavior
2017-12-30 20:24:05 -05:00
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
cc178d03f3
Remove clang warnings
...
Update SGCT repository
2017-12-29 19:47:33 +01:00
c9a3c68f19
Fix style guide issues
...
Update Ghoul repository
2017-12-29 19:18:06 +01:00
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
fac3780ce9
Remove warnings on MacOS
2017-12-26 23:06:11 +01:00
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
fb8114f5fc
Cleanup of Earth, Moon, and Mars WMS configuration files
2017-12-26 19:45:33 +01:00
dd689b6ac1
Fix size of the logo on the loading screen
...
Reduce the font size on the loading screen
Add moons to Neptune and Uranus
Fix specification of Mercury
2017-12-26 17:20:06 +01:00
376135a748
Add color specification for synchronization phase to the loading screen
...
Increase the buffer size in the SpiceManager to prepare for larger jupiter kernels
2017-12-26 10:52:02 +01:00
73354e87d8
Removed pointer from renderer.
2017-12-21 11:11:50 -05:00
3ea918b818
Multiples fixes and added max text size for grids.
2017-12-19 17:49:30 -05:00
db668b5342
Some changes to PR #432
2017-12-18 16:25:02 -05:00
c7a784f01e
Updated absPath in shaders compilation.
2017-12-18 10:26:26 -05:00
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
Jonathas Costa