Commit Graph

7900 Commits

Author SHA1 Message Date
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
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
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
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
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
Ester Lindgren 95a012cfae Merge resolve 2021-03-23 16:53:34 +01:00
Ester Lindgren 18e5916a04 Set the crosshair of target to have fixed linewidth 2021-03-23 16:46:52 +01:00
Ylva Selling 74609230b6 Make browser and target highlight when the mouse is hovering on them 2021-03-23 15:01:40 +01:00
Ylva Selling 6ff0e6475a Ensure target and browser always are visible together by using the enabled flag 2021-03-23 09:51:15 +01:00
Ylva Selling fbc05244e1 Make it possible to add many browsers and targets by moving functionality to ScreenSpaceRenderable 2021-03-23 09:44:14 +01:00
Ylva Selling ac275140c5 Load browser and target as assets 2021-03-22 13:54:01 +01:00
Ylva Selling 51f40172f7 Move browser specific functionality to screenspacebrowser 2021-03-22 09:57:49 +01:00
Ylva Selling 39b1887e14 Merge resolve 2021-03-19 15:14:12 +01:00
Ester Lindgren b17bb82359 Change target to crosshair in relation to field of view 2021-03-19 14:43:55 +01:00
Ylva Selling ac105178c8 Add scale function to screenspacetarget 2021-03-19 14:42:11 +01:00
Ylva Selling d2d6899e7a Add draft for creating the browser and target from GUI. Still problem with finding browser after creation 2021-03-19 13:52:21 +01:00
Ylva Selling e463e35e1b Fix bug with target having flipped y-axis 2021-03-19 11:26:39 +01:00
Ylva Selling 65c3de6c86 Merge resolve fix 2021-03-19 11:08:37 +01:00
Ester Lindgren 543e3641ab Set target dimensions from browser dimensions 2021-03-19 09:57:14 +01:00
Ylva Selling ac4fc926a2 Add function to create browser 2021-03-19 09:37:19 +01:00
Ylva Selling c728c38daa Fix problems with submodules 2021-03-19 09:06:33 +01:00
Ylva Selling 3573859ffe Add resizing functionality to all corners and side of browser 2021-03-18 16:13:46 +01:00
Ylva Selling 1a49b1c4ba Merge in master 2021-03-18 09:39:41 +01:00
Ylva Selling e0559f85b9 Merge branch 'master' into thesis/2021/skybrowser 2021-03-18 09:35:56 +01:00
Ylva Selling 707027664f Merge resolve 2021-03-18 09:35:00 +01:00
Ylva Selling c05f8a4e87 Add working resize and dragging functionality 2021-03-18 09:33:34 +01:00
Alexander Bock e2c1414ba6 Update to newest codegen, replace std::monostate with ghoul::Dictionary 2021-03-17 21:26:57 +01:00
Alexander Bock 07389bd6bf Update codegen repository 2021-03-17 00:21:00 +01:00
Alexander Bock ed980bb5d8 Add support for passing shared pointers into the OrVerifier 2021-03-17 00:18:53 +01:00
Malin Ejdbo 29d4eae3a5 Update ISS model 2021-03-16 11:47:30 +01:00
Alexander Bock 615fc82b51 Update submodules
- SGCT:  Fixed an issue that lead to a crash in debug mode
 - Ghoul: Fixed an issue that prevented CEF locales to be copied in a fresh install
2021-03-15 14:50:39 +01:00
Emma Broman 20519d007b Remove hardcoded path to B-V colormap (#1531)
Also prevent future problems in reading the file (e.g. if number of lines of comments would change)
2021-03-15 13:22:41 +01:00
Ester Lindgren d43be4a624 Merge resolve 2021-03-12 15:21:56 +01:00
Ester Lindgren 6ac4e594c5 Move createtarget function call 2021-03-12 14:53:08 +01:00
Ester Lindgren 9580c617ef Add target square with shader 2021-03-12 14:49:53 +01:00
Emma Broman b324ff0705 Update Ghoul 2021-03-12 13:10:51 +01:00
Ylva Selling ca93e2990e Change to logarithmic scrolling 2021-03-11 17:21:18 +01:00
Ylva Selling a5371776d9 Change view direction to what the target points at 2021-03-11 17:11:00 +01:00
Ylva Selling 93870a46e6 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-11 16:21:10 +01:00
Ylva Selling 3bc5d00aaa Add functionality to drag target when dragging on zoom window 2021-03-11 16:20:03 +01:00
Ylva Selling 06ffdecc90 Fix small error of dragging 2021-03-11 16:19:17 +01:00
Ylva Selling c9fc1765ad Change drag function of target and browser to callback function 2021-03-11 16:12:23 +01:00