Commit Graph

199 Commits

Author SHA1 Message Date
Alexander Bock
ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33:31 +02:00
Alexander Bock
7565a91196 Cleanup lambda expressions and directly address Fadeable properties when adding properties 2023-04-12 23:20:53 +02:00
Ylva Selling
fb3628b684 Merge remote-tracking branch 'origin/master' into issue/2409 2023-02-10 10:20:05 -05:00
Ylva Selling
2f96e54c8e Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/src/wwtcommunicator.cpp
2023-02-09 16:20:42 -05:00
Alexander Bock
79ad5776cc CMake cleanup (#2489)
* CMake Cleanup
* Warning suppression with CEF
* Use SGCT tinyxml in skybrowser for now
* Disable warnings about missing field initializers
2023-02-05 23:24:12 +01:00
Ylva Selling
938ae6ffe1 Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	ext/ghoul
2023-02-02 16:39:29 -05:00
Emma Broman
7e94c4c284 Remove unintentional default value for skybrowser/exoplanet module enabled property (closes #2464) 2023-02-01 18:53:06 +01:00
Ylva Selling
b7ca19dff7 Address comments on PR 2023-01-27 17:06:22 -05:00
Ylva Selling
471317aef8 Make point space craft a bool property that when enabled points the space crafts when an image is selected 2023-01-27 14:24:46 -05:00
Ylva Selling
d03747324e Merge branch 'master' into issue/2403
# Conflicts:
#	modules/skybrowser/src/wwtcommunicator.cpp
2023-01-04 11:19:54 -05:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Ylva Selling
29fe0e7975 Make image get function return std::optional if the image is not found 2022-12-16 16:44:09 -05:00
Ylva Selling
42f1b48372 Change sky browser to use id's instead of indices to get the images 2022-12-16 11:28:08 -05:00
Ylva Selling
fb539b953e Create another mode for target dragging to work in dome 2022-11-01 14:36:19 -04:00
Ylva Selling
cfb3859bb5 Merge remote-tracking branch 'origin/feature/skybrowser-reload' into issue/2029
# Conflicts:
#	modules/skybrowser/include/renderableskytarget.h
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/skybrowsermodule.cpp
2022-10-06 15:33:40 -04:00
Ylva Selling
0fd20db5e8 Add property for synchronizing aim so synchronization can be turned off for performance reasons 2022-09-23 12:53:41 -04:00
Ylva Selling
4214811c6a Add lua function to reload a display copy on a specific node 2022-09-22 03:07:04 -04:00
Ylva Selling
2778d3d4ac Merge remote-tracking branch 'origin/master' into issue/2029
# Conflicts:
#	modules/skybrowser/src/wwtcommunicator.cpp
2022-08-25 16:34:00 -04:00
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
Ylva Selling
0250098303 Add rounder border to target and browser, and add border radius to sky browser topic 2022-08-12 12:24:54 -04: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