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

Cleanup (#600)

Browse Source 
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
This commit is contained in:
Alexander Bock
2018-04-19 13:27:15 -04:00
committed by GitHub
parent 12db1dd0c2
commit 4041bbb935
151 changed files with 1229 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/src/touchinteraction.cpp
+10 -9
View File
@@ -607,7 +607,7 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
_lmSuccess = levmarq(
nDOF,
par.data(),
screenPoints.size(),
static_cast<int>(screenPoints.size()),
nullptr,
distToMinimize,
gradient,
@@ -905,11 +905,9 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
return ROT;
}
else {
float avgDistance = static_cast<float>(
std::abs(dist - lastDist) / list.at(0).getMotionSpeed()
);
float avgDistance = std::abs(dist - lastDist) / list.at(0).getMotionSpeed();
// if average distance between 3 fingers are constant we have panning
if (_panEnabled && (std::abs(dist - lastDist) / list.at(0).getMotionSpeed() < _interpretPan && list.size() == 3)) {
if (_panEnabled && (avgDistance < _interpretPan && list.size() == 3)) {
return PAN;
}
@@ -917,9 +915,9 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
// centroid is over _rollAngleThreshold (_centroidStillThreshold is used to void
// misinterpretations)
else if (std::abs(minDiff) < _inputStillThreshold ||
(std::abs(rollOn) < 100.0 &&
normalizedCentroidDistance < _centroidStillThreshold)) {
(std::abs(rollOn) < 100.0 &&
normalizedCentroidDistance < _centroidStillThreshold))
{
return ROLL;
}
else {
@@ -997,7 +995,10 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
pinchConsecZoomFactor += zoomFactor;
#endif
if ((length(currDistanceToFocusNode) / distanceFromFocusSurface) > _zoomSensitivityDistanceThreshold) {
zoomFactor *= pow(distanceFromFocusSurface, (float)_zoomSensitivity);
zoomFactor *= pow(
distanceFromFocusSurface,
static_cast<float>(_zoomSensitivity)
);
}
_vel.zoom += zoomFactor * _sensitivity.zoom *
std::max(_touchScreenSize.value() * 0.1, 1.0);