Commit Graph

202 Commits

Author SHA1 Message Date
Alexander Bock
bde840ad03 Remove a bunch of compiler warnings
* Remove compile warnings
* Coding style fix
2023-05-16 11:59:28 +02:00
Alexander Bock
9022aad479 Adding static Settings to Renderable (#2578)
* Add settings to Renderable to control whether the renderbin is updated based on Opacity
* Remove duplicate RenderBin specification for RenderableSphere
* Remove unnecessary RenderBin specifications of Lagrange points
* Don't automatically update the renderbin for RenderableLabel and RenderablePlane
* Remove extra `setRenderBinFromOpacity` from RenderableSpheres
* Move information about whether a renderable should be updated when disabled
* Some cleanup of Renderable class
* Don't update the renderbin automatically if the user specified the renderbin manually
2023-04-10 20:49:01 +02:00
Ylva Selling
c03a9ae360 Address comments on PR: use Spacecraft instead of Spacecraft etc 2023-02-13 12:46:08 -05:00
Ylva Selling
fb3628b684 Merge remote-tracking branch 'origin/master' into issue/2409 2023-02-10 10:20:05 -05:00
Alexander Bock
e37a9ed213 Linux compile fix 2023-02-10 08:59:40 +01: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
Alexander Bock
a73edcc0af Merge branch 'master' into issue/2425 2023-01-28 19:50:47 +01: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
f781dfcd9c Fix bug with screenspaceskybrowser scale crashing OpenSpace 2023-01-27 13:49:12 -05:00
Ylva Selling
be55e0973a Fix bug that channels in cluster don't set the field of view to the same value after animating 2023-01-04 14:31:14 -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
Alexander Bock
44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Ylva Selling
7b85209dfc Mark functions in header file as const as well 2022-11-07 16:06:34 -05:00
Ylva Selling
e04ccdd15d Merge remote-tracking branch 'origin/master' into issue/2093 2022-11-07 12:37:35 -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
68ea36e08d Use renderable target vectors to calculate translation 2022-10-28 14:03:41 -04:00
Ylva Selling
70bfeb12ed Fix comments on PR 2022-10-27 14:07:39 -04:00
Ylva Selling
4a8e4a35bc Create timer that allows the browser to reload before changing the border radius 2022-10-12 11:08:24 -04:00
Ylva Selling
0f55616a3e Merge branch 'master' into issue/2093
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
2022-10-12 09:14:41 -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
a49e37fedc Turn vertical fov into properties to ensure that the fov is synchronized on all nodes 2022-09-22 05:10:05 -04:00
Ylva Selling
2c31e485d8 Add potential fix for flickering of target 2022-09-22 04:23:16 -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
fffc48b627 Fix comments on PR 2022-08-25 17:14:02 -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
74f6f0803a Fix some bugs with the border radius 2022-08-12 15:01:32 -04: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
Ylva Selling
b29b646cec Change how the calculation of the fine tuning is done 2022-08-05 14:27:01 -04: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
Alexander Bock
173b22c7d2 Remove compiler warnings 2022-07-19 10:20:11 +02: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
Emma Broman
3ebb439d72 Add documentations and remove unused input argument 2022-05-05 18:26:05 +02:00
Ylva Selling
18cc19416d Add lua function for stopping animations 2022-05-04 16:13:44 -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
00cc4fc0f1 Cleanup - remove unused variables and highlight 2022-05-03 10:51:00 -04:00
Ylva Selling
83bcbfb74f Add property to show and hide display copies 2022-04-29 15:51:15 -04:00
Ylva Selling
89bd33d7eb Store opacities for the selected images and pass to GUI in topic 2022-04-29 10:50:45 -04:00
Ylva Selling
4692c4d74b Fix comments on pull request 2022-04-28 11:33:54 -04:00
Emma Broman
8896b92f82 Only send skybrowser topic message if data changed
Maybe a little ugly to check the jsonString, but it does the job for now. Later we should probably make a nicer implementation
2022-04-28 12:40:52 +02:00
Emma Broman
9d0e9c84d4 Removed some unused functions 2022-04-28 11:35:36 +02:00
Ylva Selling
c998fc5439 Add check to make sure browser is intialized before passing messages to wwt. This removes error messages upon startup 2022-04-27 17:20:27 -04:00
Ylva Selling
a2d5aae21a Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-04-26 14:39:09 -04:00