fix camera controls (zoom)

xueyewen · May 17, 2021 · 964fe15 · 964fe15
1 parent bba06c2
commit 964fe15
Show file tree

Hide file tree

Showing 4 changed files with 680 additions and 677 deletions.
diff --git a/depth sensing/cpp/include/GLViewer.hpp b/depth sensing/cpp/include/GLViewer.hpp
@@ -16,10 +16,10 @@
 #define M_PI 3.141592653f
 #endif
 
-#define MOUSE_R_SENSITIVITY 0.015f
-#define MOUSE_UZ_SENSITIVITY 0.75f
+#define MOUSE_R_SENSITIVITY 0.03f
+#define MOUSE_UZ_SENSITIVITY 0.5f
 #define MOUSE_DZ_SENSITIVITY 1.25f
-#define MOUSE_T_SENSITIVITY 10.f
+#define MOUSE_T_SENSITIVITY 0.05f
 #define KEY_T_SENSITIVITY 0.1f
 
 

diff --git a/depth sensing/cpp/src/GLViewer.cpp b/depth sensing/cpp/src/GLViewer.cpp
@@ -131,7 +131,6 @@ GLenum GLViewer::init(int argc, char **argv, sl::CameraParameters param) {
 
     // Create the camera
     camera_ = CameraGL(sl::Translation(0, 0, 0), sl::Translation(0, 0, -100));
-    camera_.setOffsetFromPosition(sl::Translation(0, 0, 5000));
 
     frustum = createFrustum(param);
     frustum.pushToGPU();
@@ -178,27 +177,29 @@ void GLViewer::update() {
         return;
     }
 
-    // Rotate camera with mouse
-    if (mouseButton_[MOUSE_BUTTON::LEFT]) {
-        camera_.rotate(sl::Rotation((float) mouseMotion_[1] * MOUSE_R_SENSITIVITY, camera_.getRight()));
-        camera_.rotate(sl::Rotation((float) mouseMotion_[0] * MOUSE_R_SENSITIVITY, camera_.getVertical() * -1.f));
-    }
-
-    // Translate camera with mouse
-    if (mouseButton_[MOUSE_BUTTON::RIGHT]) {
-        camera_.translate(camera_.getUp() * (float) mouseMotion_[1] * MOUSE_T_SENSITIVITY);
-        camera_.translate(camera_.getRight() * (float) mouseMotion_[0] * MOUSE_T_SENSITIVITY);
-    }
-
-    // Zoom in with mouse wheel
-    if (mouseWheelPosition_ != 0) {
-        float distance = sl::Translation(camera_.getOffsetFromPosition()).norm();
-        if (mouseWheelPosition_ > 0 && distance > camera_.getZNear()) { // zoom
-            camera_.setOffsetFromPosition(camera_.getOffsetFromPosition() * MOUSE_UZ_SENSITIVITY);
-        } else if (distance < camera_.getZFar()) {// unzoom
-            camera_.setOffsetFromPosition(camera_.getOffsetFromPosition() * MOUSE_DZ_SENSITIVITY);
-        }
-    }
+	// Rotate camera with mouse
+	if (mouseButton_[MOUSE_BUTTON::LEFT]) {
+		camera_.rotate(sl::Rotation((float)mouseMotion_[1] * MOUSE_R_SENSITIVITY, camera_.getRight()));
+		camera_.rotate(sl::Rotation((float)mouseMotion_[0] * MOUSE_R_SENSITIVITY, camera_.getVertical() * -1.f));
+	}
+
+	// Translate camera with mouse
+	if (mouseButton_[MOUSE_BUTTON::RIGHT]) {
+		camera_.translate(camera_.getUp() * (float)mouseMotion_[1] * MOUSE_T_SENSITIVITY * 1000);
+		camera_.translate(camera_.getRight() * (float)mouseMotion_[0] * MOUSE_T_SENSITIVITY * 1000);
+	}
+
+	// Zoom in with mouse wheel
+	if (mouseWheelPosition_ != 0) {
+		//float distance = sl::Translation(camera_.getOffsetFromPosition()).norm();
+		if (mouseWheelPosition_ > 0 /* && distance > camera_.getZNear()*/) { // zoom
+			camera_.translate(camera_.getForward() * MOUSE_UZ_SENSITIVITY * 1000 * -1);
+		}
+		else if (/*distance < camera_.getZFar()*/ mouseWheelPosition_ < 0) {// unzoom
+			//camera_.setOffsetFromPosition(camera_.getOffsetFromPosition() * MOUSE_DZ_SENSITIVITY);
+			camera_.translate(camera_.getForward() * MOUSE_UZ_SENSITIVITY * 1000);
+		}
+	}
 
     // Update point cloud buffers
     pointCloud_.mutexData.lock();

diff --git a/object detection/birds eye viewer/cpp/include/GLViewer.hpp b/object detection/birds eye viewer/cpp/include/GLViewer.hpp
@@ -21,10 +21,10 @@
 #define M_PI 3.141592653f
 #endif
 
-#define MOUSE_R_SENSITIVITY 0.04f
-#define MOUSE_UZ_SENSITIVITY 0.75f
+#define MOUSE_R_SENSITIVITY 0.03f
+#define MOUSE_UZ_SENSITIVITY 0.5f
 #define MOUSE_DZ_SENSITIVITY 1.25f
-#define MOUSE_T_SENSITIVITY 100.f
+#define MOUSE_T_SENSITIVITY 0.05f
 #define KEY_T_SENSITIVITY 0.1f
 
 // Utils