d7bb984cae
Merged master.
2018-03-19 19:16:05 -04:00
ce392b53e6
Same changes in stereo.
2018-03-19 15:17:15 -04:00
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
39855e1512
Updated names in atmosphere code.
2018-03-16 15:01:34 -04:00
32632f2df0
Fix visibility settings for GuiPropertyComponent in Debug builds
...
Fix Lua state leaking when setting delta time
2018-03-16 10:41:45 -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
7a93a4fa37
Issue/558 ( #559 )
...
* Removed unused cached uniforms from execution.
2018-03-16 09:19:39 -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
b625a0538d
Simplification of the satellite asset
...
Add more satellites
2018-03-14 17:44:08 -04:00
cc81c125b4
Merged with problems.
2018-03-14 14:43:16 -04:00
9558d58cee
Preparing branch for merging with stereo
2018-03-14 14:20:12 -04:00
206ff69e41
Fixed normals. ( #553 )
2018-03-14 13:18:19 -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
cf3992bbc8
Merge remote-tracking branch 'origin/feature/shader-const'
2018-03-10 19:33:09 -05:00
31cdee1fa1
Make URLSynchronization and HTTPSynchronization download into temporary files and if the download succeeds, transactionally move the temporary file into the correct destination
2018-03-10 05:08:14 -05:00
5b6ae62bab
Add Override parameter for URLSynchronization
...
Add PerformShading asset parameter for RenderablePlanet
Disable shading on default for Earth
2018-03-09 11:42:32 -05:00
92a168f644
Fixes in fieldlinesequence
2018-03-09 02:46:55 -05:00
7ccb42545c
Remove Clang warnings
2018-03-08 20:18:18 +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
c353e75135
Squeezed the Bits a little more.
2018-03-08 12:28:33 -05:00
5a3ef0fda2
Apply coding styles
2018-03-08 05:32:46 -05:00
f9d086ee95
Removed warning.
2018-03-07 20:11:45 -05:00
366ac49cc6
Minor improvements
2018-03-07 20:08:58 -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
4675554471
One Property Tree ( #500 )
...
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
2018-03-06 16:59:06 +01:00
99a9d1e4f2
Merge branch 'master' into feature/PerformanceATM
2018-03-05 09:57:50 -05:00
17c1b03b85
Improved performance even more.
2018-03-02 17:05:03 -05:00
e39ae09b81
Improved performance a little bit.
2018-03-02 11:50:42 -05:00
ebd69d1333
Cleanup FieldlineSequence classes
2018-03-01 19:55:50 -05:00
cd227040b5
Removed commented code.
2018-03-01 17:04:16 -05:00
d7183ad362
Added uniform caching.
2018-03-01 16:48:05 -05:00
1b9622c7dd
Improved performance in shaders and transformations.
2018-03-01 16:24:20 -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
95e0cf478d
Added support to G-Buffer. ( #532 )
2018-02-26 21:11:22 -05:00
f0a55b21ff
Add implementation of pure URL synchronization from foreign sources ( #533 )
...
* Add implementation of pure URL synchronization from foreign sources
* Added hash of concatenated URLs to the identifier
* Make the identifier optional
* Remove unused code
2018-02-26 21:11:07 -05:00
1193e14c14
Feature/sync cleanup ( #535 )
...
* Cleanup in Sync module
* Correctly name mar097 asset name
2018-02-24 14:18:14 -05:00
ee7e1b9b96
Fix with asset_helper
...
Initial cleanup of Sync module
2018-02-24 00:46:28 -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
7e5db07bd5
Fix more atmosphere stereo bugs
2018-02-21 21:40:21 +01:00
ab1543841a
Fix atmosphere stereo bug: positions are stored in camera rig space
2018-02-21 14:02:54 +01:00
a112ebcec7
Specify simplification of field of view renderables
2018-02-19 16:28:18 -05:00
5a23a3e93f
Fix atmosphere stereo bugs
2018-02-19 22:11:12 +01:00
Jonathas Costa