Commit Graph

3888 Commits

Author SHA1 Message Date
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
3573859ffe Add resizing functionality to all corners and side of browser 2021-03-18 16:13:46 +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
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
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
3bc5d00aaa Add functionality to drag target when dragging on zoom window 2021-03-11 16:20:03 +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
f2a3f9b9ff Merge branch 'master' into thesis/2021/skybrowser 2021-03-09 08:47:11 +01:00
Ylva Selling
0be1f8d48d Add check for joining thread so it is joinable 2021-03-08 16:29:33 +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
af98784dc4 Add call to showtarget function 2021-03-05 16:00:04 +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
f3de15de59 Merge resolve 2021-03-03 11:39:16 +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
Ester Lindgren
f444fcfa80 Add function to disable faceCamera prpoerty 2021-03-03 10:24:13 +01:00
Malin E
6a59e009ad Merge pull request #1517 from OpenSpace/issue/1516
Issue 1516
2021-03-03 10:06:39 +01:00
Malin Ejdbo
4fb8a36952 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Ylva Selling
8eadcafce3 Change skybrowser module to work with one localhost and change variable names to ra and dec 2021-03-02 14:27:02 +01:00
Malin Ejdbo
f7a1a24acc Only add eclipse properties if globe has data for eclipse 2021-03-02 11:23:23 +01:00
Emma Broman
97144df4da Add a colored glare to exoplanet stars (#1511)
* Add possibility to multiply color to an image plane

* Add a colored glare to exoplanet stars (issue #1305)
2021-03-02 09:30:03 +01:00
Emma Broman
63fa95504c Expose ImGui external to other modules
And update demo function name to match new version
2021-03-02 08:48:25 +01:00
Emma Broman
29e77534c7 Make use of new verifiers (Color and File) (#1510)
* Use codegen for renderable discs

* Utilize color and file verifier

* Add missing property assignment in exoplanets module
2021-03-02 08:11:49 +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
Emma Broman
157ffff25b Update imgui external 2021-03-01 13:24:28 +01:00