Commit Graph

34 Commits

Author SHA1 Message Date
Matthew Territo
96245ec60e Allow separate friction control 2018-11-05 01:28:28 -07:00
Matthew Territo
0ad56e04f3 Add interesting times. 2018-10-31 12:28:13 -06:00
Matthew Territo
f185b2cee7 Add lua script payload to flight controller. Access websocket sensitivity in orbitalnavigator 2018-09-14 15:54:57 -06:00
Matthew Territo
b892642868 Merge commit '9f1c4e847d7c37e75f0e73d051c8f7c758f20147' into feature/websocketnavigation
* Update & cleanup WebsocketInputStates to be part of globals
* Update fmt library calls to handle non-standard objects (json, enum, etc.)

# Conflicts:
#	include/openspace/interaction/inputstate.h
#	src/interaction/inputstate.cpp
2018-09-06 18:54:40 -06:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Matthew Territo
4c893e18fa Only disengageAutopilot if done 2018-08-29 22:00:16 -06:00
Matthew Territo
963b8d4880 Add friction toggle 2018-08-29 19:21:26 -06:00
Matthew Territo
16fedc73de Merge commit '64524e8f44763b4601895e0bb896f628f877782b' into feature/websocketnavigation
* commit '64524e8f44763b4601895e0bb896f628f877782b':
  Renamed "RenderOptionInfo" to "RenderOption" (closes #692)
  Add Lua functions to print cluster id (closes #704)
  Show current and total file size for each download (closes #705)
  Fix subscription bug introduced in code cleanup
  Update Ghoul and sgct repository
  Add strange units to the distance conversion (closes #703)
  Render text informing of ongoing shutdown (#696)
  Fix bug preventing specification of easing function for property setting (closes #695)
  Make it possible to not load an asset on default and later load it at runtime (closes #694)
  Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693)

Conflicts:
	ext/ghoul
2018-08-29 11:32:41 -06:00
Matthew Territo
0c444f09c1 Disengaged Autopilot on disconnect 2018-08-29 11:11:11 -06:00
Emil Axelsson
c014d8b84d Fix subscription bug introduced in code cleanup 2018-08-28 13:42:31 +02:00
Matthew Territo
179a6d16ae Autopilot by disabling friction 2018-08-25 12:00:52 -06:00
Matthew Territo
e43b813670 Initialializing for AutoPilot 2018-08-24 18:00:05 -06:00
Matthew Territo
eb4362751c FIXME: Dumb fix for clearing the WebsocketInputStates on the inputStates handler 2018-08-15 18:25:13 -04:00
Matthew Territo
492c544a81 Change focus 2018-08-08 18:21:19 -04:00
Matthew Territo
338d333b04 Send disconnect and connect packets 2018-08-06 16:37:57 -06:00
Matthew Territo
71ddc1c8b5 Update structure of input values 2018-08-06 13:26:22 -06:00
Matthew Territo
8eb2692abe IP: Init Focus Nodes 2018-08-04 08:09:19 -06:00
Matthew Territo
982d586501 Bad payload handling 2018-07-18 15:56:36 -06: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
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
Matthew Territo
f16057b2de Make WebsocketCameraStates check against both values for shared axis commands. 2018-07-12 22:13:04 -06: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
Matthew Territo
b622b0f3fc Init FlightControllerTopic 2018-07-10 10:32:21 -06:00
Matthew Territo
c2b1a3fd42 Pop Message from queue after use to fix reference lifespan 2018-07-07 23:31:17 +02:00
Alexander Bock
8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -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
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Emil Axelsson
1c000a045b Make it possible to unsubscribe to the time (#612) 2018-05-16 12:47:06 +02:00
Alexander Bock
b4be63af65 Feature/configuration (#605)
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
2018-04-20 18:40:21 -04:00
Alexander Bock
3810209365 Issue/451 (#595)
* Add ability for Joystick input
* Change location of LuaConsole files
2018-04-20 16:12:18 -04:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
Emil Axelsson
246f583119 Jenkins compile fix 2018-03-29 09:12:49 +02: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