Commit Graph

2591 Commits

Author SHA1 Message Date
Emil Axelsson
ab93e2ca4d Fix atmosphere floating point issue 2018-04-04 16:58:24 +02:00
Emil Axelsson
a10480ddb0 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/stereo-atm-merge 2018-03-29 14:05:08 +02:00
Emil Axelsson
246f583119 Jenkins compile fix 2018-03-29 09:12:49 +02:00
Emil Axelsson
0f70218977 Fix comment 2018-03-26 18:38:45 +02:00
Emil Axelsson
40dfbc5db5 Atmosphere optimizations 2018-03-26 18:05:41 +02:00
Emil Axelsson
0899c499f0 Cleanup 2018-03-26 14:02:36 +02:00
Emil Axelsson
5da36f290b Start to optimize atmosphere rendering 2018-03-26 13:40:32 +02:00
Emil Axelsson
d3f42edbc8 Restore indentation in AtmosphereDeferredCaster 2018-03-23 19:11:08 +01:00
Emil Axelsson
e8b260915e Render GUI on whole screen when rendering side-by-side and top-bottom stereo 2018-03-22 18:15:56 +01:00
Jonathas Costa
7583586178 Merge branch 'master' into feature/stereo-atm-merge 2018-03-21 18:44:33 -04:00
Jonathas Costa
c50c563787 New stars for stereo rendering. 2018-03-21 18:38:28 -04:00
Emil Axelsson
4e58c33874 Revert to working atm code, before optimization. Stereo now working. 2018-03-21 17:44:50 +01:00
Emil Axelsson
1ef8e20821 Start fixing atmosphere stereo rendering 2018-03-20 21:32:49 +01:00
Gene Payne
5380636932 Update of touch table interface code (#561)
* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Update starlabels.data file

* Enable minimum picking distance in NDC

* Fix stack corruption bug in TouchMarker

* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Fix stack corruption bug in TouchMarker

* Add time limit to levmarq solver

* Add debug properties to touch GUI with a compile time flag

* Guard against accessing outside bounds

* Added exponential zoom for faster zoom with increased distance from focus node

* Refined the exponential zoom for better behavior on the touch table

* Added properties for disabling panning and node boundary sphere multiplier for zoom

* Added more debug logging and stopped using camera focusNode (looks deprecated) for distance calculation

* Found error in the deceleration algorithm

* Default-disable debug logging, exponential zoom coeff change and additional debug log statement
2018-03-20 10:25:28 -04:00
Emil Axelsson
2eae7ac26d Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/PerformanceATM_and_Stereo 2018-03-20 13:45:15 +01:00
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566)
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
2018-03-20 09:30:59 +01:00
Jonathas Costa
d7bb984cae Merged master. 2018-03-19 19:16:05 -04:00
Alexander Bock
35fe90cbfa Fix misspelling in HTTPSynchronization 2018-03-19 16:21:54 -04:00
Jonathas Costa
ce392b53e6 Same changes in stereo. 2018-03-19 15:17:15 -04:00
Jonathas Costa
785d0ad294 Changes in framebuffer and atm code fixing wrong merge (still need clean up). 2018-03-19 12:29:05 -04:00
Alexander Bock
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
Jonathas Costa
721bdfa752 Merged. 2018-03-16 15:17:13 -04:00
Jonathas Costa
39855e1512 Updated names in atmosphere code. 2018-03-16 15:01:34 -04:00
Alexander Bock
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
Alexander Bock
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
Jonathas Costa
7a93a4fa37 Issue/558 (#559)
* Removed unused cached uniforms from execution.
2018-03-16 09:19:39 -04:00
Jonathas Costa
7b99519ec4 Merge branch 'master' into feature/PerformanceATM_and_Stereo 2018-03-15 10:58:51 -04:00
Alexander Bock
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
Alexander Bock
b625a0538d Simplification of the satellite asset
Add more satellites
2018-03-14 17:44:08 -04:00
Jonathas Costa
cc81c125b4 Merged with problems. 2018-03-14 14:43:16 -04:00
Jonathas Costa
9558d58cee Preparing branch for merging with stereo 2018-03-14 14:20:12 -04:00
Jonathas Costa
206ff69e41 Fixed normals. (#553) 2018-03-14 13:18:19 -04:00
Alexander Bock
2bfab657f3 Various small fixes 2018-03-14 13:13:23 -04:00
Jonathas Costa
1feb3ea771 Merge branch 'master' into feature/PerformanceATM 2018-03-13 16:51:51 -04:00
Alexander Bock
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
Alexander Bock
f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01:00
Alexander Bock
cf3992bbc8 Merge remote-tracking branch 'origin/feature/shader-const' 2018-03-10 19:33:09 -05:00
Alexander Bock
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
Alexander Bock
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
Alexander Bock
92a168f644 Fixes in fieldlinesequence 2018-03-09 02:46:55 -05:00
Alexander Bock
7ccb42545c Remove Clang warnings 2018-03-08 20:18:18 +01:00
Alexander Bock
9709b22bac Turn Configuration keys from std::string to constexpr const char* for better startup performance 2018-03-08 19:24:03 +01:00
Jonathas Costa
c353e75135 Squeezed the Bits a little more. 2018-03-08 12:28:33 -05:00
Alexander Bock
5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05:00
Jonathas Costa
f9d086ee95 Removed warning. 2018-03-07 20:11:45 -05:00
Jonathas Costa
366ac49cc6 Minor improvements 2018-03-07 20:08:58 -05:00
Jonathas Costa
a744bce0bd Merge branch 'master' into feature/PerformanceATMOnline 2018-03-07 19:07:45 -05:00
Alexander Bock
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
Emil Axelsson
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
Jonathas Costa
99a9d1e4f2 Merge branch 'master' into feature/PerformanceATM 2018-03-05 09:57:50 -05:00