Commit Graph

7946 Commits

Author SHA1 Message Date
Ylva Selling
dc0dcd2eb7 Add utility files 2021-04-30 09:26:33 +02:00
Ylva Selling
dcbd74ab7a Fix offset bug by changing how the target direction is calculated. Move calculations to utility file 2021-04-30 09:24:34 +02:00
Ylva Selling
b7c4d94df0 Use doubles for coordinates and some bugfixes 2021-04-26 14:26:39 +02:00
Ylva Selling
e05a980254 Add a circle which shows where on the sky an image points at 2021-04-21 13:41:41 +02:00
Ylva Selling
cbe038e7d4 Fix bug with field of view by changing all FOVs to VFOV instead of HFOV 2021-04-21 10:59:41 +02:00
Ylva Selling
05a8580edc Add functionality to send credits and target data to GUI 2021-04-19 14:30:49 +02:00
Ylva Selling
a9b73fa352 Remove unneccessary while loop 2021-04-15 16:22:32 +02:00
Ylva Selling
5653823522 Make it possible to send coordinates to GUI as well as code clean up and conversion of RA from hours to degrees upon data loading 2021-04-14 13:20:58 +02:00
Ylva Selling
f6e4c33db3 Set the FOV with respect to the image's zoom level 2021-04-13 15:54:38 +02:00
Ylva Selling
7e81a05bf0 Make target move to look at image coordinate when clicked in GUI 2021-04-13 15:42:51 +02:00
Ylva Selling
fadf20435d Move conversion function to target and add some utility functions to target and browser 2021-04-09 15:04:19 +02:00
Ylva Selling
03cb84c0e2 Add amount of data to Image and make image sending process more efficient 2021-04-09 15:03:18 +02:00
Ylva Selling
4e358fe122 Restructure code for parsing xml to make it more readable 2021-04-08 11:18:23 +02:00
Ylva Selling
a84e8ee48b Bugfix for parsing the xml. Now all images (only with non-empty urls though) are loaded. 2021-04-08 09:58:47 +02:00
Ylva Selling
67a39652d5 Make it possible to select images in GUI and thereby loading them into WWT, and bugfix for parsing xml 2021-04-08 09:35:46 +02:00
Ylva Selling
3f68ea9b4d Send over image name and url to GUI api 2021-04-07 16:15:19 +02:00
Ylva Selling
794902d5cb Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-04-06 15:11:25 +02:00
Ylva Selling
b8d1c33eed Add Lua function to send the image thumbnail url:s to the api 2021-04-06 15:11:14 +02:00
Ester Lindgren
d74de3273b Merge with master 2021-04-06 09:01:48 +02:00
Ester Lindgren
ba0685227f Merge branch 'master' into thesis/2021/skybrowser 2021-04-06 08:52:11 +02:00
Ester Lindgren
8ffee81e64 Merge resolve 2021-04-06 08:48:37 +02:00
Ester Lindgren
c234b69436 Add function to drag and change view within browser 2021-04-06 08:44:42 +02:00
Alexander Bock
52b020d836 Include strict lua file, throw error in configuration loading when overriding with unused variable
- Preventing True/true bug
 - Fix issue with unused variable in configuration_helper
2021-04-01 23:37:35 +02:00
Gene Payne
7fefbf9ea0 Added CMake variable to avoid minizip error with assimp update on linux 2021-03-31 19:33:50 -06:00
Ylva Selling
f99f3e88a9 Move the WWT data handling to class WWTDataHandler and add pointer in module 2021-03-31 17:03:30 +02:00
Ylva Selling
b95d6e5b94 Change rapidxmlparser to tinyxml2 and add more extensive xml parsing and image loading 2021-03-31 16:41:38 +02:00
Alexander Bock
d9a1a0233b Remove apple clang warnings 2021-03-30 22:12:53 +02:00
Alexander Bock
f7e53386fb Update Ghoul repository to get Mac working again 2021-03-30 19:44:35 +02:00
Ylva Selling
b88d58edbb Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-30 08:31:20 +02:00
Ylva Selling
d4e944f73f Add webgui to cmake include dependencies 2021-03-30 08:29:57 +02:00
Ylva Selling
ec138b6897 Add function to save URL to file, parse to XML tree and insert into vector as images 2021-03-30 08:28:32 +02:00
Ylva Selling
0b85180bb5 Add rapid xml parser 2021-03-30 08:24:22 +02:00
Alexander Bock
4ca82fff19 Remove warnings on Apple clang 2021-03-29 23:16:15 +02:00
Alexander Bock
0bfe3f6d72 MacOS compile fix 2021-03-29 21:56:01 +02:00
Alexander Bock
612b9bbc7f Moving more documentation to use codegen (#1549)
- Make use of more codegen in more classes
- Fix verifier for Color4Verifier
2021-03-29 21:50:26 +02:00
Alexander Bock
a49c1f435f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2021-03-29 14:58:24 +02:00
Alexander Bock
797ddf7daf Fix some warnings on AppleClang 2021-03-29 14:58:19 +02:00
Ester Lindgren
19aa6895fd Set fixed width of square target border 2021-03-29 09:57:55 +02:00
Ylva Selling
d72080b2f6 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-29 08:27:53 +02:00
Ylva Selling
bb5042cd50 Create functions to display WWT images 2021-03-29 08:27:40 +02:00
Gene Payne
dd11bfd2f8 Missed a spot with the linux gcc CMake compile options fix 2021-03-28 20:52:33 -06:00
Gene Payne
1f65046127 Updated linux gcc CMake compile options 2021-03-28 20:47:52 -06:00
Alexander Bock
e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Alexander Bock
6aad31000f Don't produce OpenGL performance warning on Intel chips 2021-03-27 22:16:08 +01:00
Alexander Bock
f47d62a5ee Fix verifier for Color4Verifier 2021-03-27 22:16:04 +01:00
Alexander Bock
a6bb8cdecb Split DashboardTextItem from DashboardItem 2021-03-24 17:46:13 +01:00
Emma Broman
38f5a12c24 Avoid crash in RenderEngine if screenshot token has not been registered
This is the case in for example the test application
2021-03-24 14:02:05 +01:00
Alexander Bock
4b25f5c074 Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items 2021-03-24 09:57:27 +01:00
Ester Lindgren
379dc39da0 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-23 17:12:46 +01:00
Ester Lindgren
7ec1da10f1 Merge resolve 2021-03-23 17:07:00 +01:00