Commit Graph

55 Commits

Author SHA1 Message Date
Matthew Territo
2f01618e16 Merge branch 'master' into feature/websocketnavigation
This merge changes the default websocket port from 8001 to 4862.
2019-02-13 12:18:28 -07:00
Alexander Bock
7fefaca345 Feature/jenkins (#788)
* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
2019-01-23 10:17:15 -05:00
Alexander Bock
c7639adb15 Remove warnings in Clang 2019-01-19 14:49:31 +01:00
Emil Axelsson
0c6b5e95c6 Introduce ability to configure ports etc for external applications. (#785)
Introduce ability to configure ports etc for external applications, including webgui
2019-01-04 10:23:28 +01:00
Matthew Territo
a6a4c5935a Add ability to toggle on and off renderables 2018-12-07 00:52:43 -07:00
Matthew Territo
12ded47e4d Merge commit 'acd897784e1541d394a3ba8a4707a8d9a414bbcd' into feature/websocketnavigation
* commit 'acd897784e1541d394a3ba8a4707a8d9a414bbcd':
  Correctly name globetranslation example assets
  Add new translation that uses longitude/latitude to compute translation on a RenderableGlobe
  Correctly compile if the sync module is compiled without libtorrent support
  Make CMake scream less
  Only set CEF settings to OpenSpaceTest if OpenSpace is compiled with tests (closes #778) Do not disable RTTI on CEF targets Do not for Unicode on CEF targets More graceful handling of torrent classes in Sync module
  Check the correct gaia module in the gaia.scene
  Update ghoul respository Remove warning
  Compile fix for touch module Compile fix for AbfferRenderer
  Register interesting nodes instead of manually adding and removing
  Fix GUI Json creation error
  Address clang tidy complaints Update Ghoul repository Update SGCT repository
  Actually fix the LiU Mola Elevation WMS config (oops)
  Fix GAIA module compile for macOS (missing #include <string>)

# Conflicts:
#	data/assets/default.scene
2018-12-04 18:39:27 -07:00
Alexander Bock
06b20d2fe8 Fix GUI Json creation error 2018-11-30 20:09:00 -05:00
Alexander Bock
c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Matthew Territo
534c2ce83e GAIA module does not compile on MacOS Mojave 10.14 by default.
Merge commit '9df1e9b4821fade185b6e0a31b7cce1e67752a44' into feature/websocketnavigation

* commit '9df1e9b4821fade185b6e0a31b7cce1e67752a44':
  Fix bug with disabling light sources on creation
  Add interpolation and toggle feature to slide deck helper
  Improve New Horizons shortcuts
  Add lua helper function to create custom focus nodes on globes (bookmarks)
  Add Opacity property for RenderableTimeVaryingVolume
  Add sun to Interesting Nodes
  Fix volume rendering depth sorting issue
  Add display showing the number of active layers Automatically disable last layer if number of texture units is exhausted Closes #427
  Don't crash if TileProvider cannot be created (closes #464)
  Don't crash if a tile does not have enough data for the heuristic
  Add a heuristic to discard ESRI's "No data available yet" tiles (closes #717)
  Fix the depth sorting of ScreenSpace Renderables
  Revert native ui back to F1 keybind for toggling
  Add WMS for Enceladus
  Add guard to gaia.scene to log error if the Gaia module was not compiled Point to correct shader paths Remove warnings
  Feature/gaia mission merge (#766)
  Add asset.filePath to asset api (#769)
  Feature/other data star renderer (#770)
  Temporarily disable (broken) stereoscopy for renderablestars
2018-11-24 21:55:09 -05:00
Emil Axelsson
0d2935c43b Feature/gaia mission merge (#766)
* Add Adam Aslegård's module that renders Gaia mission stars
 * Add module for Gaia mission
 * Add CCfits and cfitsio submodules and the implemented fitsfilereader module from the OpenSpace-sun-earth-event branch
 * Add a TaskRunner to read from a fits file
2018-11-20 18:19:08 -05:00
Matthew Territo
b7b102b34d Merge commit '916e42f2bb0179309234c2d54500f3ca43e9f4c9' into feature/websocketnavigation
* commit '916e42f2bb0179309234c2d54500f3ca43e9f4c9':
  Remove opacity parameter from timevaryingvolume
  Improve backwards compatibility of layer support
  Fix nullpointer dereference error caused by unset callback handle
  Change default keybinding for toggling rendering
  Deactivate event handler when webgui is hidden
  Add missing constructor
  Add constexpr constructor to PropertyInfo to silence GCC error
  Fix issue that causes atmosphere to show up on the other side of a planet if the shading is disabled (closes #677)
  Coordinate Axes
  Update Ghoul
  Only update part of gui that was updated by CEF (#760)
  Use bin folder instead of cwd to find configuration file (#761)
  Use bin folder instead of cwd to find configuration file
2018-11-16 13:20:04 -07:00
Emil Axelsson
52060ab006 Fix nullpointer dereference error caused by unset callback handle 2018-11-14 22:45:31 +01:00
Matthew Territo
10c910cbf8 Merge commit '4ce29842d30379e0a4de03b091d3d95fd4ab8718' into feature/websocketnavigation
* commit '4ce29842d30379e0a4de03b091d3d95fd4ab8718':
  Add shortcut to disable master rendering
  Add webgui to scenes
  Minor coding style changes
  Add string sanitization to property description
  Various small fixes
  Breaking change: Change property owner identifier renderable to Renderable
  CMake cleanup
  Misc coding style cleanups
  Jenkins compile fix
2018-11-08 13:15:35 -07:00
Matthew Territo
7e996f1c65 Merge with Beta-3
Merge commit '8e93463c1aba03445804c10172c85be69cbc1cb3' into feature/websocketnavigation

* commit '8e93463c1aba03445804c10172c85be69cbc1cb3':
  Disable server process on webgui teardown
  Added Micah to the CREDITS file
  Adapt ISWAManager and KameleonWrapper to removal of singleton
  Updated ghoul repository
  Beta-3 Release Candidate branch (#753)
  Feature/webgui ops (#723)
  Add the ability to change the number of significant digits in the globe location Increase the default number of significant digits to 4
  Rearrange THEMIS layers to be shown beneath CTX
  Prevent accidental walking of the current working directory when starting OpenSpace that could cause non Lua script files to be loaded as .info files
  Adapt to removal of Singleton
  New Spherical Grids Lables configuration.

# Conflicts:
#	modules/server/CMakeLists.txt
#	modules/server/src/connection.cpp
2018-11-08 12:58:08 -07:00
Alexander Bock
cba6201b67 Minor coding style changes 2018-11-07 13:49:33 -05:00
Alexander Bock
9dfb87e220 Add string sanitization to property description 2018-11-06 16:56:05 -05:00
Emil Axelsson
e206099c4f Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-06 14:58:50 -05:00
Emil Axelsson
c58ae52735 Breaking change: Change property owner identifier renderable to Renderable 2018-11-06 14:58:11 -05:00
Alexander Bock
7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -05:00
Alexander Bock
267879878b Beta-3 Release Candidate branch (#753)
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
2018-11-05 20:51:48 -05:00
Emil Axelsson
7181de4673 Feature/webgui ops (#723)
* Update node packages, download nodejs in build process, start server from openspace process
  * Patch CEF cmake automatically
  * Build webserver automatically
  * Work on CMake for WebBrowser, Webgui and CefWebGui
  * Map key modifiers to CEF
  * Smooth time interpolation in webgui
  * Automatically focus on search field in filter lists
  * Move webgui code to external repositories
  * Use asset system to distribute webgui
  * Remove webgui from main repository
  * Add support for right click in webgui and improve timetopic
  * Resolve cmake policy warning
  * Add relative time interpolation to lua interface
  * Sanitize json error message before logging error. Workaround for #736
  * Added gui properties to scene graph nodes
  * Add version topic
  * Add shortcuttopic
  * Add ability to disable rendering of cefwebgui
  * Don't do message loop work if there is no browser.
  * Set correct path to nodejs on unix
  * Message loop work in presync
  * modifications for shortcuts in gui, added names for shortcuts
  * Set properties via lua scripts
  * Allow gui grouping for shortcuts
  * Add gui paths keybindings
  * Blocking keyboard callbacks when webgui has keyboard focus in an editable field
  * Allow disabling of WebBrowser and CefWebGui
  * Make it possible to hide GUI
  * Get rid of redundant dashboard items if web gui is used
  * Hide WebGUI on slave nodes
  * Hide WebGUI on main rendering window if a GUI window exists
 * Enable WebGUI on default unless it is overwritten in the openspace.cfg
  * Add guiName for propery owners in socket api
2018-11-05 20:45:38 -05:00
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