Removed unnecessary Camera functionality

include/Camera.h

@@ -3,6 +3,7 @@
  * \brief OpenGL camera class
  *
  * \author Mongoose
+ * \author xythobuz
  */
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
@@ -15,48 +16,14 @@
  * \brief Commands for interactive camera control
  */
 enum camera_command {
-  CAMERA_MOVE_FORWARD = 1,
-  CAMERA_MOVE_BACKWARD,
-  CAMERA_MOVE_UP,
-  CAMERA_MOVE_DOWN,
-  CAMERA_ROTATE_RIGHT,
-  CAMERA_ROTATE_LEFT,
-  CAMERA_SPEED_UP,
-  CAMERA_SPEED_DOWN,
-  CAMERA_ROTATE_UP,
-  CAMERA_ROTATE_DOWN,
-  CAMERA_MOVE_LEFT,
-  CAMERA_MOVE_RIGHT
-};
-
-/*!
- * \brief Flags a camera can have
- */
-enum CameraFlags {
-    Camera_FlyMode = (1 << 0) //!< Camera is flying free?
+    CAMERA_ROTATE_RIGHT,
+    CAMERA_ROTATE_LEFT,
+    CAMERA_ROTATE_UP,
+    CAMERA_ROTATE_DOWN
 };
 
 /*!
  * \brief OpenGL camera class
- *
- * 2002.12.16:
- * Mongoose - Removed perspective setting and OpenGL dependency
- *            API changes to reflect new direction of this object:
- *              Removing outdated algorithms and code
- *              And refactoring the class in general
- *
- * 2001.06.06:
- * Mongoose - Moving GLU code into here to setup break up
- *            into Camera base class, DynamicCamera,
- *            and GLUCamera child classes
- *
- * 2001.06.04:
- * Mongoose - Quaternion based compile option
- *
- * 2001.05.18:
- * Mongoose - Created, based on my old GL camera code
- *            that has been used in GooseEgg since alpha
- *            and algorithms from Yuri Zhivago's trview
  */
 class Camera {
 public:
@@ -72,74 +39,32 @@ public:
     void getPosition(vec3_t pos);
 
     /*!
-     * \brief Returns the up vector
-     * \param up where the up vector will be stored
-     */
-    void getUp(vec3_t up);
-
-    /*!
      * \brief Get the target currently looked at
      * \param target where the target will be stored
      */
     void getTarget(vec3_t target);
 
     /*!
-     * \brief Get current yaw in degrees
-     * \returns yaw in degrees
-     */
-    float getYaw();
-
-    /*!
      * \brief Get angle/yaw of camera
      * \returns theta angle/yaw of camera
      */
     vec_t getRadianYaw();
 
     /*!
-     * \brief Get current angle/pitch
-     * \returns current pitch in degrees
-     */
-    float getPitch();
-
-    /*!
      * \brief Get angle/pitch of camera
      * \returns phi angle/pitch of camera
      */
     vec_t getRadianPitch();
 
     /*!
-     * \brief Rotate the camera
-     * \param angle angle in radians
-     * \param x X coordinate of axis
-     * \param y Y coordinate of axis
-     * \param z Z coordinate of axis
-     */
-    void rotate(float angle, float x, float y, float z);
-
-    /*!
-     * \brief Set Camera position
-     * \param x new X coordinate
-     * \param y new Y coordinate
-     * \param z new Z coordinate
-     */
-    void translate(float x, float y, float z);
-
-    /*!
-     * \brief Set the Camera to its initial state
+     * \brief Set current position
+     * \param pos new position
      */
-    void reset();
+    void setPosition(vec3_t pos);
 
-    /*!
-     * \brief Sends interactive command to camera
-     * \param cmd valid camera command
-     */
-    void command(enum camera_command cmd);
+    void setSensitivityX(vec_t sens);
 
-    /*!
-     * \brief Sets speed
-     * \param s new speed, is 256 or greater in general
-     */
-    void setSpeed(float s);
+    void setSensitivityY(vec_t sens);
 
     /*!
      * \brief Updates view target
@@ -147,34 +72,31 @@ public:
     void update();
 
     /*!
-     * \brief Set current position
-     * \param pos new position
-     */
-    void setPosition(vec3_t pos);
-
-    /*!
-     * \brief Sets the up vector
-     * \param up new up vector
+     * \brief Rotate the camera
+     * \param angle angle in radians
+     * \param x X coordinate of axis
+     * \param y Y coordinate of axis
+     * \param z Z coordinate of axis
      */
-    void setUp(vec3_t up);
+    void rotate(vec_t angle, vec_t x, vec_t y, vec_t z);
 
     /*!
-     * \brief Sets target (look at pos)
-     * \param target new target
+     * \brief Sends interactive command to camera
+     * \param cmd valid camera command
      */
-    void setTarget(vec3_t target);
+    void command(enum camera_command cmd);
 
 private:
     Quaternion mQ;                //!< Quaternion for rotation
-    unsigned int mFlags;          //!< For testing with flags
     vec_t mPos[4];                //!< Location in 3 space (aka eye)
     vec_t mTarget[4];             //!< Postition we're looking at
     vec_t mUp[4];                 //!< Up vector
     vec_t mSide[4];               //!< Side vector
     vec_t mViewDistance;          //!< Distance from target
-    vec_t mTranslateDelta;        //!< Step size to move
     vec_t mTheta;                 //!< View angle Y
     vec_t mTheta2;                //!< View angle Z
+    vec_t mRotationDeltaX;
+    vec_t mRotationDeltaY;
 };
 
 #endif

include/OpenRaider.h

@@ -60,9 +60,6 @@ public:
     bool mMapListFilled;
     std::vector<char *> mMapList;
 
-    float mCameraRotationDeltaX;
-    float mCameraRotationDeltaY;
-
     char *mBaseDir;
     char *mPakDir;
     char *mAudioDir;

src/Camera.cpp

@@ -3,6 +3,7 @@
  * \brief OpenGL camera class
  *
  * \author Mongoose
+ * \author xythobuz
  */
 
 #include <stdio.h>
@@ -12,11 +13,29 @@
 #include "Camera.h"
 
 Camera::Camera() {
-    mFlags = 0;
     mViewDistance = 14.0f;
-    mTranslateDelta = 512.0f; // 256.0f
-    mFlags &= Camera_FlyMode;
-    reset();
+    mRotationDeltaX = 1.0f;
+    mRotationDeltaY = 1.0f;
+    mTheta = 0.0f;
+    mTheta2 = 0.0f;
+
+    mPos[0] = 0.0f;
+    mPos[1] = 0.0f;
+    mPos[2] = 0.0f;
+
+    mTarget[0] = 0.0f;
+    mTarget[1] = 0.0f;
+    mTarget[2] = mViewDistance;
+
+    mSide[0] = 1.0f;
+    mSide[1] = 0.0f;
+    mSide[2] = 0.0f;
+
+    mUp[0] = 0.0f;
+    mUp[1] = -1.0f; // 1.0f
+    mUp[2] = 0.0f;
+
+    mQ.setIdentity();
 }
 
 void Camera::getPosition(vec3_t pos) {
@@ -25,22 +44,12 @@ void Camera::getPosition(vec3_t pos) {
     pos[2] = mPos[2];
 }
 
-void Camera::getUp(vec3_t up) {
-    up[0] = mUp[0];
-    up[1] = mUp[1];
-    up[2] = mUp[2];
-}
-
 void Camera::getTarget(vec3_t target) {
     target[0] = mTarget[0];
     target[1] = mTarget[1];
     target[2] = mTarget[2];
 }
 
-float Camera::getYaw() {
-    return OR_RAD_TO_DEG(mTheta);
-}
-
 vec_t Camera::getRadianYaw() {
     return mTheta;
 }
@@ -49,13 +58,32 @@ vec_t Camera::getRadianPitch() {
     return mTheta2;
 }
 
+void Camera::setPosition(vec3_t pos) {
+    mPos[0] = pos[0];
+    mPos[1] = pos[1];
+    mPos[2] = pos[2];
+}
+
+void Camera::setSensitivityX(vec_t sens) {
+    mRotationDeltaX = sens;
+}
+
+void Camera::setSensitivityY(vec_t sens) {
+    mRotationDeltaY = sens;
+}
+
+void Camera::update() {
+    mTarget[2] = (mViewDistance * cosf(mTheta)) + mPos[2];
+    mTarget[0] = (mViewDistance * sinf(mTheta)) + mPos[0];
+    mTarget[1] = (mViewDistance * sinf(mTheta2)) + mPos[1]; // + height_offset;
+}
+
 void Camera::rotate(float angle, float x, float y, float z) {
     Quaternion t, n;
     Matrix matrix;
     vec_t side[4] = { 1.0f, 0.0f,  0.0f, 1.0f };
     vec_t up[4] =   { 0.0f, 1.0f,  0.0f, 1.0f };
     vec_t look[4] = { 0.0f, 0.0f, -1.0f, 1.0f };
-    unsigned int i;
     matrix_t m;
 
     t.set(angle, x, y, z);
@@ -68,7 +96,7 @@ void Camera::rotate(float angle, float x, float y, float z) {
     matrix.multiply4v(look, mTarget);
     matrix.multiply4v(up, mUp);
 
-    for (i = 0; i < 3; ++i) {
+    for (int i = 0; i < 3; ++i) {
         mSide[i] += mPos[i];
         mTarget[i] += mPos[i];
         mUp[i] += mPos[i];
@@ -77,161 +105,31 @@ void Camera::rotate(float angle, float x, float y, float z) {
     mQ = n;
 }
 
-void Camera::translate(float x, float y, float z) {
-    int i;
-    vec_t result[4];
-    vec_t v[4];
-    matrix_t m;
-    Matrix matrix;
-
-    v[0] = x;
-    v[1] = y;
-    v[2] = -z;
-    v[3] = 1;
-
-    m[0] = mSide[0] - mPos[0];
-    m[1] = mUp[0] - mPos[0];
-    m[2] = mTarget[0] - mPos[0];
-    m[3] = 0;
-    m[4] = mSide[1] - mPos[1];
-    m[5] = mUp[1] - mPos[1];
-    m[6] = mTarget[1] - mPos[1];
-    m[7] = 0;
-    m[8] = mSide[2] - mPos[2];
-    m[9] = mUp[2] - mPos[2];
-    m[10] = mTarget[2] - mPos[2];
-    m[11] = 0;
-    m[12] = 0;
-    m[13] = 0;
-    m[14] = 0;
-    m[15] = 1;
-
-    matrix.setMatrix(m);
-    matrix.multiply4v(v, result);
-
-    for (i = 0; i < 3; ++i) {
-        mSide[i] += result[i];
-        mUp[i] += result[i];
-        mTarget[i] += result[i];
-        mPos[i] += result[i];
-    }
-
-    mPos[0] = x;
-    mPos[1] = y;
-    mPos[2] = z;
-}
-
-void Camera::reset() {
-    mTheta = 0.0f;
-    mTheta2 = 0.0f;
-
-    mPos[0] = 0.0f;
-    mPos[1] = 0.0f;
-    mPos[2] = 0.0f;
-
-    mTarget[0] = 0.0f;
-    mTarget[1] = 0.0f;
-    mTarget[2] = mViewDistance;
-
-    mSide[0] = 1.0f;
-    mSide[1] = 0.0f;
-    mSide[2] = 0.0f;
-
-    mUp[0] = 0.0f;
-    mUp[1] = -1.0f; // 1.0f
-    mUp[2] = 0.0f;
-
-    mQ.setIdentity();
-    translate(0.0f, 0.0f, 0.0f);
-}
-
 void Camera::command(enum camera_command cmd) {
     switch (cmd) {
-        case CAMERA_MOVE_FORWARD:
-            if (mFlags & Camera_FlyMode)
-                mPos[2] += (mTranslateDelta * cosf(mTheta));
-
-            mPos[0] += (mTranslateDelta * sinf(mTheta));
-            mPos[1] += (mTranslateDelta * sinf(mTheta2));
-            break;
-        case CAMERA_MOVE_BACKWARD:
-            if (mFlags & Camera_FlyMode)
-                mPos[2] -= (mTranslateDelta * cosf(mTheta));
-
-            mPos[0] -= (mTranslateDelta * sinf(mTheta));
-            mPos[1] -= (mTranslateDelta * sinf(mTheta2));
-            break;
-        case CAMERA_MOVE_LEFT:
-            mPos[0] -= (mTranslateDelta * sinf(mTheta - 90.0f));
-            mPos[2] -= (mTranslateDelta * cosf(mTheta - 90.0f));
-            break;
-        case CAMERA_MOVE_RIGHT:
-            mPos[0] -= (mTranslateDelta * sinf(mTheta + 90.0f));
-            mPos[2] -= (mTranslateDelta * cosf(mTheta + 90.0f));
-            break;
         case CAMERA_ROTATE_UP:
             if (mTheta2 < (M_PI / 2)) {
-                mTheta2 += getOpenRaider().mCameraRotationDeltaY;
+                mTheta2 += mRotationDeltaY;
                 rotate(mTheta2, 1.0f, 0.0f, 0.0f);
             }
             break;
+
         case CAMERA_ROTATE_DOWN:
             if (mTheta2 > -(M_PI / 2)) {
-                mTheta2 -= getOpenRaider().mCameraRotationDeltaY;
+                mTheta2 -= mRotationDeltaY;
                 rotate(mTheta2, 1.0f, 0.0f, 0.0f);
             }
             break;
+
         case CAMERA_ROTATE_RIGHT:
-            mTheta += getOpenRaider().mCameraRotationDeltaX;
+            mTheta += mRotationDeltaX;
             rotate(mTheta, 0.0f, 1.0f, 0.0f);
             break;
+
         case CAMERA_ROTATE_LEFT:
-            mTheta -= getOpenRaider().mCameraRotationDeltaX;
+            mTheta -= mRotationDeltaX;
             rotate(mTheta, 0.0f, 1.0f, 0.0f);
             break;
-        case CAMERA_MOVE_UP:
-            mPos[1] -= mTranslateDelta / 2.0f;
-            mTarget[1] -= mTranslateDelta / 2.0f;
-            break;
-        case CAMERA_MOVE_DOWN:
-            mPos[1] += mTranslateDelta / 2.0f;
-            mTarget[1] += mTranslateDelta / 2.0f;
-            break;
-        case CAMERA_SPEED_UP:
-            ++mTranslateDelta;
-            break;
-        case CAMERA_SPEED_DOWN:
-            if (--mTranslateDelta < 0.0f)
-                mTranslateDelta = 1.0f;
-            break;
     }
 }
 
-void Camera::setSpeed(float s) {
-    mTranslateDelta = s;
-}
-
-void Camera::update() {
-    mTarget[2] = (mViewDistance * cosf(mTheta)) + mPos[2];
-    mTarget[0] = (mViewDistance * sinf(mTheta)) + mPos[0];
-    mTarget[1] = (mViewDistance * sinf(mTheta2)) + mPos[1]; // + height_offset;
-}
-
-void Camera::setPosition(vec3_t pos) {
-    mPos[0] = pos[0];
-    mPos[1] = pos[1];
-    mPos[2] = pos[2];
-}
-
-void Camera::setUp(vec3_t up) {
-    mUp[0] = up[0];
-    mUp[1] = up[1];
-    mUp[2] = up[2];
-}
-
-void Camera::setTarget(vec3_t target) {
-    mTarget[0] = target[0];
-    mTarget[1] = target[1];
-    mTarget[2] = target[2];
-}
-

src/Game.cpp

@@ -560,7 +560,6 @@ void Game::processMoveable(int index, int i, int *ent,
     if (moveable[index].object_id == 0)
     {
         lara = true;
-        getCamera().translate(pos[0], pos[1] - 470, pos[2]);
         thing->type = 0x02;
         mLara = thing; // Mongoose 2002.03.22, Cheap hack for now
         mLara->master = 0x0;

src/OpenRaider.cpp

@@ -35,9 +35,6 @@ 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() {
@@ -835,14 +832,14 @@ int OpenRaider::set(const char *var, const char *value) {
             getConsole().print("set-mouse_x-Error: Invalid value (%s)", value);
             return -6;
         }
-        mCameraRotationDeltaX = OR_DEG_TO_RAD(sense);
+        getCamera().setSensitivityX(OR_DEG_TO_RAD(sense));
     } else if (strcmp(var, "mouse_y") == 0) {
         float sense = 1.0f;
         if (sscanf(value, "%f", &sense) != 1) {
             getConsole().print("set-mouse_y-Error: Invalid value (%s)", value);
             return -7;
         }
-        mCameraRotationDeltaY = OR_DEG_TO_RAD(sense);
+        getCamera().setSensitivityY(OR_DEG_TO_RAD(sense));
     } else if (strcmp(var, "fps") == 0) {
         bool fps = false;
         if (readBool(value, &fps) != 0) {

src/Render.cpp

@@ -1025,11 +1025,11 @@ void Render::drawObjects()
 #ifdef USING_FPS_CAMERA
         getCamera().getPosition(curPos);
         glTranslated(curPos[0], curPos[1], curPos[2]);
-        glRotated(getCamera().getYaw(), 0, 1, 0);
+        glRotated(OR_RAD_TO_DEG(getCamera().getRadianYaw()), 0, 1, 0);
         glTranslated(0, 500, 1200);
 #else
         glTranslated(getGame().mLara->pos[0], getGame().mLara->pos[1], getGame().mLara->pos[2]);
-        glRotated(getCamera().getYaw(), 0, 1, 0);
+        glRotated(OR_RAD_TO_DEG(getCamera().getRadianYaw()), 0, 1, 0);
 #endif
 
         drawModel(static_cast<SkeletalModel *>(getGame().mLara->tmpHook));
@@ -1554,7 +1554,7 @@ void Render::drawSprite(sprite_t *sprite)
     glTranslated(sprite->pos[0], sprite->pos[1], sprite->pos[2]);
 
     // Sprites must always face camera, because they have no depth  =)
-    glRotated(getCamera().getYaw(), 0, 1, 0);
+    glRotated(OR_RAD_TO_DEG(getCamera().getRadianYaw()), 0, 1, 0);
 
     switch (mMode)
     {