Changeset 5384

Timestamp:

May 30, 2008, 1:29:19 PM (17 years ago)

Author:

jack

Message:

Tracking, Strafing and Zooming are all scaled by domain size.

Location:

anuga_work/development/anugavis/src

Files:

• camera.h (modified) (1 diff)
• events.c (modified) (1 diff)
• globals.h (modified) (1 diff)
• init.c (modified) (1 diff)

anuga_work/development/anugavis/src/camera.h

@@ -5 +5 @@
 #define CAMERA_YAW_STEP 0.1
 #define CAMERA_PITCH_STEP 0.1
-#define CAMERA_TRACK_STEP 2.0
-#define CAMERA_STRAFE_STEP 2.0
-#define CAMERA_ZOOM_STEP 2.0
+#define CAMERA_TRACK_STEP 0.025
+#define CAMERA_STRAFE_STEP 0.025
+#define CAMERA_ZOOM_STEP 0.025
 
 extern void camera_pitch(float theta);

anuga_work/development/anugavis/src/events.c

@@ -113 +113 @@
   if(anugavis.keys[KEY_PITCH_UP]) camera_pitch(CAMERA_PITCH_STEP);
   if(anugavis.keys[KEY_PITCH_DOWN]) camera_pitch(-CAMERA_PITCH_STEP);
-  if(anugavis.keys[KEY_FORWARD]) camera_track(-CAMERA_TRACK_STEP);
-  if(anugavis.keys[KEY_BACKWARD]) camera_track(CAMERA_TRACK_STEP);
-  if(anugavis.keys[KEY_STRAFE_LEFT]) camera_strafe(CAMERA_STRAFE_STEP);
-  if(anugavis.keys[KEY_STRAFE_RIGHT]) camera_strafe(-CAMERA_STRAFE_STEP);
-  if(anugavis.keys[KEY_ZOOM_IN]) camera_zoom(CAMERA_ZOOM_STEP);
-  if(anugavis.keys[KEY_ZOOM_OUT]) camera_zoom(-CAMERA_ZOOM_STEP);
+  if(anugavis.keys[KEY_FORWARD]) camera_track(-CAMERA_TRACK_STEP *
+                                              anugavis.diagonal);
+  if(anugavis.keys[KEY_BACKWARD]) camera_track(CAMERA_TRACK_STEP * 
+                                               anugavis.diagonal);
+  if(anugavis.keys[KEY_STRAFE_LEFT]) camera_strafe(CAMERA_STRAFE_STEP *
+                                                   anugavis.diagonal);
+  if(anugavis.keys[KEY_STRAFE_RIGHT]) camera_strafe(-CAMERA_STRAFE_STEP *
+                                                    anugavis.diagonal);
+  if(anugavis.keys[KEY_ZOOM_IN]) camera_zoom(CAMERA_ZOOM_STEP *
+                                             anugavis.diagonal);
+  if(anugavis.keys[KEY_ZOOM_OUT]) camera_zoom(-CAMERA_ZOOM_STEP *
+                                              anugavis.diagonal);
   gluLookAt(anugavis.eye[0], anugavis.eye[1], anugavis.eye[2],
             anugavis.focus[0], anugavis.focus[1], anugavis.focus[2],

anuga_work/development/anugavis/src/globals.h

@@ -40 +40 @@
   double minY;
   double maxY;
+  double diagonal;
 
   GLfloat eye[3];

anuga_work/development/anugavis/src/init.c

@@ -111 +111 @@
   vsub(anugavis.eye, anugavis.focus, releye);
   anugavis.eye[2] = vlen(releye);
+  anugavis.diagonal = sqrt((anugavis.maxX - anugavis.minX) *
+                           (anugavis.maxX - anugavis.minX) +
+                           (anugavis.maxY - anugavis.minY) *
+                           (anugavis.maxY - anugavis.minY));
   return 0;
 }