mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add functionality to drag target when dragging on zoom window

Browse Source
This commit is contained in:
Ylva Selling
2021-03-11 16:19:17 +01:00
parent c9fc1765ad
commit 3bc5d00aaa
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/skybrowser/skybrowsermodule.cpp
View File

@@ -99,7 +99,6 @@ SkyBrowserModule::SkyBrowserModule()
addProperty(_zoomFactor);
global::callback::mousePosition->emplace_back(
[&](double x, double y) {
glm::vec2 pos = glm::vec2(static_cast<float>(x), static_cast<float>(y));
@@ -146,6 +145,13 @@ SkyBrowserModule::SkyBrowserModule()
}
else if (mouseIsOnTarget && button == MouseButton::Left) {
startDragMousePosTarget = _mousePosition;
startDragObjectPosTarget = _skyTarget->getScreenSpacePosition();
currentlyDraggingTarget = true;
return true;
}
else if (mouseIsOnBrowser && button == MouseButton::Right) {
startDragMousePosTarget = _mousePosition;
startDragObjectPosTarget = _skyTarget->getScreenSpacePosition();
currentlyDraggingTarget = true;
@@ -267,7 +273,7 @@ void SkyBrowserModule::handleInteractions() {
while (_listenForInteractions) {
if (currentlyDraggingBrowser) {
_skyBrowser->translate(_mousePosition - startDragMousePosTarget, startDragObjectPosTarget);
_skyBrowser->translate(_mousePosition - startDragMousePosBrowser, startDragObjectPosBrowser);
}
if (currentlyDraggingTarget) {
_skyTarget->translate(_mousePosition - startDragMousePosTarget, startDragObjectPosTarget);