Changeset 5292

Timestamp:

May 8, 2008, 3:19:26 PM (17 years ago)

Author:

jack

Message:

anugavis: Some basic camera control and frame stepping.

Location:

anuga_work/development/anugavis

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• m4/Makefile.am (deleted)
• src/Makefile.am (modified) (1 diff)
• src/anugavis_simple.c (modified) (1 diff)
• src/camera.c (added)
• src/camera.h (added)
• src/events.c (modified) (5 diffs)
• src/events.h (modified) (1 diff)
• src/globals.h (modified) (1 diff)
• src/height_quantity.c (modified) (3 diffs)
• src/init.c (modified) (2 diffs)
• src/vector.c (modified) (2 diffs)
• src/vector.h (modified) (1 diff)

anuga_work/development/anugavis/Makefile.am

@@ -1 +1 @@
 ## Process this file with automake to generate Makefile.in
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = m4 src
+EXTRA_DIST = m4
+SUBDIRS = src
+
+dist-hook:
+        rm -rf `find $(distdir)/m4 -name .svn`

anuga_work/development/anugavis/configure.ac

@@ -10 +10 @@
 # Checks for programs.
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_RANLIB
 
@@ -17 +18 @@
 AC_SEARCH_LIBS([nc_open], [netcdf], [],
                [AC_MSG_ERROR([Can't link the NetCDF library. (LDFLAGS?)])])
+AC_SEARCH_LIBS([sqrt], [m], [],
+               [AC_MSG_ERROR([Can't find sqrt.])])
+
 # Checks for header files.
 AC_CHECK_HEADER([netcdf.h], [],
@@ -23 +27 @@
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
-AM_PROG_CC_C_O
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([strdup])
+AC_CHECK_FUNCS([strdup sqrt])
 
 AC_CONFIG_FILES([Makefile
-                 m4/Makefile
                  src/Makefile])
 AC_OUTPUT

anuga_work/development/anugavis/src/Makefile.am

@@ -3 +3 @@
 # Convenience library for the core visualiser code.
 noinst_LIBRARIES = libanugavis.a
-libanugavis_a_SOURCES = error.c \
+libanugavis_a_SOURCES = camera.c \
+                        camera.h \
+                        error.c \
                         error.h \
                         events.c \

anuga_work/development/anugavis/src/anugavis_simple.c

@@ -14 +14 @@
     return 1;
   }
-  if(AnugaVis_DefineHeightQuantity("elevation", 0, 1, 0.5, 0.5, 0.5) == -1){
-    printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError());
-    return 1;
-  }
-  if(AnugaVis_DefineHeightQuantity("stage", 0, 1, 0.0, 0.0, 0.5) == -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){
     printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError());
     return 1;

anuga_work/development/anugavis/src/events.c

@@ -14 +14 @@
 #endif
 #include <SDL.h>
+#include "camera.h"
 #include "events.h"
 #include "globals.h"
@@ -19 +20 @@
 
 int AnugaVis_Step(void){
+  GLfloat lightpos[4];
+  int i;
   SDL_Event event;
   int more = 1;
@@ -26 +29 @@
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
+  if(anugavis.keys[KEY_ROTATE_LEFT]) camera_rotate_yaw(CAMERA_DEFAULT_THETA);
+  if(anugavis.keys[KEY_ROTATE_RIGHT]) camera_rotate_yaw(-CAMERA_DEFAULT_THETA);
   gluLookAt(anugavis.eye[0], anugavis.eye[1], anugavis.eye[2],
             anugavis.focus[0], anugavis.focus[1], anugavis.focus[2],
             0, 0, 1);
+  for(i = 0 ; i < 3 ; i++) lightpos[i] = anugavis.eye[i];
+  lightpos[3] = 1.0;
+  glLightfv(GL_LIGHT0, GL_POSITION, lightpos);
   for(height = anugavis.heights ; height != NULL ; height = height->next)
     AnugaVis_DrawHeightQuantity(height);
@@ -37 +45 @@
     case SDL_KEYDOWN:
       switch(event.key.keysym.sym){
+      case SDLK_b:
+        if(anugavis.current_frame > 0) anugavis.current_frame--;
+        break;
+      case SDLK_f:
+        if(anugavis.current_frame < anugavis.number_of_timesteps - 1)
+          anugavis.current_frame++;
+        break;
       case SDLK_ESCAPE:
         more = 0;
+        break;
+      case SDLK_DOWN:
+        anugavis.eye[2] += 1;
+        break;
+      case SDLK_LEFT:
+        anugavis.keys[KEY_ROTATE_LEFT] = 1;
+        break;
+      case SDLK_RIGHT:
+        anugavis.keys[KEY_ROTATE_RIGHT] = 1;
         break;
       default:
@@ -46 +70 @@
     case SDL_KEYUP:
       switch(event.key.keysym.sym){
+      case SDLK_LEFT:
+        anugavis.keys[KEY_ROTATE_LEFT] = 0;
+        break;
+      case SDLK_RIGHT:
+        anugavis.keys[KEY_ROTATE_RIGHT] = 0;
+        break;
       default:
         break;

anuga_work/development/anugavis/src/events.h

@@ -6 +6 @@
               KEY_STRAFE_LEFT,
               KEY_STRAFE_RIGHT,
+              KEY_ROTATE_LEFT,
+              KEY_ROTATE_RIGHT,
               KEY_MAX} KEYS;
 

anuga_work/development/anugavis/src/globals.h

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

anuga_work/development/anugavis/src/height_quantity.c

@@ -32 +32 @@
   vector v2;
   vector normal;
+  vector flippedNormal;
+  vector up = {0.0, 0.0, 1.0};
   float *heights = xmalloc(sizeof(float)
                            * anugavis.number_of_points
@@ -51 +53 @@
         vs[vertex][0] = anugavis.x[vertIndex];
         vs[vertex][1] = anugavis.y[vertIndex];
-        vs[vertex][2] = heights[frame*anugavis.number_of_timesteps + vertIndex];
+        vs[vertex][2] = heights[frame*anugavis.number_of_points + vertIndex];
       }
       vsub(vs[1], vs[0], v1);
       vsub(vs[2], vs[0], v2);
       vcross(v1, v2, normal);
-      /* FIXME: Need to ensure that normal is pointing upward. */
-      glNormal3fv(normal);
+      if(vdot(normal, up) / vlen(normal) < 0){
+        vscale(normal, -1.0, flippedNormal);
+        glNormal3fv(flippedNormal);
+      }else glNormal3fv(normal);
       for(vertex = 0 ; vertex < anugavis.number_of_vertices ; vertex++){
         vertIndex = anugavis.volumes[vol*anugavis.number_of_vertices + vertex];
         glVertex3f(anugavis.x[vertIndex], anugavis.y[vertIndex],
-                   heights[frame * anugavis.number_of_timesteps + vertIndex]);
+                   heights[frame * anugavis.number_of_points + vertIndex]);
       }
       glEnd();
@@ -146 +150 @@
 void AnugaVis_DrawHeightQuantity(struct height_quantity_simple *height){
   glPushMatrix();
-  /*  glScalef(0, 0, height->scale);
-      glTranslatef(0, 0, height->offset);*/
+  glScalef(1, 1, height->scale);
+  glTranslatef(0, 0, height->offset);
   glColor3f(height->red, height->green, height->blue);
-  glCallList(height->displayLists);
+  glCallList(height->displayLists + (height->frames == 1 ? 0 :
+                                     anugavis.current_frame));
   glPopMatrix();
 }

anuga_work/development/anugavis/src/init.c

@@ -26 +26 @@
 int AnugaVis_Init(int width, int height, const char *swwFilePath){
   int ncstatus;
-  int ncdimid;
-  int ncvarid;
+  GLfloat lightAmbient[] = {0.0, 0.0, 0.0, 1.0};
+  GLfloat lightDiffuse[] = {1.0, 1.0, 1.0, 1.0};
+  anugavis.current_frame = 0;
   anugavis.x = NULL;
   anugavis.y = NULL;
   anugavis.volumes = NULL;
   /* FIXME derive this from the dataset? */
-  anugavis.eye[0] = 5.0;
-  anugavis.eye[1] = 5.0;
-  anugavis.eye[2] = 20.0;
+  anugavis.eye[0] = 1.0;
+  anugavis.eye[1] = 1.0;
+  anugavis.eye[2] = 40.0;
   anugavis.focus[0] = 0.0;
   anugavis.focus[1] = 0.0;
@@ -59 +60 @@
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
-
+  glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+  glEnable(GL_COLOR_MATERIAL);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_LIGHT0);
+  glLightfv(GL_LIGHT0, GL_AMBIENT, lightAmbient);
+  glLightfv(GL_LIGHT0, GL_DIFFUSE, lightDiffuse);
+  
   if((ncstatus = nc_open(swwFilePath, NC_SHARE,
                          &anugavis.netcdfId)) != NC_NOERR){

anuga_work/development/anugavis/src/vector.c

@@ -6 +6 @@
 }
 
+void vscale(vector v, float scale, vector result){
+  int i;
+  for(i = 0 ; i < 3 ; i++) result[i] = scale * v[i];
+}
+
 void vsub(vector v1, vector v2, vector result){
   int i;
@@ -11 +16 @@
 }
 
-void vnormalise(vector v, vector result){
-  float len = vlen(v);
+float vdot(vector v1, vector v2){
   int i;
-  for(i = 0 ; i < 3 ; i++) result[i] = v[i] / len;
+  float rv = 0;
+  for(i = 0 ; i < 3 ; i++) rv += v1[i] * v2[i];
+  return rv;
 }
 

anuga_work/development/anugavis/src/vector.h

@@ -5 +5 @@
 /* Useful vector operations. */
 float vlen(vector v);
+void vscale(vector v, float scale, vector result);
 void vsub(vector v1, vector v2, vector result);
-void vnormalise(vector v, vector result);
+float vdot(vector v1, vector v2);
 void vcross(vector v1, vector v2, vector result);