Commit Graph

373 Commits

Author SHA1 Message Date
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
Ylva Selling
d7eec159fc Merge pull request #2426 from OpenSpace/issue/2425
Fix bug that channels in cluster don't set the field of view to the same value after animating
2023-02-02 16:17:06 -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
Alexander Bock
a73edcc0af Merge branch 'master' into issue/2425 2023-01-28 19:50:47 +01:00
Ylva Selling
b7ca19dff7 Address comments on PR 2023-01-27 17:06:22 -05:00
Ylva Selling
7ac8faea39 Set default texture quality to 1 as it seems that OS can handle it 2023-01-27 13:49:28 -05:00
Ylva Selling
f781dfcd9c Fix bug with screenspaceskybrowser scale crashing OpenSpace 2023-01-27 13:49:12 -05:00
Alexander Bock
d52c5dd0d9 Cleanup code with designated initializer lists 2023-01-22 23:01:32 +01:00
Alexander Bock
a2a1554c9a Small cleanup of property documentation 2023-01-09 00:11:58 +01: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
fb5aa1f1b1 Merge branch 'master' into feature/skybrowser-drag-and-drop 2022-12-19 15:37:56 -05:00
Ylva Selling
a60b0e8959 Fix bug when master has no rendering 2022-12-19 14:58:20 -05: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
8dc9541b5b Resolve comments in PR 2022-12-16 16:11:07 -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
2b586ec234 Change logic of reordering of images to accomodate for drag and drop 2022-11-17 11:20:25 -05:00
Ylva Selling
7b85209dfc Mark functions in header file as const as well 2022-11-07 16:06:34 -05:00
Ylva Selling
2dc6ecb1ae Mark functions as const as adressed in PR comment 2022-11-07 13:00:24 -05:00
Ylva Selling
bab3c78cf2 Add target node id to skybrowser topic 2022-11-07 12:53:30 -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
f1ff3c2db3 Cleanup 2022-10-27 17:15:53 -04:00
Ylva Selling
cd92ea31dd First draft of using equatorial coordinates for dragging 2022-10-27 17:09:22 -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
c710aa3a34 Ensure browser is initialized properly before executing javascript 2022-10-07 16:20:43 -04:00
Ylva Selling
59209928e6 Clamp user input 2022-10-07 16:08:51 -04:00
Ylva Selling
49da498ee3 Fix bug of sending set radius message too early 2022-10-07 16:08:34 -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
41b45de1fb Merge remote-tracking branch 'origin/master' into issue/2029 2022-10-06 15:13:01 -04:00
Micah Acinapura
90f2ad0cbe telling browser to reload collection on reload 2022-10-04 14:12:00 -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
7ed3c78578 Set initialize to false when reloading so the browser can redo the initialization process 2022-09-23 12:53:16 -04:00
Ylva Selling
f6c3ab2ee8 Set the size of the target on the master node only to ensure that the target plane is the same size on all nodes in a cluster 2022-09-22 05:10:33 -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
a88ea892db Fix typo 2022-09-22 04:25:57 -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
Alexander Bock
664eb60f4f Increase the compile times by including more precompiled headers (#2217)
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
2022-08-26 16:32:21 +02:00
Ylva Selling
fffc48b627 Fix comments on PR 2022-08-25 17:14:02 -04:00
Ylva Selling
77822656b2 Update wwt url to the correct link 2022-08-25 16:59:40 -04:00
Ylva Selling
12be6d5ab7 Make code backwards compatible 2022-08-25 16:43:30 -04:00