Changeset 330 for ps

Timestamp:

05/31/04 17:52:53 (21 years ago)

Author:

notpete

Message:

Removed zoom FOV hack; changed to actually move camera position.

File:

• ps/trunk/source/terrain/terrainMain.cpp (modified) (5 diffs)

ps/trunk/source/terrain/terrainMain.cpp

@@ -32 +32 @@
 double              g_LastTime;
 
+static float g_CameraZoom = 10;
 
 const int NUM_ALPHA_MAPS = 13;
@@ -91 +92 @@
 
     float fov = g_Camera.GetFOV();
+
+#if 0
     const float d_key = DEGTORAD(10.0f) * DeltaTime;
     const float d_wheel = DEGTORAD( 50.0f ) * DeltaTime;
@@ -114 +117 @@
             fov = fov_min;
     }
-
-
     ViewFOV = fov;
-
-    g_Camera.SetProjection(1, 1000, fov);
+    g_Camera.SetProjection(1, 5000, fov);
+#else
+    // RC - added ScEd style zoom in and out (actually moving camera, rather than fudging fov)  
+    float dir=0;
+    if (mouseButtons[SDL_BUTTON_WHEELUP]) dir=-1;
+    else if (mouseButtons[SDL_BUTTON_WHEELDOWN]) dir=1; 
+
+    float factor=dir*dir;
+    if (factor) {
+        if (dir<0) factor=-factor;
+        CVector3D forward=g_Camera.m_Orientation.GetIn();
+
+        // check we're not going to zoom into the terrain, or too far out into space
+        float h=g_Camera.m_Orientation.GetTranslation().Y+forward.Y*factor*g_CameraZoom;
+        float minh=65536*HEIGHT_SCALE*1.05f;
+        
+        if (h<minh || h>1500) {
+            // yup, we will; don't move anywhere (do clamped move instead, at some point)
+        } else {
+            // do a full move
+            g_CameraZoom-=(factor)*0.1f;
+            if (g_CameraZoom<0.01f) g_CameraZoom=0.01f;
+            g_Camera.m_Orientation.Translate(forward*(factor*g_CameraZoom));
+        }
+    }
+#endif
+
     g_Camera.UpdateFrustum ();
 }
@@ -150 +176 @@
         case 'H':
             // quick hack to return camera home, for screenshots (after alt+tabbing)
-            g_Camera.SetProjection (1, 1000, DEGTORAD(20));
+            g_Camera.SetProjection (1, 5000, DEGTORAD(20));
             g_Camera.m_Orientation.SetXRotation(DEGTORAD(30));
             g_Camera.m_Orientation.RotateY(DEGTORAD(-45));
@@ -225 +251 @@
     }
 
-    g_Camera.SetProjection (1, 1000, DEGTORAD(20));
+    g_Camera.SetProjection (1, 5000, DEGTORAD(20));
     g_Camera.m_Orientation.SetXRotation(DEGTORAD(30));
     g_Camera.m_Orientation.RotateY(DEGTORAD(-45));