Changeset 713

Timestamp:

08/23/07 21:56:54 (16 months ago)

Author:

leo

Message:

Camera cleanup.

Location:

trunk

Files:

• common/camera.cpp (modified) (4 diffs)
• common/lc_application.cpp (modified) (1 diff)
• common/lc_application.h (modified) (2 diffs)
• common/lc_camera.cpp (modified) (8 diffs)
• common/lc_camera.h (modified) (2 diffs)
• common/project.cpp (modified) (23 diffs)
• common/project.h (modified) (1 diff)
• common/terrain.cpp (modified) (1 diff)
• win/Terrwnd.cpp (modified) (3 diffs)

trunk/common/camera.cpp

@@ -1 @@
-// Camera object.
-
 #include "lc_global.h"
 #include <stdlib.h>
@@ -10 +8 @@
 #include "file.h"
 #include "camera.h"
-#include "tr.h"
 
 #define LC_CAMERA_SAVE_VERSION 6 // LeoCAD 0.73
@@ -218 +215 @@
 // Camera operations
 
-void Camera::Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz)
-{
-    if (IsSide())
-    {
-        m_Eye[0] += dx;
-        m_Eye[1] += dy;
-        m_Eye[2] += dz;
-        m_Target[0] += dx;
-        m_Target[1] += dy;
-        m_Target[2] += dz;
-
-        ChangeKey(nTime, bAddKey, m_Eye, LC_CK_EYE);
-        ChangeKey(nTime, bAddKey, m_Target, LC_CK_TARGET);
-    }
-    else
-    {
-        if (IsEyeSelected())
-        {
-            m_Eye[0] += dx;
-            m_Eye[1] += dy;
-            m_Eye[2] += dz;
-
-            ChangeKey(nTime, bAddKey, m_Eye, LC_CK_EYE);
-        }
-
-        if (IsTargetSelected())
-        {
-            m_Target[0] += dx;
-            m_Target[1] += dy;
-            m_Target[2] += dz;
-
-            ChangeKey(nTime, bAddKey, m_Target, LC_CK_TARGET);
-        }
-
-        // Fix the up vector
-        Vector3 upvec(m_Up), sidevec;
-        Vector3 frontvec = m_Target - m_Eye;
-        sidevec = Cross3(frontvec, upvec);
-        upvec = Cross3(sidevec, frontvec);
-        m_Up = upvec.Normalize();
-
-        ChangeKey(nTime, bAddKey, m_Up, LC_CK_UP);
-    }
-}
-
-void Camera::LoadProjection(float fAspect)
-{
-    if (m_pTR != NULL)
-        m_pTR->BeginTile();
-    else
-    {
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-
-        if (m_nState & LC_CAMERA_ORTHOGRAPHIC)
-        {
-            float ymax, ymin, xmin, xmax, znear, zfar;
-            Vector3 frontvec = m_Target - m_Eye;
-            ymax = (frontvec.Length())*sinf(DTOR*m_fovy/2);
-            ymin = -ymax;
-            xmin = ymin * fAspect;
-            xmax = ymax * fAspect;
-            znear = m_zNear;
-            zfar = m_zFar;
-            glOrtho(xmin, xmax, ymin, ymax, znear, zfar);
-        }
-        else
-        {
-            gluPerspective(m_fovy, fAspect, m_zNear, m_zFar);
-        }
-    }
-
-    glMatrixMode(GL_MODELVIEW);
-    glLoadMatrixf(m_WorldView);
-}
-
-void Camera::DoZoom(int dy, int mouse, unsigned short nTime, bool bAddKey)
-{
-    if (m_nState & LC_CAMERA_ORTHOGRAPHIC)
-    {
-        // TODO: have a different option to change the fov.
-        m_fovy += (float)dy/(21-mouse);
-
-        if (m_fovy < 0.001f)
-            m_fovy = 0.001f;
-        else if (m_fovy > 179.999f)
-            m_fovy = 179.999f;
-    }
-    else
-    {
-        Vector3 frontvec = m_Eye - m_Target;
-        frontvec.Normalize();
-        frontvec *= 2.0f*dy/(21-mouse);
-
-        // TODO: option to move eye, target or both
-        m_Eye += frontvec;
-        m_Target += frontvec;
-
-        ChangeKey(nTime, bAddKey, m_Eye, LC_CK_EYE);
-        ChangeKey(nTime, bAddKey, m_Target, LC_CK_TARGET);
-        UpdatePosition(nTime);
-    }
-}
-
-void Camera::DoPan(int dx, int dy, int mouse, unsigned short nTime, bool bAddKey)
-{
-    Vector3 upvec(m_Up), frontvec = m_Eye - m_Target;
-    Vector3 sidevec = Cross3(frontvec, upvec);
-    sidevec.Normalize();
-    sidevec *= 2.0f*dx/(21-mouse);
-    upvec.Normalize();
-    upvec *= -2.0f*dy/(21-mouse);
-
-    m_Eye += upvec + sidevec;
-    m_Target += upvec + sidevec;
-
-    ChangeKey(nTime, bAddKey, m_Eye, LC_CK_EYE);
-    ChangeKey(nTime, bAddKey, m_Target, LC_CK_TARGET);
-    UpdatePosition(nTime);
-}
-
-void Camera::DoRotate(int dx, int dy, int mouse, unsigned short nTime, bool bAddKey, float* /*center*/)
-{
-    Vector3 Dir = m_Eye - m_Target;
-
-    // The X axis of the mouse always corresponds to Z in the world.
-    if (dx)
-    {
-        float AngleX = -2.0f * dx / (21 - mouse) * LC_DTOR;
-        Matrix33 RotX = MatrixFromAxisAngle(Vector3(0, 0, 1), AngleX);
-
-        Dir = Mul(Dir, RotX);
-        m_Up = Mul(m_Up, RotX);
-    }
-
-    // The Y axis will the side vector of the camera.
-    if (dy)
-    {
-        float AngleY = 2.0f * dy / (21 - mouse) * LC_DTOR;
-        Matrix33 RotY = MatrixFromAxisAngle(Vector3(m_WorldView[0][0], m_WorldView[1][0], m_WorldView[2][0]), AngleY);
-
-        Dir = Mul(Dir, RotY);
-        m_Up = Mul(m_Up, RotY);
-    }
-
-    m_Eye = m_Target + Dir;
-
-    ChangeKey(nTime, bAddKey, m_Eye, LC_CK_EYE);
-    ChangeKey(nTime, bAddKey, m_Up, LC_CK_UP);
-    UpdatePosition(nTime);
-}
-
 void Camera::DoRoll(int dx, int mouse, unsigned short nTime, bool bAddKey)
 {
@@ -466 +311 @@
     UpdatePosition(nTime);
 }
-
-void Camera::StartTiledRendering(int tw, int th, int iw, int ih, float fAspect)
-{
-    m_pTR = new TiledRender();
-    m_pTR->TileSize(tw, th, 0);
-    m_pTR->ImageSize(iw, ih);
-    m_pTR->Perspective(m_fovy, fAspect, m_zNear, m_zFar);
-}
-
-void Camera::GetTileInfo(int* row, int* col, int* width, int* height)
-{
-    if (m_pTR != NULL)
-    {
-        *row = m_pTR->m_Rows - m_pTR->m_CurrentRow - 1;
-        *col = m_pTR->m_CurrentColumn;
-        *width = m_pTR->m_CurrentTileWidth;
-        *height = m_pTR->m_CurrentTileHeight;
-    }
-}
-
-bool Camera::EndTile()
-{
-    if (m_pTR != NULL)
-    {
-        if (m_pTR->EndTile())
-            return true;
-
-        delete m_pTR;
-        m_pTR = NULL;
-    }
-
-    return false;
-}

trunk/common/lc_application.cpp

@@ -36 +36 @@
     m_ActiveProject = NULL;
     m_Library = NULL;
+    m_MouseSensitivity = Sys_ProfileLoadInt("Default", "Mouse", 11);
 }
 

trunk/common/lc_application.h

@@ -7 +7 @@
 class PiecesLibrary;
 class PiecePreview;
+
+#define LC_MAX_MOUSE_SENSITIVITY 20
 
 class lcApplication
@@ -39 +41 @@
 public:
     PiecePreview* m_PiecePreview;
+    int m_MouseSensitivity;
 
 protected:

trunk/common/lc_camera.cpp

@@ -4 +4 @@
 
 #include "lc_colors.h"
+#include "lc_application.h"
 #include "opengl.h"
 
@@ -232 +233 @@
 }
 
-void lcCamera::SetRoll(u32 Time, bool AddKey, const float NewRoll)
+void lcCamera::SetRoll(u32 Time, bool AddKey, float NewRoll)
 {
     ChangeKey(Time, AddKey, LC_CAMERA_ROLL, NewRoll);
 }
 
-void lcCamera::Roll(u32 Time, bool AddKey, float MouseX, float MouseY)
-{
-    float NewRoll = m_Roll + MouseX / 100;
+void lcCamera::Roll(u32 Time, bool AddKey, int MouseX, int MouseY)
+{
+    float Sensitivity = 2.0f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
+    float dx = MouseX * Sensitivity;
+
+    float NewRoll = m_Roll + dx / 100;
     SetRoll(Time, AddKey, NewRoll);
 }
 
-
-
-
-
-
-
-// ============================================================================
-// Everything from now on needs to be rewritten
-
-void lcCamera::Zoom(float MouseY, u32 Time, bool AddKey)
-{
+void lcCamera::Zoom(u32 Time, bool AddKey, int MouseX, int MouseY)
+{
+    float Sensitivity = 2.0f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
+    float dy = MouseY * Sensitivity;
+
     if (m_Flags & LC_CAMERA_ORTHOGRAPHIC)
     {
         // TODO: have a different option to change the FOV.
-        m_FOV += MouseY;
+        m_FOV += dy;
         m_FOV = lcClamp(m_FOV, 0.001f, 179.999f);
     }
     else
     {
-        Vector3 Delta = Vector3(m_ViewWorld[2]) * MouseY;
+        Vector3 Delta = Vector3(m_ViewWorld[2]) * dy;
 
         // TODO: option to move eye, target or both
@@ -272 +270 @@
 }
 
-void lcCamera::Pan(float MouseX, float MouseY, u32 Time, bool AddKey)
-{
-    Vector3 Delta = Vector3(m_ViewWorld[0]) * -MouseX + Vector3(m_ViewWorld[1]) * -MouseY;
+void lcCamera::Pan(u32 Time, bool AddKey, int MouseX, int MouseY)
+{
+    float Sensitivity = 2.0f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
+    float dx = MouseX * Sensitivity;
+    float dy = MouseY * Sensitivity;
+
+    Vector3 Delta = Vector3(m_ViewWorld[0]) * -dx + Vector3(m_ViewWorld[1]) * -dy;
 
     if (m_Children)
@@ -282 +284 @@
 }
 
-void lcCamera::Orbit(float MouseX, float MouseY, u32 Time, bool AddKey)
-{
+void lcCamera::Orbit(u32 Time, bool AddKey, int MouseX, int MouseY)
+{
+    float Sensitivity = 2.0f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
+    float dx = MouseX * Sensitivity;
+    float dy = MouseY * Sensitivity;
+
     Vector3 Dir = m_WorldPosition - m_Children->m_WorldPosition;
 
     // The X axis of the mouse always corresponds to Z in the world.
-    if (fabsf(MouseX) > 0.01f)
-    {
-        float AngleX = -MouseX * LC_DTOR;
+    if (fabsf(dx) > 0.01f)
+    {
+        float AngleX = -dx * LC_DTOR;
         Matrix33 RotX = MatrixFromAxisAngle(Vector4(0, 0, 1, AngleX));
 
@@ -296 +302 @@
 
     // The Y axis will the side vector of the camera.
-    if (fabsf(MouseY) > 0.01f)
-    {
-        float AngleY = MouseY * LC_DTOR;
+    if (fabsf(dy) > 0.01f)
+    {
+        float AngleY = dy * LC_DTOR;
         Matrix33 RotY = MatrixFromAxisAngle(Vector4(m_WorldView[0][0], m_WorldView[1][0], m_WorldView[2][0], AngleY));
 
@@ -307 +313 @@
 }
 
-void lcCamera::Rotate(float MouseX, float MouseY, u32 Time, bool AddKey)
-{
+void lcCamera::Rotate(u32 Time, bool AddKey, int MouseX, int MouseY)
+{
+    float Sensitivity = 2.0f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
+    float dx = MouseX * Sensitivity;
+    float dy = MouseY * Sensitivity;
+
     Vector3 Dir = m_Children->m_WorldPosition - m_WorldPosition;
 
     // The X axis of the mouse always corresponds to Z in the world.
-    if (fabsf(MouseX) > 0.01f)
-    {
-        float AngleX = -MouseX * LC_DTOR;
+    if (fabsf(dx) > 0.01f)
+    {
+        float AngleX = -dx * LC_DTOR;
         Matrix33 RotX = MatrixFromAxisAngle(Vector4(0, 0, 1, AngleX));
 
@@ -321 +331 @@
 
     // The Y axis will the side vector of the camera.
-    if (fabsf(MouseY) > 0.01f)
-    {
-        float AngleY = MouseY * LC_DTOR;
+    if (fabsf(dy) > 0.01f)
+    {
+        float AngleY = dy * LC_DTOR;
         Matrix33 RotY = MatrixFromAxisAngle(Vector4(m_WorldView[0][0], m_WorldView[1][0], m_WorldView[2][0], AngleY));
 
@@ -331 +341 @@
     m_Children->SetPosition(Time, AddKey, Dir + m_ParentPosition);
 }
-
-// FIXME: Move this to the View class, or remove.
-void lcCamera::GetFrustumPlanes(float Aspect, Vector4 Planes[6]) const
-{
-    Matrix44 Projection = CreatePerspectiveMatrix(m_FOV, Aspect, m_NearDist, m_FarDist);
-    ::GetFrustumPlanes(m_WorldView, Projection, Planes);
-}
-
-void lcCamera::LoadProjection(float Aspect)
-{
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-
-    if (IsOrtho())
-    {
-        float ymax, ymin, xmin, xmax, znear, zfar;
-        Vector3 frontvec = Vector3(m_ViewWorld[2]);//m_Target - m_Eye; // FIXME: free ortho cameras = crash
-        ymax = (frontvec.Length())*sinf(DTOR*m_FOV/2);
-        ymin = -ymax;
-        xmin = ymin * Aspect;
-        xmax = ymax * Aspect;
-        znear = m_NearDist;
-        zfar = m_FarDist;
-        glOrtho(xmin, xmax, ymin, ymax, znear, zfar);
-    }
-    else
-    {
-        gluPerspective(m_FOV, Aspect, m_NearDist, m_FarDist);
-    }
-
-    glMatrixMode(GL_MODELVIEW);
-    glLoadMatrixf(m_WorldView);
-}

trunk/common/lc_camera.h

@@ -61 +61 @@
     }
 
+    // FIXME: remove IsSide
+    bool IsSide() const
+    { return m_CameraType < LC_CAMERA_MAIN; }
+
     // Change the roll value.
-    void SetRoll(u32 Time, bool AddKey, const float NewRoll);
+    void SetRoll(u32 Time, bool AddKey, float NewRoll);
 
-    // Move the camera along its Z direction.
-    void Zoom(float MouseY, u32 Time, bool AddKey);
+    // Move the camera along its Z axis.
+    void Zoom(u32 Time, bool AddKey, int MouseX, int MouseY);
 
     // Move the camera along its XY plane.
-    void Pan(float MouseX, float MouseY, u32 Time, bool AddKey);
+    void Pan(u32 Time, bool AddKey, int MouseX, int MouseY);
 
     // Rotate the camera around its target.
-    void Orbit(float MouseX, float MouseY, u32 Time, bool AddKey);
+    void Orbit(u32 Time, bool AddKey, int MouseX, int MouseY);
 
     // Rotate the target around the camera.
-    void Rotate(float MouseX, float MouseY, u32 Time, bool AddKey);
+    void Rotate(u32 Time, bool AddKey, int MouseX, int MouseY);
 
-    // Rotate the camera around its Z direction.
-    void Roll(u32 Time, bool AddKey, float MouseX, float MouseY);
+    // Rotate the camera around its Z axis.
+    void Roll(u32 Time, bool AddKey, int MouseX, int MouseY);
 
     // Base class implementation.
@@ -87 +91 @@
     // Base class overrides.
     void Move(u32 Time, bool AddKey, const Vector3& Delta);
-
-    // FIXME: Temp functions to get LeoCAD to compile again.
-    void LoadProjection(float Aspect);
-    void GetFrustumPlanes(float Aspect, Vector4 Planes[6]) const;
-    void DoZoom(int dy, int mouse, u32 Time, bool AddKey)
-    { Zoom(2.0f*(float)dy/(21-mouse), Time, AddKey); }
-    void DoPan(int dx, int dy, int mouse, u32 Time, bool AddKey)
-    { Pan(2.0f*dx/(21-mouse), 2.0f*dy/(21-mouse), Time, AddKey); }
-    void DoOrbit(int dx, int dy, int mouse, u32 Time, bool AddKey)
-    { Orbit(2.0f*dx/(21-mouse), 2.0f*dy/(21-mouse), Time, AddKey); }
-    void DoRotate(int dx, int dy, int mouse, u32 Time, bool AddKey)
-    { Rotate(2.0f*dx/(21-mouse), 2.0f*dy/(21-mouse), Time, AddKey); }
-    void DoRoll(int dx, int mouse, u32 Time, bool AddKey)
-    {   Roll(Time, AddKey, 2.0f*dx/(21-mouse), 0); }
-    bool IsSide() const
-    { return m_CameraType < LC_CAMERA_MAIN; }
 
 public:

trunk/common/project.cpp

@@ -79 +79 @@
     m_pBackground = new Texture();
     m_nAutosave = Sys_ProfileLoadInt ("Settings", "Autosave", 10);
-    m_nMouse = Sys_ProfileLoadInt ("Default", "Mouse", 11);
     strcpy(m_strModelsPath, Sys_ProfileLoadString ("Default", "Projects", ""));
 
@@ -5383 +5382 @@
         {
             LC_PREFERENCESDLG_OPTS opts;
-            opts.nMouse = m_nMouse;
+            opts.nMouse = g_App->m_MouseSensitivity;
             opts.nSaveInterval = m_nAutosave;
             strcpy(opts.strUser, Sys_ProfileLoadString ("Default", "User", ""));
@@ -5404 +5403 @@
             if (SystemDoDialog(LC_DLG_PREFERENCES, &opts))
             {
-                m_nMouse = opts.nMouse;
+                g_App->m_MouseSensitivity = opts.nMouse;
                 m_nAutosave = opts.nSaveInterval;
                 strcpy(m_strModelsPath, opts.strPath);
@@ -5437 +5436 @@
         case LC_VIEW_ZOOM:
         {
-            m_ActiveView->GetCamera()->DoZoom(nParam, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            m_ActiveView->GetCamera()->Zoom(m_ActiveModel->m_CurFrame, m_bAddKeys, 0, nParam);
             SystemUpdateFocus(NULL);
             UpdateOverlayScale();
@@ -5445 +5444 @@
         case LC_VIEW_ZOOMIN:
         {
-            m_ActiveView->GetCamera()->DoZoom(-1, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            m_ActiveView->GetCamera()->Zoom(m_ActiveModel->m_CurFrame, m_bAddKeys, 0, -1);
             SystemUpdateFocus(NULL);
             UpdateOverlayScale();
@@ -5453 +5452 @@
         case LC_VIEW_ZOOMOUT:
         {
-            m_ActiveView->GetCamera()->DoZoom(1, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            m_ActiveView->GetCamera()->Zoom(m_ActiveModel->m_CurFrame, m_bAddKeys, 0, 1);
             SystemUpdateFocus(NULL);
             UpdateOverlayScale();
@@ -5754 +5753 @@
             y -= y > 0 ? 5 : -5;
 
-            m_ActiveView->GetCamera()->DoPan(x/4, y/4, 1, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            m_ActiveView->GetCamera()->Pan(m_ActiveModel->m_CurFrame, m_bAddKeys, x/4, y/4);
             m_ActiveView->GetCamera()->Update(m_ActiveModel->m_CurFrame);
             m_nDownX = x;
@@ -7789 +7788 @@
         case LC_ACTION_SPOTLIGHT:
         {
+            /*
+            // fixme: move this to lc_action_move
             float mouse = 10.0f/(21 - m_nMouse);
             Vector3 Delta((ptx - m_fTrack[0])*mouse, (pty - m_fTrack[1])*mouse, (ptz - m_fTrack[2])*mouse);
@@ -7805 +7806 @@
             SystemUpdateFocus(NULL);
             UpdateAllViews();
+            */
         } break;
 
         case LC_ACTION_CAMERA:
         {
+            /*
+            // fixme: move this to lc_action_move
             float mouse = 10.0f/(21 - m_nMouse);
             Vector3 Delta((ptx - m_fTrack[0])*mouse, (pty - m_fTrack[1])*mouse, (ptz - m_fTrack[2])*mouse);
@@ -7825 +7829 @@
             SystemUpdateFocus(NULL);
             UpdateAllViews();
+            */
         } break;
 
@@ -7833 +7838 @@
                 break;
 
+            float Sensitivity = 0.25f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
             lcCamera* Camera = m_ActiveView->GetCamera();
             bool Redraw;
@@ -7956 +7962 @@
                 }
 
-                MoveX *= (float)(x - m_nDownX) * 0.25f / (21 - m_nMouse);
-                MoveY *= (float)(y - m_nDownY) * 0.25f / (21 - m_nMouse);
+                MoveX *= (float)(x - m_nDownX) * Sensitivity;
+                MoveY *= (float)(y - m_nDownY) * Sensitivity;
 
                 m_nDownX = x;
@@ -7979 +7985 @@
                     Vector3 MoveX, MoveY;
 
-                    MoveX = ScreenX * (float)(x - m_nDownX) * 0.25f / (float)(21 - m_nMouse);
-                    MoveY = ScreenY * (float)(y - m_nDownY) * 0.25f / (float)(21 - m_nMouse);
+                    MoveX = ScreenX * (float)(x - m_nDownX) * Sensitivity;
+                    MoveY = ScreenY * (float)(y - m_nDownY) * Sensitivity;
 
                     TotalMove = MoveX + MoveY + m_MouseSnapLeftover;
@@ -7988 +7994 @@
                     Vector3 MoveZ;
 
-                    MoveZ = ScreenZ * (float)(y - m_nDownY) * 0.25f / (float)(21 - m_nMouse);
+                    MoveZ = ScreenZ * (float)(y - m_nDownY) * Sensitivity;
 
                     TotalMove = MoveZ + m_MouseSnapLeftover;
@@ -8006 +8012 @@
         case LC_ACTION_ROTATE:
         {
+            float Sensitivity = 36.0f / (LC_MAX_MOUSE_SENSITIVITY+1 - g_App->m_MouseSensitivity);
             lcCamera* Camera = m_ActiveView->GetCamera();
             bool Redraw;
@@ -8114 +8121 @@
                 }
 
-                MoveX *= (float)(x - m_nDownX) * 36.0f / (21 - m_nMouse);
-                MoveY *= (float)(y - m_nDownY) * 36.0f / (21 - m_nMouse);
+                MoveX *= (float)(x - m_nDownX) * Sensitivity;
+                MoveY *= (float)(y - m_nDownY) * Sensitivity;
 
                 m_nDownX = x;
@@ -8137 +8144 @@
                     Vector3 MoveX, MoveY;
 
-                    MoveX = ScreenX * (float)(x - m_nDownX) * 36.0f / (float)(21 - m_nMouse);
-                    MoveY = ScreenY * (float)(y - m_nDownY) * 36.0f / (float)(21 - m_nMouse);
+                    MoveX = ScreenX * (float)(x - m_nDownX) * Sensitivity;
+                    MoveY = ScreenY * (float)(y - m_nDownY) * Sensitivity;
 
                     Delta = MoveX + MoveY + m_MouseSnapLeftover;
@@ -8146 +8153 @@
                     Vector3 MoveZ;
 
-                    MoveZ = ScreenZ * (float)(y - m_nDownY) * 36.0f / (float)(21 - m_nMouse);
+                    MoveZ = ScreenZ * (float)(y - m_nDownY) * Sensitivity;
 
                     Delta = MoveZ + m_MouseSnapLeftover;
@@ -8168 +8175 @@
                 break;
 
-            m_ActiveView->GetCamera()->DoZoom(y - m_nDownY, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            m_ActiveView->GetCamera()->Zoom(m_ActiveModel->m_CurFrame, m_bAddKeys, x - m_nDownX, y - m_nDownY);
             m_nDownY = y;
             SystemUpdateFocus(NULL);
@@ -8189 +8196 @@
                 break;
 
-            m_ActiveView->GetCamera()->DoPan(x - m_nDownX, y - m_nDownY, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            m_ActiveView->GetCamera()->Pan(m_ActiveModel->m_CurFrame, m_bAddKeys, x - m_nDownX, y - m_nDownY);
             m_ActiveView->GetCamera()->Update(m_ActiveModel->m_CurFrame);
             m_nDownX = x;
@@ -8226 +8233 @@
             }
 
-            Camera->DoRotate(x - m_nDownX, y - m_nDownY, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+            Camera->Rotate(m_ActiveModel->m_CurFrame, m_bAddKeys, x - m_nDownX, y - m_nDownY);
             Camera->Update(m_ActiveModel->m_CurFrame);
 
@@ -8267 +8274 @@
             {
                 case LC_OVERLAY_XYZ:
-                    Camera->DoOrbit(x - m_nDownX, y - m_nDownY, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+                    Camera->Orbit(m_ActiveModel->m_CurFrame, m_bAddKeys, x - m_nDownX, y - m_nDownY);
                     break;
 
                 case LC_OVERLAY_X:
-                    Camera->DoOrbit(x - m_nDownX, 0, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
+                    Camera->Orbit(m_ActiveModel->m_CurFrame, m_bAddKeys, x - m_nDownX, 0);