Commit Graph

42 Commits

Author SHA1 Message Date
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 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 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 0f55616a3e Merge branch 'master' into issue/2093
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
2022-10-12 09:14:41 -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
Ylva Selling b29b646cec Change how the calculation of the fine tuning is done 2022-08-05 14:27:01 -04: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 89bd33d7eb Store opacities for the selected images and pass to GUI in topic 2022-04-29 10:50:45 -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 a2d5aae21a Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-04-26 14:39:09 -04:00
Ylva Selling 19103a1540 Add browser ratio to the skybrowser topic 2022-04-26 14:37:35 -04:00
Emma Broman 51f9199abd Refactor fading and use fade property instead of opacity 2022-04-26 17:24:15 +02:00
Ylva Selling 4a4c68e1ab Remove unneccessary function 2022-04-19 17:19:05 -04: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 badd2e2ff2 Create animation class to clean up animation code 2022-03-30 16:06:09 -04:00
Ylva Selling 90e1b05b76 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
2022-03-29 14:35:11 -04:00
Ylva Selling 0df6261fa0 Make fovs doubles instead of floats and use the target as for the roll calculation instead of the camera. This is however still not correct (need the up vector for the target) 2022-03-25 16:54:44 -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 f34884e86b Make apperance of target match the dimensions of the sky browser. Fixes issue #1926 2022-03-23 13:27:01 -04:00
Ylva Selling 99bfd1cf57 Implement fine tuning of target in world space coordinates 2022-03-16 12:06:15 -04:00
Ylva Selling bf5069fbf6 Change screenspaceskybrowser to renderableskybrowser 2022-03-16 11:20:37 -04:00
Ylva Selling ec201d954a Pull request code style fixes 2022-03-04 12:30:12 -05:00
Ylva Selling bd43816060 Pull request fix requested changes 2022-03-03 12:10:41 -05:00
sylvass 21e572149e Fix comments from pull request 2022-03-02 16:39:44 -05:00
sylvass 02c9ef4a7a Add missing files 2022-02-28 17:19:41 -05:00