Commit Graph

44 Commits

Author SHA1 Message Date
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
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 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 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 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
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 3573859ffe Add resizing functionality to all corners and side of browser 2021-03-18 16:13:46 +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
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
Ylva Selling c9fc1765ad Change drag function of target and browser to callback function 2021-03-11 16:12:23 +01:00
Ylva Selling ebcbce56f5 Add functionality to drag target 2021-03-11 14:00:27 +01:00
Ylva Selling c16ee0698f Implement simple version of scroll 2021-03-11 11:44:13 +01:00
Ester Lindgren fc3fa859af Merge resolve 2021-03-11 10:10:26 +01:00
Ester Lindgren 8a0e9e6ed0 Add ScreenSpaceSkyTarget class to handle target 2021-03-11 10:04:53 +01:00
Ylva Selling c32c1fff6a Add functionality to drag skybrowser 2021-03-11 09:23:10 +01:00
Ylva Selling 1bde0560c7 Merge resolve 2021-03-08 16:07:18 +01:00
Ylva Selling 8ac85466e7 Make thread be joined, not detached, and run depending on a flag 2021-03-08 15:53:45 +01:00
Ester Lindgren fce49cf4ec Change from SkybrowserModule to SkyBrowserModule in lua function 2021-03-08 14:03:00 +01:00
Ester Lindgren 02c64802cf Merge Resolve 2021-03-08 13:53:58 +01:00
Ester Lindgren c11b66173e Create subclass of ScreenSpaceBrowser in SkyBrowserModule and change name of module Skybrowser to SkyBrowser 2021-03-08 13:47:50 +01:00
Ylva Selling a77fbcfcfe Merge resolve 2021-03-08 08:49:39 +01:00
Ylva Selling 72a6b3623d Add message for loading images and functionality to show a target 2021-03-08 08:46:57 +01:00
Ester Lindgren d85bdd0239 Merge resolve 2021-03-05 15:45:31 +01:00
Ester Lindgren 1eb29ab5ca Add centered target frame 2021-03-05 15:33:48 +01:00
Ylva Selling 913e975acb Change messages to be created in ghoul dictionaries 2021-03-05 11:55:51 +01:00
Ylva Selling 7847111afc Add pointer to ScreenSpaceBrowser in SkyBrowserModule and add function to pause time in WWT 2021-03-05 10:26:45 +01:00
Ylva Selling 7965ed5d24 Make WWT follow OpenSpace w thread, change interval for zoom and fix coordinate conversion error 2021-03-03 16:45:35 +01:00
Ylva Selling df5719f39f Change structure of message passing to WWT to more general case with functions 2021-03-03 11:36:23 +01:00
Ylva Selling 87df6932f8 Create functions to look in WWT-window at direction in OpenSpace and some cleanup 2021-03-01 16:50:01 +01:00
Ylva Selling b24a75e484 Clean up structure so ScreenSpaceBrowser only executes string for javascript 2021-03-01 13:32:53 +01:00
Ester Lindgren a00013af1c Test to setup message communication 2021-02-25 11:03:22 +01:00
Ylva Selling 7c83c4e3da Add working way of instantiating ScreenSpaceBrowser from LuaScript 2021-02-23 14:40:48 +01:00
Ester Lindgren 7d58cf40c2 Add module for skybrowser 2021-02-23 14:07:34 +01:00