Commit Graph

5532 Commits

Author SHA1 Message Date
Emil Axelsson 04ff9d119b Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-03-28 16:22:09 +02:00
Emil Axelsson 48880db372 Update ghoul and fix compilation 2018-03-28 16:21:34 +02:00
Emil Axelsson 1ede0a2f21 Cleanup css 2018-03-28 09:31:10 +02:00
Emil Axelsson 5cfef52044 Improve html log 2018-03-27 18:04:23 +02:00
Emil Axelsson cf31aebf7b Fix bugs with custom passwords in Wormhole server 2018-03-23 16:26:39 +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
Gene Payne 9a44d9c9df Modified SGCT configuration commands to allow aspect ratio tracked keyword in openspace config file (#560) 2018-03-20 10:24:01 -04: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
Alexander Bock 35fe90cbfa Fix misspelling in HTTPSynchronization 2018-03-19 16:21:54 -04:00
Nick Bartzokas 29bf40377a Pull latest ghoul commit to fix OSX build 2018-03-18 21:50:09 -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
Alexander Bock 5774c328de Change touchbar to use identifier instead of name 2018-03-16 13:43:52 -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
Jonathan Grangien 34187bc065 Update use of stb_image flags (and ghoul ref) 2018-03-15 16:25:07 -04:00
Alexander Bock bd7489678f Merge pull request #548 from OpenSpace/feature/PerformanceATM
Feature/performance atm
2018-03-14 23:29:39 -04:00
Alexander Bock 971cdf7c21 Remove 2k fisheye settings 2018-03-14 23:29:00 -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 ca8111dc48 Merge pull request #544 from OpenSpace/satellite_asset
Satellites Working with Asset
2018-03-14 21:45:46 -04:00
Alexander Bock a1451182dd Split satellites into separate assets 2018-03-14 21:43:53 -04:00
Alexander Bock b625a0538d Simplification of the satellite asset
Add more satellites
2018-03-14 17:44:08 -04:00
Alexander Bock 3912936b18 Fixing satellite asset 2018-03-14 14:19:09 -04:00
Alexander Bock 7503af1f3a Merge branch 'master' into satellite_asset 2018-03-14 13:30:09 -04:00
Emil Axelsson 0ce8605b97 Print error message when a resource synchronization is rejected (#546)
* Print error message when a resource synchronization is rejected
2018-03-14 13:29:38 -04:00
Alexander Bock bc5712bc5b Remove setPropertyValue to explicitly disable shading and use the asset specification instead 2018-03-14 13:20:03 -04:00
Jonathas Costa d2fa7140d7 Fixed compiling issues with log, reset night layer configuration and disabled earth's shading by default. (#552) 2018-03-14 13:18:42 -04:00
Jonathas Costa 206ff69e41 Fixed normals. (#553) 2018-03-14 13:18:19 -04:00
Alexander Bock 600f11b5f6 Update Transformationmanager 2018-03-14 13:16:32 -04:00
Alexander Bock 2bfab657f3 Various small fixes 2018-03-14 13:13:23 -04:00
Jonathan Grangien 7d1ee75577 Fix a _loggerCat declaration 2018-03-14 11:37:18 -04:00
Jonathas Costa 968cbef474 Merged master into PerformanceATM 2018-03-13 17:17:34 -04:00
Jonathas Costa 1feb3ea771 Merge branch 'master' into feature/PerformanceATM 2018-03-13 16:51:51 -04:00
Jonathas Costa 880b39b821 Fixed night layer. 2018-03-13 15:15:19 -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 06ebd75b21 Try to fix Jenkins Windows builds 2018-03-08 19:24:37 +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 ae3b6fe850 Support stb_image based texture reader (closes #541) 2018-03-08 17:38:35 +01:00
Alexander Bock 5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05:00
Alexander Bock c5c95a5640 Introduce property to toggle dashboard globally (closes #545) 2018-03-08 03:04:57 -05:00
Jonathas Costa f9d086ee95 Removed warning. 2018-03-07 20:11:45 -05:00
Jonathas Costa 7a549f421d Merge branch 'master' into feature/PerformanceATMOnline 2018-03-07 20:10:26 -05:00
Jonathas Costa 366ac49cc6 Minor improvements 2018-03-07 20:08:58 -05:00