Commit Graph

183 Commits

Author SHA1 Message Date
Alexander Bock
44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01: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
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
Micah Acinapura
90f2ad0cbe telling browser to reload collection on reload 2022-10-04 14:12:00 -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
4214811c6a Add lua function to reload a display copy on a specific node 2022-09-22 03:07:04 -04:00
Ylva Selling
77822656b2 Update wwt url to the correct link 2022-08-25 16:59:40 -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
9cc4c595a8 Code Cleanup (#2191)
* constexpr const -> constexpr
* const char* -> std::string_view
2022-07-25 15:57:45 +02: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
bcb5c7bd28 Merge branch 'master' into feature/gamma-correction 2022-06-29 04:21:46 -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
d23969b8d3 Add gamma correction to screen space renderable (SSR) shader, property for SSR and default value gamma = 2.2 for sky browser display copies 2022-06-21 10:47:44 -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
da4f1026ce Remove doxygen style comments for the lua functions 2022-05-05 09:59:37 -04: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
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
89bd33d7eb Store opacities for the selected images and pass to GUI in topic 2022-04-29 10:50:45 -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
f89301a70a Move check for image collection is loaded in order to improve interaction 2022-04-27 17:13:24 -04:00
Ylva Selling
8ba2976859 Update image collection 2022-04-27 10:44:19 -04:00
Ylva Selling
939dfae319 Add lua function to dispatch point spacecraft event 2022-04-26 18:39:31 -04:00
Ylva Selling
62222c2f5b Add descriptions of lua functions 2022-04-26 17:39:38 -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
47b3881682 Give each sky target a unique name in the Gui 2022-04-26 19:49:05 +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
694c883418 Whitespace cleanup 2022-04-26 10:56:46 +02:00
Ylva Selling
af9643aaee Update to proper url 2022-04-20 10:54:02 -04:00
Ylva Selling
96211f115f Update url to new version of webpage 2022-04-20 10:19:33 -04: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
Ylva Selling
17965a130d Create property for hiding the screenspaceskybrowser instead of placing it outside of the fov 2022-04-14 15:52:04 -04:00
Ylva Selling
3e9a590ba8 Add SkyBrowser topic to server 2022-04-13 18:24:00 -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