Commit Graph

1605 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
Emil Axelsson 075625c223 Prevent file handles to leak into nodejs server application 2019-02-13 17:08:29 +01:00
Emil Axelsson f60371bdbc Pass on modifier keys to CEF for mouse events (#790)
* Update sgct
* Pass on modifier keys to CEF for mouse events
2019-02-04 15:14:51 +01:00
Alexander Bock ebf55f3029 Fix issue preventing from setting multiple vector properties through a lua script 2019-01-08 13:57:09 +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 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 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
Alexander Bock 3d90ea194a Feature/other data star renderer (#770)
* Adding ability to render other data values from Star speck files
 * Add new method to OptionProperty to take vector of options
 * Make it possible to change the speck file at runtime
 * Include viridis color lut
 * Add Apogee and Galah datasets
 * Make it possible to filter stars by other data values
 * Add ability to statically filter data values
2018-11-20 11:53:20 -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
Alexander Bock 9d0ef13cb5 Add missing constructor 2018-11-14 10:17:20 -05:00
Alexander Bock 45f5183683 Add constexpr constructor to PropertyInfo to silence GCC error 2018-11-14 09:52:31 -05:00
Emil Axelsson 1632c09af3 Coordinate Axes
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
2018-11-13 08:09:14 -05: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 9dfb87e220 Add string sanitization to property description 2018-11-06 16:56:05 -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
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