Commit Graph

5764 Commits

Author SHA1 Message Date
Matthew Territo 08711e7c2e Merge commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00' into feature/websocketnavigation
* commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00':
  Adapt to UniformCache changes when updating uniform locations (closes #648)
  General cleanup Adapt to changes in Ghoul Make use of TextureManager Jenkins compile fix
  Fix setting of FixedRotation values through assets (closes #647)
  Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers Make specifying the line number in TLETranslation optional
  Add warning when targets are not registered in the convert-table for image projections
2018-07-19 17:36:53 -06:00
Alexander Bock f55828198f Adapt to UniformCache changes when updating uniform locations (closes #648) 2018-07-19 17:46:21 -04:00
Alexander Bock 0774348fc2 General cleanup
Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
2018-07-19 14:43:53 -04:00
Alexander Bock dbdc5dfd28 Fix setting of FixedRotation values through assets (closes #647) 2018-07-18 19:20:49 -04:00
Alexander Bock 9a928231be Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers
Make specifying the line number in TLETranslation optional
2018-07-18 18:22:18 -04:00
Matthew Territo 2fa14e4c26 Merge commit '54d1a506c319f6f1540334681b2ac7629aff555b' into feature/websocketnavigation
* commit '54d1a506c319f6f1540334681b2ac7629aff555b':
  Add rotation class that provides a constant rotation based on in-game time (closes #662) Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
  Add option to disable the console key (closes 655)
  Display current delta time when interpolation is happening
  Add button to invert delta time (closes #666 , the number of the beast)
2018-07-18 15:56:53 -06:00
Matthew Territo 982d586501 Bad payload handling 2018-07-18 15:56:36 -06:00
Alexander Bock 5dff0e1b36 Add warning when targets are not registered in the convert-table for image projections 2018-07-18 17:01:46 -04:00
Alexander Bock 54d1a506c3 Add rotation class that provides a constant rotation based on in-game time (closes #662)
Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
2018-07-18 15:28:24 -04:00
Alexander Bock 6ee31384d7 Add option to disable the console key (closes 655) 2018-07-18 14:25:04 -04:00
Alexander Bock 381dbf576d Display current delta time when interpolation is happening 2018-07-18 14:19:04 -04:00
Alexander Bock e2e425657f Add button to invert delta time (closes #666 , the number of the beast) 2018-07-18 13:55:22 -04:00
Matthew Territo f278072f97 * InputState: Memory for WebsocketInputStates now resides here as pointers to WebsocketInputState
* WebsocketInputStates: Change to an unordered_map
* WebsocketCameraStates: Skip updating if there are no states to processes
* FlightControllerTopic: Switch for processing different types of events (input, connection, disconnect, etc.)
* FlightControllerTopic: Stores memory for a single WebsocketInputState instead of all
2018-07-17 17:06:34 -06:00
Matthew Territo 615d32de2e Merge commit '2751ee327c986f32d036e54a6f7a1229e937682d' into feature/websocketnavigation
* commit '2751ee327c986f32d036e54a6f7a1229e937682d':
  Update Ghoul repository to show milliseconds in log timestamps Add log information to the SceneGraphnode to show initialization and OpenGL initialization of nodes
  Add missing files in multiresvolume
  OpenGL logging
  Code cleanup Remove warnings from multiresvolume module
  Feature/state machine (#673)
  Fix shader path
  Feature/time interpolation (#669)
  Feature/model lighting (#670)
  Fix issue #660 and provide percentage for http syncs (#671)
  Add BoolProperty to SpaceModule to control SpiceManager exception handling (closes #661) Add debugging indices to SceneGraphNodes Rename ImGui indices debugging definition
2018-07-17 08:26:04 -06:00
Alexander Bock 2751ee327c Update Ghoul repository to show milliseconds in log timestamps
Add log information to the SceneGraphnode to show initialization and OpenGL initialization of nodes
2018-07-16 17:44:50 -04:00
Alexander Bock 001935a139 Add missing files in multiresvolume 2018-07-16 17:28:52 -04:00
Alexander Bock 1e97bae229 OpenGL logging
Print warning if OpenGL logging is disabled but loglevel is too low
Fix format of printed functions

Closes 656
2018-07-13 16:22:24 -04:00
Alexander Bock d0f3e5507a Code cleanup
Remove warnings from multiresvolume module
2018-07-13 16:02:42 -04:00
Emil Axelsson c2cc2bab17 Feature/state machine (#673)
* Implement simple state machine example in Lua
* Use defaults for trail widths
2018-07-13 10:29:45 -04:00
Emil Axelsson 13edfb64b4 Fix shader path 2018-07-13 11:28:16 +02:00
Emil Axelsson 902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Emil Axelsson 6007f1d70d Feature/model lighting (#670)
* Fix NH texture and add lighting options
* Add missing comma
* Light sources: work in progress.
* Add light sources
* Remove unused values
* Add types to documentation
* Add light sources to various missions
* Code cleanup based on review
2018-07-13 09:01:43 +02:00
Emil Axelsson 8a6dd14330 Fix issue #660 and provide percentage for http syncs (#671)
Fix issue #660 and provide percentage for http syncs
2018-07-13 08:51:18 +02:00
Matthew Territo f16057b2de Make WebsocketCameraStates check against both values for shared axis commands. 2018-07-12 22:13:04 -06:00
Matthew Territo cb9488eb5a Change sensitivity and fix clamp for websockets 2018-07-12 17:52:49 -06:00
Alexander Bock 12c87969a7 Add BoolProperty to SpaceModule to control SpiceManager exception handling (closes #661)
Add debugging indices to SceneGraphNodes
Rename ImGui indices debugging definition
2018-07-12 17:48:34 -04:00
Matthew Territo 754e6d7d8d Merge commit 'd20bb6d63405e1a1a351b349dcd04af5e958437f' into feature/websocketnavigation
* commit 'd20bb6d63405e1a1a351b349dcd04af5e958437f':
  Set maximum iterations for geodetic surface projection
  Feature/time frame (#642)
2018-07-12 15:42:40 -06:00
Emil Axelsson d20bb6d634 Set maximum iterations for geodetic surface projection 2018-07-12 14:25:33 +02:00
Matthew Territo 5b4125f6ad Initial WebsocketInputStates and FlightControllerTopic
=========================================
* Initial pass at network navigation, based on Joysticks
* Need to figure out deceleration/when to reset the WebsocketInputStates
2018-07-11 17:25:59 -06:00
Emil Axelsson 1b3df16c28 Feature/time frame (#642)
* First implementation of time frames
* Add TimeFrameUnion. Only show solar system 1850-2150.
* Consider dependencies when determining whether time frame is active
* Code review fixes.
2018-07-11 10:42:06 +02:00
Matthew Territo b622b0f3fc Init FlightControllerTopic 2018-07-10 10:32:21 -06:00
Matthew Territo 9e1bb87428 Upgrade JSON Library 2018-07-10 10:31:51 -06:00
Matthew Territo c2b1a3fd42 Pop Message from queue after use to fix reference lifespan releases/v0.12.0 2018-07-07 23:31:17 +02:00
Gene Payne 0783b1ddaa Merge pull request #613 from OpenSpace/touch-user-study
Touch user study code
2018-07-05 15:35:23 -06:00
GPayne db28b3e2a9 Merged master into touch-user-study branch 2018-07-05 15:33:46 -06:00
GPayne f84f5f5cc5 Deleted unecessary casting operation as part of PR review 2018-07-05 14:34:35 -06:00
Alexander Bock 8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -04:00
Jonathas Costa e8735d4544 Merge branch 'issue/637' 2018-07-05 14:14:54 -04:00
Jonathas Costa 3ffca283a5 Removed unsused code. 2018-07-05 14:14:13 -04:00
Alexander Bock ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -04:00
Jonathas Costa 47a657d7f3 Enabled Void's labels by default and changed Local Dwarfs' labels size. 2018-07-05 10:34:31 -04:00
Alexander Bock d86b78f2f5 Address PR comments 2018-07-05 09:47:35 -04:00
Emil Axelsson 1916190228 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-07-04 22:19:06 +02:00
Emil Axelsson a144a3ef36 Prevent leaking lua variables to global scope 2018-07-04 22:14:37 +02:00
Emil Axelsson 8b91c67010 Feature/slide deck (#636)
* Implement basic slide deck helper and example
2018-07-04 13:22:06 -04:00
Emil Axelsson 23a3bca304 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-07-04 10:35:43 +02:00
Emil Axelsson 4fe4932d0e Fix bug with incorrect lighting for RenderableModels 2018-07-04 10:35:19 +02:00
Alexander Bock 3c9d2020a0 Add scale factor to 6dF datasets 2018-07-04 01:10:04 -04:00
Emil Axelsson ec89a5a4f9 Fix bugs in volumetric rendering 2018-07-03 19:17:25 +02:00
Jonathas Costa b2f680e6da Fixed texture leaking. (#635) 2018-07-02 14:41:02 -04:00