mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 06:49:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

new ideas on how 3+ fingers should work, needs feedback

Browse Source
This commit is contained in:
Jonathan Bosson
2017-05-17 16:55:23 -06:00
parent b7da01f322
commit bae7110f30
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/ghoul
+1 -1
Submodule ext/ghoul updated: 894358db7a...20131b6897
modules/touch/src/TouchInteraction.cpp
+5 -3
View File
@@ -269,12 +269,14 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
}
else if (ptr->nDOF == 6) {
for (int i = 0; i < ptr->nDOF; ++i) { // 3 finger case
//g[i] = (i > 1 && i < 4) ? g[i] : g[i] / std::abs(g[i]); // like it used to be
if (ptr->onlyPan) { // temp for feedback
g[i] = g[i] / std::abs(g[i]); // no zoom, weird roll sometimes, otherwise only pan
}
else {
// do nothing - fits fingers well, but is difficult to control
//g[i] = (i < 4) ? g[i] : g[i] / std::abs(g[i]); // like it used to be, mute roll or not?
}
}
}
@@ -539,7 +541,7 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list, co
}
else { // should zoom in to current but not too much
double dist = glm::distance(_camera->positionVec3(), _camera->focusPositionVec3()) - _focusNode->boundingSphere();
_vel.zoom = (_sensitivity.zoom * std::max(_touchScreenSize.value() * 0.1, 1.0)) * _tapZoomFactor * dist;
_vel.zoom = (_sensitivity.zoom * std::max(_touchScreenSize.value() * 0.1, 1.0)) * _tapZoomFactor * dist; // this should not be based on dt
}
break;
}
@@ -586,7 +588,7 @@ void TouchInteraction::step(double dt) {
// if we have chosen a new focus node
if (_slerpdT < _slerpTime) {
_slerpdT += dt;
localCamRot = slerp(localCamRot, _toSlerp, _slerpdT / _slerpTime * 0.018);
localCamRot = slerp(localCamRot, _toSlerp, _slerpdT / _slerpTime * 0.025);
}
}
{ // Orbit (global rotation)