mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-25 05:48:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

ugly minHeightFromSurface check on focus node (only earth)

Browse Source
This commit is contained in:
Jonathan Bosson
2017-03-10 16:18:15 -07:00
parent 6b0b2070ef
commit 88db722006
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/include/TouchInteraction.h
+1 -1
View File
@@ -100,7 +100,7 @@ class TouchInteraction
glm::dvec3 _previousFocusNodePosition;
double _dt;
double _minHeightFromSurface;
int _interactionMode;
double _sensitivity;
double _baseFriction;
modules/touch/src/TouchInteraction.cpp
+7 -3
View File
@@ -56,7 +56,7 @@ TouchInteraction::TouchInteraction()
_sensitivity{ 0.5 }, _baseFriction{ 0.02 },
_vel{ 0.0, glm::dvec2(0.0), glm::dvec2(0.0), glm::dvec2(0.0), glm::dvec2(0.0) },
_friction{ _baseFriction, _baseFriction/2.0, _baseFriction, _baseFriction, _baseFriction },
_previousFocusNodePosition{ glm::dvec3(0.0) }, _dt{ 0.0 }
_previousFocusNodePosition{ glm::dvec3(0.0) }, _minHeightFromSurface{ 6.6 * 1000000.0 }
{}
TouchInteraction::~TouchInteraction() { }
@@ -85,7 +85,7 @@ void TouchInteraction::update(const std::vector<TuioCursor>& list, std::vector<P
});
double zoomFactor = (distance - lastDistance) * glm::distance(_camera->positionVec3(), _camera->focusPositionVec3());
_vel.zoom += zoomFactor * (_sensitivity*3.0);
_vel.zoom += zoomFactor / _sensitivity;
break;
}
case PAN: { // add local rotation velocity
@@ -187,7 +187,11 @@ void TouchInteraction::step(double dt) {
globalCamRot = normalize(quat_cast(inverse(lookAtMat)));
}
{ // Zooming
camPos += directionToCenter*_vel.zoom*dt;
dvec3 centerToCamera = camPos - centerPos;
if (length(_vel.zoom*dt) < length(centerToCamera) && length(centerToCamera) > _minHeightFromSurface) // should get boundingsphere from focusnode
camPos += directionToCenter*_vel.zoom*dt;
else
_vel.zoom = 0.0;
}
decelerate();