From 97ef55b4be8cc66000706ec3a4987d03aedf5446 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Fri, 16 Mar 2018 12:39:39 -0600
Subject: [PATCH] Default-disable debug logging, exponential zoom coeff change
 and additional debug log statement

---
 modules/touch/include/touchinteraction.h |  3 ++-
 modules/touch/src/touchinteraction.cpp   | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h
index 6ad836b68b..4df1d41522 100644
--- a/modules/touch/include/touchinteraction.h
+++ b/modules/touch/include/touchinteraction.h
@@ -37,7 +37,7 @@
 #include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec4property.h>
 
-#define TOUCH_DEBUG_PROPERTIES
+//#define TOUCH_DEBUG_PROPERTIES
 
 namespace openspace {
 
@@ -198,6 +198,7 @@ private:
 
     int pinchConsecCt = 0;
     double pinchConsecZoomFactor = 0;
+    //int stepVelUpdate = 0;
 #endif
 
     // Class variables
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 3dedeffdfd..d76f1e2216 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -224,7 +224,7 @@ TouchInteraction::TouchInteraction()
     , _rollAngleThreshold(RollThresholdInfo, 0.025f, 0.f, 0.05f)
     , _orbitSpeedThreshold(OrbitSpinningThreshold, 0.005f, 0.f, 0.01f)
     , _spinSensitivity(SpinningSensitivityInfo, 1.f, 0.f, 2.f)
-    , _zoomSensitivity(ZoomSensitivityInfo, 1.01f, 1.0f, 1.1f)
+    , _zoomSensitivity(ZoomSensitivityInfo, 1.025f, 1.0f, 1.1f)
     , _zoomSensitivityDistanceThreshold(ZoomSensitivityDistanceThresholdInfo, 0.05, 0.01, 0.25)
     , _zoomBoundarySphereMultiplier(ZoomBoundarySphereMultiplierInfo, 1.001, 1.0, 1.01)
     , _inputStillThreshold(InputSensitivityInfo, 0.0005f, 0.f, 0.001f)
@@ -1173,6 +1173,14 @@ void TouchInteraction::step(double dt) {
         _camera->setPositionVec3(camPos);
         _camera->setRotation(globalCamRot * localCamRot);
 
+#ifdef TOUCH_DEBUG_PROPERTIES
+        //Show velocity status every N frames
+        /*if (++stepVelUpdate >= 60) {
+            stepVelUpdate = 0;
+            LINFO("DistToFocusNode " << length(centerToCamera) << " stepZoomVelUpdate " << _vel.zoom);
+        }*/
+#endif
+
         _tap = false;
         _doubleTap = false;
         if (_reset) {
@@ -1300,7 +1308,7 @@ void TouchInteraction::resetToDefault() {
     _rollAngleThreshold.set(0.025f);
     _orbitSpeedThreshold.set(0.005f);
     _spinSensitivity.set(1.0f);
-    _zoomSensitivity.set(1.04f);
+    _zoomSensitivity.set(1.025f);
     _inputStillThreshold.set(0.0005f);
     _centroidStillThreshold.set(0.0018f);
     _interpretPan.set(0.015f);
@@ -1332,6 +1340,7 @@ void TouchInteraction::setFocusNode(SceneGraphNode* focusNode) {
     _focusNode = focusNode;
 }
 
+#ifdef TOUCH_DEBUG_PROPERTIES
 TouchInteraction::DebugProperties::DebugProperties()
     : properties::PropertyOwner({ "TouchDebugProperties" })
     , interactionMode(
@@ -1366,5 +1375,6 @@ TouchInteraction::DebugProperties::DebugProperties()
     addProperty(minDiff);
     addProperty(rollOn);
 }
+#endif
 
 } // openspace namespace