Commit Graph

1588 Commits

Author SHA1 Message Date
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
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
Alexander Bock
cf593bd060 Adapt to removal of Singleton 2018-11-05 14:17:42 -05:00
Matthew Territo
fa661381fd Merge commit 'b671ad35e6d6c58edaf8691357daf1922d61a7d3' into feature/websocketnavigation
* commit 'b671ad35e6d6c58edaf8691357daf1922d61a7d3':
  Feature/session recording (#737)
  Update libCurl to 7.63.0 Update GDAL to 2.3.2
  Trying another timeout method for GDAL GetCapabilities requests
  Remove LMMP globebrowsing server to increase resilience
  Fix longitude/latitude specification for size of GeodeticPatch

# Conflicts:
#	src/CMakeLists.txt
2018-11-01 22:30:36 -06:00
Gene Payne
b671ad35e6 Feature/session recording (#737)
* In progress with new version of session recording

* Session recording coding pass for both record and playback, not building yet.

* Working on getting first build of prototype

* Code changes to get playback working with all 3 timing modes

* Fixing session recording interactions with the timemanager

* Bug fixes for newly discovered timing issues, mothballing recording of timing updates

* Fixed camera jitter issue

* Updated new reference to latest ghoul

* Got session recording/playback working with changes made in master

* Added threshold for differences in camera movement as criteria for saving to recording file

* Added support for binary file for session recording/playback

* Minor changes with handling timeManager keyframes in playback

* New timeline structure & keyframes specific to session recording

* Fixed bug with fixed-script size

* Switched to new timeline specific to session recording, bug fixes, currently debugging camera position & rotation

* Formatting changes only

* Fixed scripts not working after timeline change

* Add session recording test scene

* Fixed problem with re-running the same playback multiple times

* Fixed problems with camera interpolation

* Fixed detection of camera playback finishing, and improved camera interpolation

* Added comments for interface of externInteraction include

* Fixed view frustum culling issues in session playback due to not appropiate camera scaling. Also made function in datamessagestructures to read and write this data to streams.

* Added camera scaling fix to code that supports Ascii format

* Added startPlayback default command for playing back while forcing simulation time to match the recording

* Fixed camera jump in sessionRecording after playback finished. Cleanup in playback of camera to re-use same functionality in keyframenavigator.

* Superb fix to sessionRecording. Realized focusNode of globalNavigationHandler needed to be activly update when camera change for either position of camera to be accurate or for rendered objects to be calculated without precision issues. Can now achieve a correct playback, even close to chunks/renderable, which was not possible before.

* sessionRecording cleanup, fixed all warnings and renamed files to lowercase to match current standards.

* Added error handling for bad input playback filename, protection from corrupted playback file

* Implemented code review changes on pull request #737 for sessionRecording
2018-11-01 18:24:10 -06:00
Matthew Territo
bbe0ad3b2c Merge commit '920ae7c374448534ea33803bdf35b7f3f0655640' into feature/websocketnavigation
* commit '920ae7c374448534ea33803bdf35b7f3f0655640':
  ImGui cleanup Update Ghoul
  Remove unused monitor utility
  Feature/globebrowsing speedup (#735)
  Performance Atmosphere (#746)
  First attempt (#745)
  Cleanup SGCT dependency  CMake output
  Feature/minvr (#744)
  Fixed touch interface bug github issue #682, and fixed upper-left corner menu tap toggle. (#739)
  Add workaround for MacOS Mojave 10.14 dark mode OpenGL bug
2018-10-31 18:26:11 -06:00
Alexander Bock
9047dc7a3e Feature/globebrowsing speedup (#735)
* Removal of ChunkRenderer, ChunkedLodGlobe, ChunkCuller, chunklevel evaluator, culling classes, layershadermanager, GpuLayer, GPUData, ChunkNode, Grid, BasicGrid, Chunk files, Angle, AABB classes, PointGlobe, Ellipsoid, TileSelector, tiledatatype, iodescription, simplerawtilerreader, rawtilereader
 * Less dynamic allocation for SkirtedGrid, LayerManager, RenderableGlobe, TextureUnit
 * Clean up memory management in RawTiles
 * Code simplification
 * Optimize shader uniform setting
 * Introduce UniformCache
 * Callback simplification
 * Turn ChunkNode into a struct
 * Use a MemoryPool to organize all ChunkNodes rather than use unique_ptr and the necessary memory allocation
 * Collect draw calls
 * Consolidate fragment shaders between local and global renderer
 * Shader cleanup and optimization
 * Update CMake to not include included shaders
 * Integrate traversal function into the looping
 * Replace std::queue with std::vector
 * Merge TextureContainer into MemoryAwareTileCache
 * Lazy computation of chunk bounding boxes
 * Memory management of LayerGroup
 * Remove class hierarchy from tileproviders (temporaltileprovider not working yet)
 * Remove PBO classes
* Chunk status stored in Chunk
* Don't create a copy of the ChunkTilePile
* Enable culling by projected area on default
* Have raw tile reader return a Tile instead of a shared_ptr to a tile
* Start making GDAL mandatory
* Increase the default lod scale factor to 15
2018-10-30 17:20:06 -04:00
Alexander Bock
f630944fd8 Feature/minvr (#744)
* Move SGCT external library from ext/sgct to apps/OpenSpace/ext/sgct
 * Remove all GLFW dependencies from openspace-core
 * Add MinVR dependency
 * Add new executable OpenSpace-MinVR that uses MinVR instead of SGCT
2018-10-29 22:10:35 -04:00
Matthew Territo
d48b5df268 Merge commit '4cfedf0f654ac41c3a955948cf1eae00c7f1818e' into feature/websocketnavigation
* commit '4cfedf0f654ac41c3a955948cf1eae00c7f1818e':
  Update Ghoul repository Prevent reference after delete of the scene when deinitializing the OpenSpaceEngine
  Update coding style to correctly ignore SGCT inline files in apps folder Update ghoul repository
  Compile fix to adapt to ghoul changes
2018-10-23 14:41:28 -06:00
Alexander Bock
700fd60295 Update coding style to correctly ignore SGCT inline files in apps folder
Update ghoul repository
2018-10-17 08:30:55 +00:00
Matthew Territo
31befae5eb Merge commit '635df258d480830c85d3f01247fc0ff931353946' into feature/websocketnavigation
* commit '635df258d480830c85d3f01247fc0ff931353946':
  Add option to press Shift while clicking the time shifting to immediately jump, instead of interpolate
  Remove Hyperion's rotation as there is no SPICE information for it available
  Update ghoul and adapt to ghoul change by moving std::to_string to ghoul::to_string
  Add Hyperion and Mimas to Saturn's major moons (#closes 730)
  Change originChange origin of the radiosphere to Earth Do not show radiosphere before 1936
  Update ghoul repository
2018-10-09 16:51:23 -06:00
Alexander Bock
428ab56d99 Update ghoul and adapt to ghoul change by moving std::to_string to ghoul::to_string 2018-10-08 17:54:32 -06:00
Matthew Territo
d7dddf5352 Merge commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8' into feature/websocketnavigation
* commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8':
  Feature/alex is flying (#729)
  Update ghoul repository
  Reenable the atmosphere on master
  Remove Clang warnings
  Feature/cmake cleanup (#727)
  Fix TaskRunner related issues

# Conflicts:
#	src/CMakeLists.txt
2018-10-08 16:44:47 -06:00
Alexander Bock
8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -04:00
Alexander Bock
4ed9fec9f9 Remove Clang warnings 2018-09-25 12:23:55 -04:00
Matthew Territo
c929589d89 Merge commit 'c03ddf76cc63c4922a49ae67c60b0a356c904960' into feature/websocketnavigation
* commit 'c03ddf76cc63c4922a49ae67c60b0a356c904960':
  Remove external control callback
  Fix for taking screenshots Update Ghoul version
  Add spherical mirror configuration file with GUI window
2018-09-17 18:58:18 -06:00
Alexander Bock
c03ddf76cc Remove external control callback 2018-09-17 15:13:54 -04:00
Matthew Territo
4f0cffdc44 Merge remote-tracking branch 'origin/master' into feature/websocketnavigation
# Conflicts:
#	src/interaction/orbitalnavigator.cpp
2018-09-06 19:15:59 -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
Emil Axelsson
43e115d651 Add shortcut to change focus interpolation time (#707)
Closes #707
2018-09-03 01:50:47 -04:00
Alexander Bock
a993c8ef65 Remove quad from screenspacerenderable (working on #525) 2018-09-03 00:58:08 -04:00
Alexander Bock
40196262fb Use rendering helper in Luaconsole and Loading screen (working on #525) 2018-09-03 00:35:42 -04:00
Alexander Bock
f429959bba Register path tokens before the sgct configuration is loaded 2018-09-02 12:08:50 -04:00
Alexander Bock
24ef67afa0 Add helper methods to quickly render boxes (finalizing and #closes 696) 2018-09-02 02:18:40 -04:00
Emil Axelsson
518b43db02 Fix compiler warnings 2018-08-31 14:30:35 +02: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
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
Alexander Bock
1f7b482efa Add Lua functions to print cluster id (closes #704) 2018-08-28 13:58:32 -04:00
Alexander Bock
8acddf74a9 Show current and total file size for each download (closes #705) 2018-08-28 13:45:42 -04:00
Alexander Bock
5c9e65c7f2 Add strange units to the distance conversion (closes #703) 2018-08-24 03:37:22 -06:00
Alexander Bock
67dd887e52 Render text informing of ongoing shutdown (#696) 2018-08-24 03:15:55 -06:00
Alexander Bock
4d901b688b Make it possible to not load an asset on default and later load it at runtime (closes #694) 2018-08-24 02:34:55 -06:00
Matthew Territo
c23053aede Update new ghoul string conversions 2018-07-31 15:37:09 -06:00
Matthew Territo
aa6854a829 Merge commit '74fd38c260f852cf224877425c3a5027f12604d3' into feature/websocketnavigation
* commit '74fd38c260f852cf224877425c3a5027f12604d3':
  Adapt to Ghoul change (use ghoul::to_string instead of std::to_string)
2018-07-31 15:16:24 -06:00
Alexander Bock
74fd38c260 Adapt to Ghoul change (use ghoul::to_string instead of std::to_string) 2018-07-20 13:56:15 -04:00
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
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
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
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
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
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
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
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