Changeset 5339

Timestamp:

May 16, 2008, 4:17:15 PM (16 years ago)

Author:

jack

Message:

Fixed frame controls

Location:

anuga_work/development/anugavis/src

Files:

• anugavis_simple.c (modified) (1 diff)
• camera.c (modified) (1 diff)
• camera.h (modified) (1 diff)
• events.c (modified) (4 diffs)
• events.h (modified) (1 diff)
• globals.h (modified) (1 diff)
• init.c (modified) (1 diff)
• vector.h (modified) (1 diff)

anuga_work/development/anugavis/src/anugavis_simple.c

@@ -14 +14 @@
     return 1;
   }
-/*   if(AnugaVis_DefineHeightQuantity("elevation", 0.0, 1.0, 0.5, 0.5, 0.5) == -1){ */
-/*     printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError()); */
-/*     return 1; */
-/*   } */
-  if(AnugaVis_DefineHeightQuantity("stage", -0.01, 1.0, 0.0, 0.0, 0.5) == -1){
+  if(AnugaVis_DefineHeightQuantity("stage", 0.0, 1.0, 0.0, 0.0, 0.5) == -1){
+    printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError());
+    return 1;
+  }
+  if(AnugaVis_DefineHeightQuantity("elevation", 0.0, 1.0, 0.5, 0.5, 0.5) == -1){
     printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError());
     return 1;

anuga_work/development/anugavis/src/camera.c

@@ -70 +70 @@
   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);
+}

anuga_work/development/anugavis/src/camera.h

@@ -4 +4 @@
 #define CAMERA_YAW_STEP 0.1
 #define CAMERA_PITCH_STEP 0.1
-#define CAMERA_TRACK_STEP 1.0
-#define CAMERA_STRAFE_STEP 0.1
+#define CAMERA_TRACK_STEP 2.0
+#define CAMERA_STRAFE_STEP 2.0
 
-void camera_pitch(float theta);
-void camera_yaw(float theta);
-void camera_track(float dist);
+extern void camera_pitch(float theta);
+extern void camera_yaw(float theta);
+extern void camera_track(float dist);
+extern void camera_strafe(float dist);
 
 #endif

anuga_work/development/anugavis/src/events.c

@@ -19 +19 @@
 #include "height_quantity.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
 int AnugaVis_Step(void){
+  static Uint32 ticks = 0;
+  static Uint32 lastframe;
   GLfloat lightpos[4];
   int i;
@@ -25 +30 @@
   int more = 1;
   struct height_quantity_simple *height;
+
+  /* Animation. */
+  /* FIXME needs to respect pause. */
+  if(ticks == 0) lastframe = ticks = SDL_GetTicks();
+  else ticks = SDL_GetTicks();
+  if(ticks - lastframe >= FRAME_INTERVAL){
+    lastframe = ticks;
+    if(anugavis.current_frame < (signed int)anugavis.number_of_timesteps - 1){
+      if(!anugavis.paused) anugavis.current_frame++;
+    }else
+      anugavis.paused = 1;
+  }
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -35 +52 @@
   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);
   gluLookAt(anugavis.eye[0], anugavis.eye[1], anugavis.eye[2],
             anugavis.focus[0], anugavis.focus[1], anugavis.focus[2],
@@ -57 +76 @@
         }
       else switch(event.key.keysym.sym){
-        case SDLK_b:
+        case SDLK_z:
+          anugavis.current_frame = MAX(anugavis.current_frame - 10, 0);
+          break;
+        case SDLK_x:
           if(anugavis.current_frame > 0) anugavis.current_frame--;
           break;
-        case SDLK_f:
-          if(anugavis.current_frame < anugavis.number_of_timesteps - 1)
+        case SDLK_c:
+        case SDLK_SPACE: anugavis.paused = !anugavis.paused; break;
+        case SDLK_v:
+          if(anugavis.current_frame <
+             (signed int)anugavis.number_of_timesteps - 1)
             anugavis.current_frame++;
+          break;
+        case SDLK_b:
+          anugavis.current_frame = MIN(anugavis.current_frame + 10,
+                                       (signed int)anugavis.number_of_timesteps
+                                       - 1);
           break;
         case SDLK_ESCAPE: more = 0; break;

anuga_work/development/anugavis/src/events.h

@@ -1 +1 @@
 #ifndef EVENTS_H
 #define EVENTS_H
+
+#define FRAME_INTERVAL 100
 
 typedef enum {KEY_FORWARD = 0,

anuga_work/development/anugavis/src/globals.h

@@ -26 +26 @@
   size_t number_of_volumes;
   size_t number_of_timesteps;
-  size_t current_frame;
+  Sint32 current_frame;
+  uint8_t paused;
   float *x;
   float *y;

anuga_work/development/anugavis/src/init.c

@@ -29 +29 @@
   GLfloat lightDiffuse[] = {1.0, 1.0, 1.0, 1.0};
   anugavis.current_frame = 0;
+  anugavis.paused = 0;
   anugavis.x = NULL;
   anugavis.y = NULL;

anuga_work/development/anugavis/src/vector.h

@@ -4 +4 @@
 typedef float vector[3];
 /* Useful vector operations. */
-void vadd(const vector v1, const vector v2, vector result);
-float vlen(const vector v);
-void vscale(const vector v, const float scale, vector result);
-void vsub(const vector v1, const vector v2, vector result);
-float vdot(const vector v1, const vector v2);
-void vcross(const vector v1, const vector v2, vector result);
+extern void vadd(const vector v1, const vector v2, vector result);
+extern float vlen(const vector v);
+extern void vscale(const vector v, const float scale, vector result);
+extern void vsub(const vector v1, const vector v2, vector result);
+extern float vdot(const vector v1, const vector v2);
+extern void vcross(const vector v1, const vector v2, vector result);
 
 #endif