Commit Graph

233 Commits

Author SHA1 Message Date
Ylva Selling badd2e2ff2 Create animation class to clean up animation code 2022-03-30 16:06:09 -04:00
Ylva Selling 4063a49297 Change browser and targets starting position. Make browser larger than target by default 2022-03-30 14:48:36 -04:00
Ylva Selling 0f81a738db Pass the image fov to the GUI 2022-03-30 11:17:13 -04:00
Ylva Selling 85f3ac4bd9 Add check for if image data folder is empty. This fixes issue #1933 2022-03-29 18:03:06 -04:00
Ylva Selling 7781c7c10d Fix issue with roll and right-click drag. This fixes issue #1932 2022-03-29 16:18:01 -04:00
Ylva Selling 90e1b05b76 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
2022-03-29 14:35:11 -04:00
Ylva Selling 82ae56ee88 Fix the "hideChromeInterface" call (will work as soon as the server wwt dist is updated) 2022-03-25 17:11:16 -04:00
Ylva Selling 0df6261fa0 Make fovs doubles instead of floats and use the target as for the roll calculation instead of the camera. This is however still not correct (need the up vector for the target) 2022-03-25 16:54:44 -04:00
Ylva Selling 50d509b294 Correct the rendering of the fov (was too large) 2022-03-25 16:52:21 -04:00
Ylva Selling 680cdc4b8f Move the hover circle with lua script instead of C++ code to make it work in a dome environment 2022-03-23 18:46:19 -04:00
Ylva Selling 33ddd94426 Fix issues with fading by using the system time instead of fps 2022-03-23 18:45:57 -04:00
Ylva Selling aed059a147 Fix precision issue that led to nan values. This fixes #1934 2022-03-23 16:19:10 -04:00
Ylva Selling 5b4c3da91e Make the smallest fov possible a lot smaller 2022-03-23 14:06:40 -04:00
Ylva Selling f34884e86b Make apperance of target match the dimensions of the sky browser. Fixes issue #1926 2022-03-23 13:27:01 -04:00
Ylva Selling ba0ce07181 Create setting to render the interactive sky browser only on master. This could be useful in a dome setting 2022-03-23 09:21:56 -04:00
Ylva Selling c3c453b45c Fix search of pairs to include scene graph node identifier as well 2022-03-23 09:21:18 -04:00
Ylva Selling 5bbf7d3d33 Fixes after merging in new cef version and master 2022-03-22 16:01:34 -04:00
Ylva Selling ea77f74731 Make it possible to add n number of additional rendered copies of the sky browser, that can be placed with RAE coordinates 2022-03-17 11:53:12 -04:00
Ylva Selling 220c1090d2 Make copies of screenspacebrowser look at camera 2022-03-17 10:54:45 -04:00
Ylva Selling 128d21b759 Transform the hovercircle to a renderable so it works in a dome environment 2022-03-17 10:36:04 -04:00
Ylva Selling b405756ce9 Add missing files for target renderable 2022-03-17 09:43:24 -04:00
Ylva Selling 9c3b61aaf9 Ensure that the TargetBrowserPair can be found regardless if the identifier of the renderable or the node is passed to the api. This fixes a bug with the "openspace.skybrowser.adjustCamera" function 2022-03-16 16:28:44 -04:00
Ylva Selling 7d3a88f007 Make it possible to add two copies of the sky browser, which will make it possible to display many copies in a dome environment and have an interactive copy on the master node 2022-03-16 16:22:56 -04:00
Ylva Selling 99bfd1cf57 Implement fine tuning of target in world space coordinates 2022-03-16 12:06:15 -04:00
Ylva Selling bf5069fbf6 Change screenspaceskybrowser to renderableskybrowser 2022-03-16 11:20:37 -04:00
Ylva Selling 6f4b91696c Change image directory name to lower case 2022-03-07 15:34:43 -05:00
Ylva Selling f7be9c05e0 Add property to module for controlling the rotation speed of the camera 2022-03-07 15:11:03 -05:00
Ylva Selling ae86396317 Make crosshair appear at all times with a fixed size 2022-03-04 17:37:11 -05:00
Ylva Selling 119016ee54 Change default position of the target to upper right part of the screen 2022-03-04 17:24:07 -05:00
Ylva Selling d7fa2a31a8 Make conversion use the combinedViewMatrix to use the SGCT view matrix, that hopefully will make the target work in the dome 2022-03-04 12:30:58 -05:00
Ylva Selling ec201d954a Pull request code style fixes 2022-03-04 12:30:12 -05:00
Ylva Selling bd43816060 Pull request fix requested changes 2022-03-03 12:10:41 -05:00
sylvass 21e572149e Fix comments from pull request 2022-03-02 16:39:44 -05:00
sylvass 02c9ef4a7a Add missing files 2022-02-28 17:19:41 -05:00
sylvass d96ea9189d Reset files that shouldn't be changed for pull request 2022-02-22 16:20:40 -05:00
sylvass 46dc827180 Merge resolve from updating submodules 2022-02-22 15:36:05 -05:00
sylvass ee26ab4e08 Remove comments with other urls for the sky browser 2022-02-22 09:51:53 -05:00
sylvass ea174f544e Remove unneccessary time variables 2022-02-22 09:51:06 -05:00
sylvass 4af95311b9 Add linewidth property to sky target 2022-02-22 09:50:55 -05:00
sylvass 96149a7978 Tidy up shader code 2022-02-22 09:50:26 -05:00
sylvass 8b71bbd0da Remove renderable sky browser (3D browser and related functionality) 2022-02-18 12:21:12 -05:00
sylvass 863b555747 Ensure all nodes in a cluset get the same border color for the browsers 2022-02-18 11:28:09 -05:00
sylvass 5a07842b9e Add lua function to translate screen space renderable. Add documentation for the lua functions. 2022-02-17 08:55:03 -05:00
sylvass ffee7e6f5c Don't highlight browser when using rae coords since dragging is not working in that mode currently 2022-02-10 07:22:59 -05:00
sylvass a88246c56b Rename "Pair" to "TargetBrowserPair" 2022-02-10 07:11:39 -05:00
sylvass 07c17be12c Ensure all lua functions accepts the browser id as the first argument (except when there is a target id as well) 2022-02-10 07:01:18 -05:00
sylvass 51496956fc Pass data regarding if sky browser and target are facing camera and using radius azimuth elevation to gui 2022-02-07 09:46:00 -05:00
sylvass d28de2e9ef Fix bug with translation 2022-01-26 08:54:53 -05:00
sylvass 5128056272 Make hover circle work again and remove unneccessary conversion function 2022-01-26 05:41:46 -05:00
sylvass f8936db40c Remove sky browser properties from the screen space renderables 2022-01-26 05:41:16 -05:00