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

Cleanup

Browse Source
This commit is contained in:
sylvass
2021-11-15 15:34:35 -05:00
parent 4b81c76afe
commit b9aaab22a5
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule.cpp
+5 -3
View File
@@ -275,7 +275,7 @@ SkyBrowserModule::SkyBrowserModule()
_resizeDirection = _mouseOnPair->getBrowser()->isOnResizeArea(
_mousePosition
);
if (_resizeDirection != glm::vec2{ 0 }) {
if (_resizeDirection != glm::ivec2{ 0 }) {
_mouseOnPair->getBrowser()->saveResizeStartSize();
_startBrowserSize = _mouseOnPair->getBrowser()->
screenSpaceDimensions();
@@ -336,7 +336,7 @@ SkyBrowserModule::SkyBrowserModule()
if (_isResizing) {
// Calculate scaling factor
glm::vec2 mouseDragVector = (_mousePosition-_startMousePosition);
glm::vec2 scaling = mouseDragVector * _resizeDirection;
glm::vec2 scaling = mouseDragVector * glm::vec2(_resizeDirection);
glm::vec2 newSizeRelToOld = (_startBrowserSize + (scaling)) /
_startBrowserSize;
// Scale the browser
@@ -345,7 +345,9 @@ SkyBrowserModule::SkyBrowserModule()
// For dragging functionality, translate so it looks like the
// browser isn't moving. Make sure the browser doesn't move in
// directions it's not supposed to
translation = mouseDragVector * abs(_resizeDirection) / 2.f;
translation = 0.5f * mouseDragVector * abs(
glm::vec2(_resizeDirection)
);
}
// Translate