Alexander Bock
a2a1554c9a
Small cleanup of property documentation
2023-01-09 00:11:58 +01:00
Alexander Bock
4f4764209f
Happy new year
2023-01-02 11:19:33 +01:00
Ylva Selling
fb5aa1f1b1
Merge branch 'master' into feature/skybrowser-drag-and-drop
2022-12-19 15:37:56 -05:00
Ylva Selling
a60b0e8959
Fix bug when master has no rendering
2022-12-19 14:58:20 -05:00
Ylva Selling
8dc9541b5b
Resolve comments in PR
2022-12-16 16:11:07 -05:00
Alexander Bock
44e5b17ec9
Global pass over the code to remove trailing spaces
2022-11-22 21:06:52 +01:00
Ylva Selling
2b586ec234
Change logic of reordering of images to accomodate for drag and drop
2022-11-17 11:20:25 -05:00
Ylva Selling
7b85209dfc
Mark functions in header file as const as well
2022-11-07 16:06:34 -05:00
Ylva Selling
2dc6ecb1ae
Mark functions as const as adressed in PR comment
2022-11-07 13:00:24 -05:00
Ylva Selling
bab3c78cf2
Add target node id to skybrowser topic
2022-11-07 12:53:30 -05:00
Ylva Selling
e04ccdd15d
Merge remote-tracking branch 'origin/master' into issue/2093
2022-11-07 12:37:35 -05:00
Ylva Selling
fb539b953e
Create another mode for target dragging to work in dome
2022-11-01 14:36:19 -04:00
Ylva Selling
68ea36e08d
Use renderable target vectors to calculate translation
2022-10-28 14:03:41 -04:00
Ylva Selling
f1ff3c2db3
Cleanup
2022-10-27 17:15:53 -04:00
Ylva Selling
cd92ea31dd
First draft of using equatorial coordinates for dragging
2022-10-27 17:09:22 -04:00
Ylva Selling
70bfeb12ed
Fix comments on PR
2022-10-27 14:07:39 -04:00
Ylva Selling
4a8e4a35bc
Create timer that allows the browser to reload before changing the border radius
2022-10-12 11:08:24 -04:00
Ylva Selling
0f55616a3e
Merge branch 'master' into issue/2093
...
# Conflicts:
# modules/skybrowser/src/targetbrowserpair.cpp
2022-10-12 09:14:41 -04:00
Ylva Selling
c710aa3a34
Ensure browser is initialized properly before executing javascript
2022-10-07 16:20:43 -04:00
Ylva Selling
59209928e6
Clamp user input
2022-10-07 16:08:51 -04:00
Ylva Selling
49da498ee3
Fix bug of sending set radius message too early
2022-10-07 16:08:34 -04:00
Ylva Selling
cfb3859bb5
Merge remote-tracking branch 'origin/feature/skybrowser-reload' into issue/2029
...
# Conflicts:
# modules/skybrowser/include/renderableskytarget.h
# modules/skybrowser/include/wwtcommunicator.h
# modules/skybrowser/skybrowsermodule.cpp
2022-10-06 15:33:40 -04:00
Ylva Selling
41b45de1fb
Merge remote-tracking branch 'origin/master' into issue/2029
2022-10-06 15:13:01 -04:00
Micah Acinapura
90f2ad0cbe
telling browser to reload collection on reload
2022-10-04 14:12:00 -04:00
Ylva Selling
0fd20db5e8
Add property for synchronizing aim so synchronization can be turned off for performance reasons
2022-09-23 12:53:41 -04:00
Ylva Selling
7ed3c78578
Set initialize to false when reloading so the browser can redo the initialization process
2022-09-23 12:53:16 -04:00
Ylva Selling
f6c3ab2ee8
Set the size of the target on the master node only to ensure that the target plane is the same size on all nodes in a cluster
2022-09-22 05:10:33 -04:00
Ylva Selling
a49e37fedc
Turn vertical fov into properties to ensure that the fov is synchronized on all nodes
2022-09-22 05:10:05 -04:00
Ylva Selling
a88ea892db
Fix typo
2022-09-22 04:25:57 -04:00
Ylva Selling
2c31e485d8
Add potential fix for flickering of target
2022-09-22 04:23:16 -04:00
Ylva Selling
4214811c6a
Add lua function to reload a display copy on a specific node
2022-09-22 03:07:04 -04:00
Alexander Bock
664eb60f4f
Increase the compile times by including more precompiled headers ( #2217 )
...
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
2022-08-26 16:32:21 +02:00
Ylva Selling
fffc48b627
Fix comments on PR
2022-08-25 17:14:02 -04:00
Ylva Selling
77822656b2
Update wwt url to the correct link
2022-08-25 16:59:40 -04:00
Ylva Selling
12be6d5ab7
Make code backwards compatible
2022-08-25 16:43:30 -04:00
Ylva Selling
2778d3d4ac
Merge remote-tracking branch 'origin/master' into issue/2029
...
# Conflicts:
# modules/skybrowser/src/wwtcommunicator.cpp
2022-08-25 16:34:00 -04:00
Alexander Bock
979a5e3378
SkyBrowser Hash Handling ( #2201 )
...
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00
Ylva Selling
74f6f0803a
Fix some bugs with the border radius
2022-08-12 15:01:32 -04:00
Ylva Selling
0250098303
Add rounder border to target and browser, and add border radius to sky browser topic
2022-08-12 12:24:54 -04:00
Ylva Selling
160eab1c1e
Remove display copy properly. Close #2200
2022-08-08 17:23:44 -04:00
Ylva Selling
b29b646cec
Change how the calculation of the fine tuning is done
2022-08-05 14:27:01 -04:00
Emma Broman
0cc5704b6a
Add isGuiWindow check for mouse and keyboard callbacks
...
Fix interaction problems when hovering/clicking with the mouse in a non-GUI window, when having a setup with more than one window (e.g. the single_gui.json setup)
Previously, clicking with the mouse in the rendering window without the GUI also triggered mouse clicks in all the other windows, including the GUI windows. This was disturbing for interaction in the single_gui setup
Now, the GUI modules check to see if the clicked window is actually an interaction window
2022-08-05 11:41:10 +02:00
Alexander Bock
163ac4dcef
Cleanup of mostly asset files
...
- Fixes for all files
- constexpr cleanup
- Cosmetic changes
- Remove punctuation from the end of messages
2022-07-28 17:21:59 +02:00
Alexander Bock
c1252902c7
More Code Cleanup ( #2192 )
...
* Harmonizing ( and ) in function calls
* static const -> constexpr
* Fix compile issue
* Unify shader tab size
* Add _fs and _vs to shaders
* Harmonize spacing
2022-07-26 11:22:41 +02:00
Alexander Bock
9cc4c595a8
Code Cleanup ( #2191 )
...
* constexpr const -> constexpr
* const char* -> std::string_view
2022-07-25 15:57:45 +02:00
Alexander Bock
2f58e8ec8e
Remove some more warnings
2022-07-22 14:27:45 +02:00
Ylva Selling
787e91a892
Merge remote-tracking branch 'origin/master' into feature/getting-started-tour
2022-07-21 12:26:20 -04:00
Alexander Bock
1a052f3c8c
Update to C++20
2022-07-19 15:42:31 +02:00
Alexander Bock
173b22c7d2
Remove compiler warnings
2022-07-19 10:20:11 +02:00
Ylva Selling
5ed02f9dd8
Merge branch 'master' into feature/getting-started-tour
2022-07-12 15:09:00 -04:00