Camera sensitivity stored in OpenRaider

include/Camera.h

@@ -130,18 +130,6 @@ public:
     void reset();
 
     /*!
-     * \brief Sets the X rotation delta
-     * \param angle thetas rotation delta in degrees
-     */
-    void setSensitivityX(float angle);
-
-    /*!
-     * \brief Sets the Y rotation delta
-     * \param angle thetas rotation delta in degrees
-     */
-    void setSensitivityY(float angle);
-
-    /*!
      * \brief Sends interactive command to camera
      * \param cmd valid camera command
      */
@@ -185,9 +173,7 @@ private:
     vec_t mSide[4];               //!< Side vector
     vec_t mViewDistance;          //!< Distance from target
     vec_t mTranslateDelta;        //!< Step size to move
-    vec_t mRotateDelta;           //!< Radians to rotate Y
     vec_t mTheta;                 //!< View angle Y
-    vec_t mRotateDelta2;          //!< Radians to rotate Z
     vec_t mTheta2;                //!< View angle Z
 };
 

include/OpenRaider.h

@@ -64,6 +64,9 @@ public:
     bool mMapListFilled;
     std::vector<char *> mMapList;
 
+    float mCameraRotationDeltaX;
+    float mCameraRotationDeltaY;
+
 private:
 
     int command(const char *command, std::vector<char *> *args);

src/Camera.cpp

@@ -8,14 +8,13 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "main.h"
 #include "Camera.h"
 
 Camera::Camera() {
     mFlags = 0;
     mViewDistance = 14.0f;
     mTranslateDelta = 256.0f;
-    mRotateDelta = OR_DEG_TO_RAD(15.0f);
-    mRotateDelta2 = OR_DEG_TO_RAD(5.0f);
     mFlags &= Camera_FlyMode;
     reset();
 }
@@ -146,14 +145,6 @@ void Camera::reset() {
     translate(0.0f, 0.0f, 0.0f);
 }
 
-void Camera::setSensitivityY(float angle) {
-    mRotateDelta2 = OR_DEG_TO_RAD(angle);
-}
-
-void Camera::setSensitivityX(float angle) {
-    mRotateDelta = OR_DEG_TO_RAD(angle);
-}
-
 void Camera::command(enum camera_command cmd) {
     switch (cmd) {
         case CAMERA_MOVE_FORWARD:
@@ -180,22 +171,22 @@ void Camera::command(enum camera_command cmd) {
             break;
         case CAMERA_ROTATE_UP:
             if (mTheta2 < (M_PI / 2)) {
-                mTheta2 += mRotateDelta2;
+                mTheta2 += gOpenRaider->mCameraRotationDeltaY;
                 rotate(mTheta2, 1.0f, 0.0f, 0.0f);
             }
             break;
         case CAMERA_ROTATE_DOWN:
             if (mTheta2 > -(M_PI / 2)) {
-                mTheta2 -= mRotateDelta2;
+                mTheta2 -= gOpenRaider->mCameraRotationDeltaY;
                 rotate(mTheta2, 1.0f, 0.0f, 0.0f);
             }
             break;
         case CAMERA_ROTATE_RIGHT:
-            mTheta += mRotateDelta;
+            mTheta += gOpenRaider->mCameraRotationDeltaX;
             rotate(mTheta, 0.0f, 1.0f, 0.0f);
             break;
         case CAMERA_ROTATE_LEFT:
-            mTheta -= mRotateDelta;
+            mTheta -= gOpenRaider->mCameraRotationDeltaX;
             rotate(mTheta, 0.0f, 1.0f, 0.0f);
             break;
         case CAMERA_MOVE_UP:

src/OpenRaider.cpp

@@ -15,6 +15,7 @@
 #include "config.h"
 #include "Console.h"
 #include "Game.h"
+#include "math/math.h"
 #include "Menu.h"
 #include "Sound.h"
 #include "TombRaider.h"
@@ -42,6 +43,9 @@ OpenRaider::OpenRaider() {
 
     for (int i = 0; i < ActionEventCount; i++)
         keyBindings[i] = unknown;
+
+    mCameraRotationDeltaX = OR_DEG_TO_RAD(1.0f);
+    mCameraRotationDeltaY = OR_DEG_TO_RAD(1.0f);
 }
 
 OpenRaider::~OpenRaider() {
@@ -324,14 +328,14 @@ int OpenRaider::set(const char *var, const char *value) {
             mConsole->print("set-mouse_x-Error: Invalid value (%s)", value);
             return -6;
         }
-        //! \todo mouse support
+        mCameraRotationDeltaX = OR_DEG_TO_RAD(sense);
     } else if (strcmp(var, "mouse_y") == 0) {
         float sense = 1.0f;
         if (sscanf(value, "%f", &sense) != 1) {
             mConsole->print("set-mouse_y-Error: Invalid value (%s)", value);
             return -7;
         }
-        //! \todo mouse support
+        mCameraRotationDeltaY = OR_DEG_TO_RAD(sense);
     } else if (strcmp(var, "basedir") == 0) {
         CHANGE_DIR_WITH_EXPANSION(mBaseDir);
     } else if (strcmp(var, "pakdir") == 0) {