Commit Graph

2836 Commits

Author SHA1 Message Date
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 8d64020601 Add new translation that uses longitude/latitude to compute translation on a RenderableGlobe 2018-12-04 11:24:35 -05:00
Alexander Bock ecdb05e98e Correctly compile if the sync module is compiled without libtorrent support 2018-12-04 09:02:54 -05:00
Alexander Bock 6b011d117c Make CMake scream less 2018-12-03 14:29:14 -05:00
Alexander Bock 36d0f71913 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
2018-12-03 14:00:08 -05:00
Alexander Bock 203db2357e Compile fix for touch module
Compile fix for AbfferRenderer
2018-12-03 09:55:13 -05: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 aa89a63f74 Fix GAIA module compile for macOS (missing #include <string>) 2018-11-29 17:18:32 -08:00
Matthew Territo 670ff9b45a Merge commit '09fcbd0595b30491ccefe6462a0c1d658f72f425' into feature/websocketnavigation
Fix to GAIA for missing string library

* commit '09fcbd0595b30491ccefe6462a0c1d658f72f425':
  Fix LiU MOLA height map
  Fix Enceladus rendering Add Titan WMS server Add Europa WMS server
2018-11-28 13:33:41 -08: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 42b7203f0c Add lua helper function to create custom focus nodes on globes (bookmarks) 2018-11-22 13:51:52 +01:00
Emil Axelsson 45e687a23e Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-22 12:40:30 +01:00
Emil Axelsson 89b68d43d8 Add Opacity property for RenderableTimeVaryingVolume 2018-11-22 12:39:08 +01:00
Emil Axelsson b6d3a4a8ea Fix volume rendering depth sorting issue 2018-11-22 12:37:11 +01:00
Alexander Bock 65195975bb Add display showing the number of active layers
Automatically disable last layer if number of texture units is exhausted
Closes #427
2018-11-21 17:32:51 -05:00
Alexander Bock d9b2c3ca96 Don't crash if TileProvider cannot be created (closes #464) 2018-11-21 15:21:40 -05:00
Alexander Bock 1bb3c3ee27 Don't crash if a tile does not have enough data for the heuristic 2018-11-21 14:47:27 -05:00
Alexander Bock 1910450419 Add a heuristic to discard ESRI's "No data available yet" tiles (closes #717) 2018-11-21 14:32:01 -05:00
Alexander Bock 9d0f0e00df Revert native ui back to F1 keybind for toggling 2018-11-21 11:14:11 -05:00
Alexander Bock d37cfa4f18 Add guard to gaia.scene to log error if the Gaia module was not compiled
Point to correct shader paths
Remove warnings
2018-11-20 18:40:04 -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
Emil Axelsson bff4646d9f Temporarily disable (broken) stereoscopy for renderablestars 2018-11-20 10:12:40 +01: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 916e42f2bb Remove opacity parameter from timevaryingvolume 2018-11-15 12:00:34 +01:00
Emil Axelsson 35252ec3df Improve backwards compatibility of layer support 2018-11-15 09:23:22 +01:00
Emil Axelsson 52060ab006 Fix nullpointer dereference error caused by unset callback handle 2018-11-14 22:45:31 +01:00
Emil Axelsson 57b8ab6ef6 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-14 17:07:56 +01:00
Emil Axelsson a5e8a5a4d2 Deactivate event handler when webgui is hidden 2018-11-14 17:07:17 +01:00
Alexander Bock 9a368ede25 Fix issue that causes atmosphere to show up on the other side of a planet if the shading is disabled (closes #677) 2018-11-13 08:27:07 -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
Emil Axelsson 989304835d Only update part of gui that was updated by CEF (#760) 2018-11-12 11:05:30 +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
Alexander Bock 06426c01c2 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-11-06 15:27:36 -05:00
Alexander Bock f8c27629f5 Various small fixes 2018-11-06 15:07:17 -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 7c0268e87c CMake cleanup 2018-11-06 13:18:40 -05:00
Alexander Bock 7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -05:00
Alexander Bock d1fa145e0a Jenkins compile fix 2018-11-06 11:10:53 -05:00
Alexander Bock 3ff7b974f5 Adapt ISWAManager and KameleonWrapper to removal of singleton 2018-11-05 21:11:01 -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 ec67169854 Add the ability to change the number of significant digits in the globe location
Increase the default number of significant digits to 4
2018-11-05 18:35:26 -05:00
Alexander Bock 932413cf53 Prevent accidental walking of the current working directory when starting OpenSpace that could cause non Lua script files to be loaded as .info files 2018-11-05 16:30:47 -05:00
Matthew Territo 96245ec60e Allow separate friction control 2018-11-05 01:28:28 -07:00