Commit Graph

180 Commits

Author SHA1 Message Date
Alexander Bock 979a5e3378 SkyBrowser Hash Handling (#2201)
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00
Emma Broman 0cc5704b6a Add isGuiWindow check for mouse and keyboard callbacks
Fix interaction problems when hovering/clicking with the mouse in a non-GUI window, when having a setup with more than one window (e.g. the single_gui.json setup)

Previously, clicking with the mouse in the rendering window without the GUI also triggered mouse clicks in all the other windows, including the GUI windows. This was disturbing for interaction in the single_gui setup

Now, the GUI modules check to see if the clicked window is actually an interaction window
2022-08-05 11:41:10 +02:00
Alexander Bock 163ac4dcef Cleanup of mostly asset files
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
2022-07-28 17:21:59 +02:00
Alexander Bock 9cc4c595a8 Code Cleanup (#2191)
* constexpr const -> constexpr
* const char* -> std::string_view
2022-07-25 15:57:45 +02:00
Ylva Selling 5ed02f9dd8 Merge branch 'master' into feature/getting-started-tour 2022-07-12 15:09:00 -04:00
Emma Broman e44d5e0b39 Disable hover circle per default when setting renderable (fixes #2153)
and throw warning if setting to non-existing node
2022-06-30 11:57:41 +02:00
Ylva Selling b6e4f6dcaf Merge branch 'master' into feature/getting-started-tour
# Conflicts:
#	modules/skybrowser/skybrowsermodule.cpp
2022-06-29 05:21:45 -04:00
Alexander Bock 9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163)
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
2022-06-28 00:46:01 +02:00
Ylva Selling c9a63274a8 Move presync callback functionality from SkyBrowserModule to ServerModule in order to expose the functionality to other topics as well 2022-06-01 15:06:40 -04:00
Ylva Selling 4aa317ec6d Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-05-05 14:58:12 -04:00
Emma Broman 3ebb439d72 Add documentations and remove unused input argument 2022-05-05 18:26:05 +02:00
Ylva Selling 8474116a48 Rename getPair function to pair 2022-05-05 11:18:25 -04:00
Ylva Selling 18cc19416d Add lua function for stopping animations 2022-05-04 16:13:44 -04:00
Ylva Selling ae6f59c8c3 Add parameters to sky browser module in internal initialize 2022-05-04 13:10:49 -04:00
Ylva Selling 28393a9523 Rename RenderCopy to DisplayCopy 2022-05-04 13:00:25 -04:00
Ylva Selling 323fea8ec6 Make resizing of gui window only affect the browser ratio, not the scale 2022-05-04 12:40:21 -04:00
Ylva Selling 9a49966fb6 Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-05-03 10:51:19 -04:00
Ylva Selling 00cc4fc0f1 Cleanup - remove unused variables and highlight 2022-05-03 10:51:00 -04:00
Emma Broman 7a05c44ce1 Update some property names for more consistent capitalization 2022-05-03 15:29:03 +02:00
Ylva Selling cb766f8f96 Add WorldWide Telescope image collection url as property to sky browser module 2022-04-29 14:42:13 -04:00
Ylva Selling db7c5ee23f Add property to set space craft animation time 2022-04-29 11:05:36 -04:00
Ylva Selling 53f19a6aa8 Cleanup - remove remnants from mouse interaction code 2022-04-28 11:55:10 -04:00
Ylva Selling 8aec879677 Fix bug with creating a target with an identifier that already exists 2022-04-28 11:54:43 -04:00
Ylva Selling 4692c4d74b Fix comments on pull request 2022-04-28 11:33:54 -04:00
Ylva Selling 673b7f2325 Create property in module for inverse zoom direction 2022-04-27 17:00:31 -04:00
Ylva Selling 6605bfcd07 Create property in sky browser module for hiding the targets and browsers when minimizing gui 2022-04-27 16:44:14 -04:00
Emma Broman b7256a2c27 Fix typo 2022-04-27 19:35:58 +02:00
Emma Broman d8313eebe0 Add property to hide SkyBrowser title and hide per default 2022-04-27 19:19:46 +02:00
Emma Broman de68e406b0 Send topic on presync instead of from itmemanager (closes #2037) 2022-04-27 18:20:51 +02:00
Emma Broman 1116e092b6 Mini refactor 2022-04-27 16:03:31 +02:00
Ylva Selling 939dfae319 Add lua function to dispatch point spacecraft event 2022-04-26 18:39:31 -04:00
Ylva Selling 24b6383afb Create lua function to show or hide all targets and browsers 2022-04-26 17:37:05 -04:00
Emma Broman 51f9199abd Refactor fading and use fade property instead of opacity 2022-04-26 17:24:15 +02:00
Emma Broman f02ac1cbd0 Merge branch 'master' into feature/skybrowser 2022-04-26 12:17:22 +02:00
Emma Broman 17fd637926 Show and hide hover circle using fade property
And hide it when exiting the solar system

Refactor hover circle implementation a bit
2022-04-26 10:56:47 +02:00
Emma Broman dca8e1e914 Refactor info message 2022-04-26 09:07:54 +02:00
Emma Broman 92eefa8189 Add enabled property to Exoplanets and Skybrowser module (#1945)
* Add enabled property to exoplanets and sky browser module

* Create assets for default settings and restructure assets into a components folder

* Update exoplanets data

* Set sky browser enabled to true per default and include hover circle asset

* Add name and description of hover circle, and used synced version of ring image
2022-04-25 15:10:08 +02:00
Ylva Selling 2829d726de Add functionality to check if the image collection has been loaded and pass that information to the GUI 2022-04-18 15:35:56 -04:00
Alexander Bock 99d2bddf7c Address coding style and remove compiler warnings in many places 2022-04-11 18:31:45 +02:00
Alexander Bock c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02:00
Ylva Selling 9e86447b85 Remove mouse interaction for skybrowser and make default position of the skybrowser to be outside of the normal field of view 2022-04-08 11:43:32 -04:00
Ylva Selling 1f8b31bab3 Update so that WWT is loaded in the gui 2022-04-07 16:28:17 -04:00
Ylva Selling 1eb4fc5879 Change lua function to be set with "setPropertyValueSingle" instead 2022-04-04 10:16:51 -04:00
Ylva Selling f14e482ff1 Create lua function to move render copies 2022-04-01 17:06:51 -04:00
Ylva Selling 233d000aea Make all animations depend on system time instead of fps. This will make the animations robust with low fps. Add easing functions. 2022-03-31 15:58:38 -04:00
Ylva Selling 680cdc4b8f Move the hover circle with lua script instead of C++ code to make it work in a dome environment 2022-03-23 18:46:19 -04:00
Ylva Selling 33ddd94426 Fix issues with fading by using the system time instead of fps 2022-03-23 18:45:57 -04:00
Ylva Selling c3c453b45c Fix search of pairs to include scene graph node identifier as well 2022-03-23 09:21:18 -04:00
Ylva Selling 5bbf7d3d33 Fixes after merging in new cef version and master 2022-03-22 16:01:34 -04:00
Ylva Selling ea77f74731 Make it possible to add n number of additional rendered copies of the sky browser, that can be placed with RAE coordinates 2022-03-17 11:53:12 -04:00