Commit Graph

1005 Commits

Author SHA1 Message Date
Lovisa Hassler 73a8039c8e Merge branch 'master' into thesis/2018/dsn 2018-11-16 16:08:58 -05:00
Agnes Heppich e8cac515cb reading the ra dec from files and finding the right file with a binary search 2018-11-15 15:53:43 -05:00
Emil Axelsson 3243316e79 Change default keybinding for toggling rendering 2018-11-14 22:34:28 +01:00
Agnes Heppich 32b6d5a62f Merge 2018-11-13 18:32:59 -05:00
Agnes Heppich 2adfe0551f Added jsonHelper and EadecManager 2018-11-13 18:26:36 -05:00
Lovisa Hassler 8b881ae89e renamed communicationlines asset file
renamed the communicationlines asset to signals fix
2018-11-13 12:42:20 -05:00
Lovisa Hassler 760eff56f8 merge master 2018-11-13 11:35:26 -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
Lovisa Hassler 0a0703aa82 fix merge conflict 2018-11-12 18:33:06 -05:00
Lovisa Hassler 5a49c66204 moved the color mapping to the asset files 2018-11-12 18:26:12 -05:00
Agnes Heppich 9aefc203a3 ra dec translation 2018-11-12 17:30:33 -05:00
Agnes Heppich b5aa872b95 radec translation 2018-11-09 11:33:10 -05:00
Lovisa Hassler cc18504392 got rid of sub class communicationlines, now all is handled in renderablesignals 2018-11-08 14:48:26 -05:00
Emil Axelsson 4ce29842d3 Add shortcut to disable master rendering 2018-11-08 10:32:42 -05:00
Lovisa Hassler 2cf1dc3670 added new webgui to dsn.scene, new z buffer clculations in shader files 2018-11-07 18:33:30 -05:00
Emil Axelsson e9c82facef Add webgui to scenes 2018-11-07 15:35:48 -05:00
Lovisa Hassler 90457d91e2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-07 11:25:09 -05:00
Agnes Heppich be0bb2839e folder path dynamic 2018-11-06 15:28:24 -05:00
Emil Axelsson c58ae52735 Breaking change: Change property owner identifier renderable to Renderable 2018-11-06 14:58:11 -05:00
Agnes Heppich 91c1cb7287 Merge branch'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
Merge branch# the commit.
2018-11-06 12:16:07 -05:00
Agnes Heppich b50f86b330 estimated position from RA DEC and Range 2018-11-06 12:13:34 -05:00
Emil Axelsson 04eef20868 Disable server process on webgui teardown 2018-11-05 21:28:57 -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 da2dc51608 Rearrange THEMIS layers to be shown beneath CTX 2018-11-05 17:28:48 -05:00
Jonathas Costa a130b0b7a0 New Spherical Grids Lables configuration. 2018-11-05 14:32:56 -05:00
Alexander Bock cdfd0d12da Add option for automatic caching of WMS servers into openspace.cfg
Remove all manual specification of caching and offline mode from manual wms servers
2018-11-02 15:34:36 -04: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
Alexander Bock 9d56ae092b Remove LMMP globebrowsing server to increase resilience 2018-11-01 10:25:45 -04:00
Jonathas Costa 5c0da9e606 Fixed issue 747 and labels orientation. 2018-10-31 17:32:16 -04:00
Lovisa Hassler 437dece9b8 adding equatorial sphere to scene, also adding some keybindings 2018-10-31 14:19:23 -04:00
Lovisa Hassler a9b0653981 adding focus nodes to dsn.scene 2018-10-30 17:21:13 -04:00
Alexander Bock cf8d2db914 Performance Atmosphere (#746)
* Testing new improvements.
* Torturing shaders for performance.
* Killing some bits...
* A bit or two were killed in this commit.
2018-10-30 17:10:02 -04:00
Lovisa Hassler dd565fbd29 70m dish models added 2018-10-30 16:22:53 -04:00
Lovisa Hassler 8ba26af21e added DSS45 2018-10-30 11:47:40 -04:00
Agnes Heppich 6a91ed5606 added dss15 to renderablecommunicationpackage 2018-10-29 19:09:39 -04:00
Lovisa Hassler bf03af9186 merge master 2018-10-24 19:47:31 -04:00
Agnes Heppich 9a1e8d41ad test if time within signal range 2018-10-24 18:45:48 -04:00
Agnes Heppich cdece056b3 read data from json instead of dummy values 2018-10-24 10:54:27 -04:00
Agnes Heppich efe2b5606d parse Json data 2018-10-23 10:43:56 -04:00
Lovisa Hassler 3467e9c946 site color properties slider works 2018-10-12 14:50:40 -04:00
Lovisa Hassler 8b6895b174 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-10-12 11:29:30 -04:00
Lovisa Hassler e8e7bfcabb adding color properties for the different sites 2018-10-12 11:28:27 -04:00
Lovisa Hassler 7a5fa7dd82 improving some asset gui 2018-10-11 16:13:41 -04:00
Agnes Heppich ac9ce26b99 choose if estimate spacecraft position or get spacecraft position from spice 2018-10-11 15:26:23 -04:00
Lovisa Hassler 0e070e1f20 Planet trails disabled at initialize 2018-10-11 12:28:11 -04:00
Lovisa Hassler 2b7f585583 reading in line render points from scenegraphnode position. Not highly accurate 2018-10-11 12:18:52 -04:00
Agnes Heppich e536c25f15 positioned all dishes in asset file 2018-10-10 16:18:54 -04:00
Lovisa Hassler 6c25f98f1d first draft of calculating spacecraft pos from dsn now data 2018-10-09 17:18:30 -04:00
Alexander Bock 3b23d9d26d Remove Hyperion's rotation as there is no SPICE information for it available 2018-10-08 18:02:31 -06:00