Changeset 5385

Timestamp:

May 30, 2008, 1:33:31 PM (17 years ago)

Author:

jack

Message:

Added 'h' to warp the camera back home.

Location:

anuga_work/development/anugavis/src

Files:

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

anuga_work/development/anugavis/src/camera.c

@@ -14 +14 @@
 
 static const vector up = {0.0, 0.0, 1.0};
+
+void camera_home(void){
+  vector releye;
+  anugavis.eye[0] = anugavis.minX;
+  anugavis.eye[1] = anugavis.minY;
+  anugavis.eye[2] = 0;
+  anugavis.focus[0] = anugavis.minX + (anugavis.maxX - anugavis.minX) / 2;
+  anugavis.focus[1] = anugavis.minY + (anugavis.maxY - anugavis.minY) / 2;
+  anugavis.focus[2] = 0;
+  vsub(anugavis.eye, anugavis.focus, releye);
+  anugavis.eye[2] = vlen(releye);
+}
 
 void camera_pitch(float theta){
@@ -50 +62 @@
 }
 
+void camera_strafe(float dist){
+  vector releye;
+  vector dir;
+  vsub(anugavis.eye, anugavis.focus, releye);
+  vcross(releye, up, dir);
+  vscale(dir, dist/vlen(dir), dir);
+  vadd(anugavis.eye, dir, anugavis.eye);
+  vadd(anugavis.focus, dir, anugavis.focus);
+}
+
+void camera_track(float dist){
+  vector dir = {0, 0, 0};
+  vsub(anugavis.eye, anugavis.focus, dir);
+  dir[2] = 0;
+  vscale(dir, dist/vlen(dir), dir);
+  vadd(anugavis.eye, dir, anugavis.eye);
+  vadd(anugavis.focus, dir, anugavis.focus);
+}
+
 void camera_yaw(float theta){
   float c = cos(theta);
@@ -62 +93 @@
 }
 
-void camera_track(float dist){
-  vector dir = {0, 0, 0};
-  vsub(anugavis.eye, anugavis.focus, dir);
-  dir[2] = 0;
-  vscale(dir, dist/vlen(dir), dir);
-  vadd(anugavis.eye, dir, anugavis.eye);
-  vadd(anugavis.focus, dir, anugavis.focus);
-}
-
-void camera_strafe(float dist){
-  vector releye;
-  vector dir;
-  vsub(anugavis.eye, anugavis.focus, releye);
-  vcross(releye, up, dir);
-  vscale(dir, dist/vlen(dir), dir);
-  vadd(anugavis.eye, dir, anugavis.eye);
-  vadd(anugavis.focus, dir, anugavis.focus);
-}
-
 void camera_zoom(float dist){
   vector releye;

anuga_work/development/anugavis/src/camera.h

@@ -9 +9 @@
 #define CAMERA_ZOOM_STEP 0.025
 
+extern void camera_home(void);
 extern void camera_pitch(float theta);
+extern void camera_strafe(float dist);
+extern void camera_track(float dist);
 extern void camera_yaw(float theta);
-extern void camera_track(float dist);
-extern void camera_strafe(float dist);
 extern void camera_zoom(float dist);
 

anuga_work/development/anugavis/src/events.c

@@ -55 +55 @@
                                      - 1);
         break;
+      case SDLK_h: camera_home(); break;
       case SDLK_ESCAPE: more = 0; break;
       case SDLK_UP: anugavis.keys[KEY_PITCH_UP] = 1; break;

anuga_work/development/anugavis/src/init.c

@@ -18 +18 @@
 #include <netcdf.h>
 #include <SDL.h>
+#include "camera.h"
 #include "error.h"
 #include "globals.h"
@@ -27 +28 @@
 int AnugaVis_Init(int width, int height, const char *swwFilePath){
   int ncstatus;
-  vector releye;
   unsigned int i;
   GLfloat lightAmbient[] = {0.0, 0.0, 0.0, 1.0};
@@ -103 +103 @@
     anugavis.maxY = MAX(anugavis.maxY, anugavis.y[i]);
   }
-  anugavis.eye[0] = anugavis.minX;
-  anugavis.eye[1] = anugavis.minY;
-  anugavis.eye[2] = 0;
-  anugavis.focus[0] = anugavis.minX + (anugavis.maxX - anugavis.minX) / 2;
-  anugavis.focus[1] = anugavis.minY + (anugavis.maxY - anugavis.minY) / 2;
-  anugavis.focus[2] = 0;
-  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));
+  camera_home();
   return 0;
 }