Changeset 5267

Timestamp:

May 2, 2008, 12:13:55 PM (17 years ago)

Author:

jack

Message:

AnugaVis?: compile the data into openGL display lists.

Location:

anuga_work/development/anugavis/src

Files:

• Makefile.am (modified) (1 diff)
• anugavis_simple.c (modified) (1 diff)
• error.c (modified) (3 diffs)
• error.h (modified) (1 diff)
• globals.h (modified) (1 diff)
• height_quantity.c (modified) (6 diffs)
• height_quantity.h (modified) (1 diff)
• init.c (modified) (5 diffs)
• xfunctions.c (moved) (moved from anuga_work/development/anugavis/src/xmalloc.c) (1 diff)
• xfunctions.h (moved) (moved from anuga_work/development/anugavis/src/xmalloc.h) (1 diff)

anuga_work/development/anugavis/src/Makefile.am

@@ -15 +15 @@
                         netcdf_util.c \
                         netcdf_util.h \
-                        xmalloc.c \
-                        xmalloc.h
+                        xfunctions.c \
+                        xfunctions.h
 libanugavis_a_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
 libanugavis_a_LIBADD = @LIBOBJS@

anuga_work/development/anugavis/src/anugavis_simple.c

@@ -14 +14 @@
     return 1;
   }
+  printf("%d\n", anugavis.number_of_timesteps);
   if(AnugaVis_DefineHeightQuantity("elevation", 0, 1, 128, 128, 128) == -1){
     printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError());

anuga_work/development/anugavis/src/error.c

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#ifdef HAVE_GL_GLU_H
+#  include <GL/glu.h>
+#elif HAVE_OPENGL_GLU_H
+#  include <OpenGL/glu.h>
+#endif
 #include <stdarg.h>
 #include <netcdf.h>
@@ -4 +13 @@
 #include "error.h"
 
-#define MAX_ERROR_LEN 100
+#define MAX_ERROR_LEN 200
 
 static char error[MAX_ERROR_LEN];
@@ -27 +36 @@
   AnugaVis_SetError("NetCDF Error: %s", nc_strerror(ncerr));
 }
+
+void AnugaVis_OpenGLError(GLenum errorCode){
+  AnugaVis_SetError("OpenGL Error: %s", gluErrorString(errorCode));
+}

anuga_work/development/anugavis/src/error.h

@@ -1 +1 @@
 #ifndef ANUGAVIS_ERROR_H
 #define ANUGAVIS_ERROR_H
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#ifdef HAVE_GL_GL_H
+#  include <GL/gl.h>
+#elif HAVE_OPENGL_GL_H
+#  include <OpenGL/gl.h>
+#endif
 
 /* Set the error message with a printf-style format string.
  */
 void AnugaVis_SetError(const char *format, ...);
-
 /* Report a SDL error.
  */
 void AnugaVis_SDLError(void);
-
 /* Report a NetCDF error.
  */
 void AnugaVis_NetCDFError(int ncerr);
+/* Report an OpenGL error.
+ */
+void AnugaVis_OpenGLError(GLenum errorCode);
 
 /* Get detailed error information. The returned string should not be

anuga_work/development/anugavis/src/globals.h

@@ -8 +8 @@
   SDL_Surface *screen;
   int netcdfId;
+  /* These are populated from the NetCDF file */
   size_t number_of_points;
   size_t number_of_vertices;
   size_t number_of_volumes;
+  size_t number_of_timesteps;
   float *x;
   float *y;

anuga_work/development/anugavis/src/height_quantity.c

@@ -9 +9 @@
 #  include <string.h>
 #endif
+#ifdef HAVE_GL_GL_H
+#  include <GL/gl.h>
+#elif HAVE_OPENGL_GL_H
+#  include <OpenGL/gl.h>
+#endif
 #include <netcdf.h>
 #include <SDL.h>
@@ -14 +19 @@
 #include "globals.h"
 #include "height_quantity.h"
-#include "xmalloc.h"
+#include "netcdf_util.h"
+#include "xfunctions.h"
+
+static int compileDisplayLists(struct height_quantity_simple *height){
+  int frame;
+  unsigned int vol;
+  unsigned int vertex;
+  int vertIndex;
+  int x[3];
+  int y[3];
+  int z[3];
+  float *heights = xmalloc(sizeof(float)
+                           * anugavis.number_of_points
+                           * height->frames, "compileDisplayLists()");
+  if(heights == NULL)
+    return -1;
+  if(nc_get_var_float_by_name(anugavis.netcdfId,
+                              height->name, heights) != NC_NOERR){
+    free(heights);
+    return -1;
+  }
+
+  for(frame = 0 ; frame < height->frames ; frame++){
+    glNewList(height->displayLists + frame, GL_COMPILE);
+    for(vol = 0 ; vol < anugavis.number_of_volumes ; vol++){
+      glBegin(GL_POLYGON);
+      for(vertex = 0 ; vertex < 3 ; vertex++){ /* Calculate normal */
+        vertIndex = anugavis.volumes[vol*anugavis.number_of_vertices + vertex];
+        x[vertex] = anugavis.x[vertIndex];
+        y[vertex] = anugavis.y[vertIndex];
+        z[vertex] = heights[frame * anugavis.number_of_timesteps + vertIndex];
+      }
+      glNormal3f((y[1] - y[0]) * (z[2] - z[0]) - (z[1] - z[0]) * (y[2] - y[0]),
+                 (z[1] - z[0]) * (x[2] - x[0]) - (x[1] - x[0]) * (z[2] - z[0]),
+                 (x[1] - x[0]) * (y[2] - y[0]) - (y[1] - y[0]) * (x[2] - x[0]));
+      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]);
+      }
+      glEnd();
+    }
+    glEndList();
+  }
+
+  free(heights);
+  return 0;
+}
+
+static void freeHeightQuantity(struct height_quantity_simple *height){
+  if(height->name != NULL) free(height->name);
+  if(glIsList(height->displayLists) == GL_TRUE)
+    glDeleteLists(height->displayLists, height->frames);
+  free(height);
+}
 
 int AnugaVis_DefineHeightQuantity(const char *name,
@@ -23 +82 @@
   int ncvarid;
   int numdims;
+  GLenum glerror;
   /* Check that it's actually in the NetCDF file */
   if((ncstatus = nc_inq_varid(anugavis.netcdfId, name, &ncvarid)) != NC_NOERR){
@@ -37 +97 @@
                          "AnugaVis_DefineHeightQuantity()")) == NULL)
       return -1;
+
+    height->name = NULL;
+    height->displayLists = -1;
+
+    if((height->name = xstrdup(name,
+                               "AnugaVis_DefineHeightQuantity()")) == NULL){
+      freeHeightQuantity(height);
+      return -1;
+    }
+
+    /* If the NetCDF variable is 2-dimensional, then it's dynamic. */
+    if((ncstatus = nc_inq_varndims(anugavis.netcdfId,
+                                   ncvarid, &numdims)) != NC_NOERR){
+      AnugaVis_NetCDFError(ncstatus);
+      freeHeightQuantity(height);
+      return -1;
+    }
+
+    height->frames = (numdims == 2) ? anugavis.number_of_timesteps : 1;
+    height->displayLists = glGenLists(height->frames);
+    if((glerror = glGetError()) != GL_NO_ERROR){
+      AnugaVis_OpenGLError(glerror);
+      freeHeightQuantity(height);
+      return -1;
+    }
+
+    if(compileDisplayLists(height) == -1){
+      freeHeightQuantity(height);
+      return -1;
+    }
+
     height->next = anugavis.heights;
     anugavis.heights = height;
   }
-  
-  /* If the NetCDF variable is 2-dimensional, then it's dynamic. */
-  if((ncstatus = nc_inq_varndims(anugavis.netcdfId,
-                                 ncvarid, &numdims)) != NC_NOERR){
-    AnugaVis_NetCDFError(ncstatus);
-    return -1;
-  }
-  height->dynamic = (numdims == 2);
+
   height->offset = offset;
   height->scale = scale;
@@ -60 +144 @@
   if(!strcmp(name, height->name)){
     anugavis.heights = height->next;
-    free(height);
+    freeHeightQuantity(height);
     return;
   }
@@ -68 +152 @@
       nextHeight = height->next;
       height->next = height->next->next;
-      free(nextHeight);
+      freeHeightQuantity(nextHeight);
       return;
     }

anuga_work/development/anugavis/src/height_quantity.h

@@ -2 +2 @@
 #define HEIGHT_QUANTITY_H
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#ifdef HAVE_GL_GL_H
+#  include <GL/gl.h>
+#elif HAVE_OPENGL_GL_H
+#  include <OpenGL/gl.h>
+#endif
 #include <SDL.h>
 
 struct height_quantity_simple{
   char *name;
-  uint8_t dynamic;
+  uint8_t frames;
   double offset;
   double scale;
   Uint32 color;
+  GLuint displayLists;
   struct height_quantity_simple *next;
 };

anuga_work/development/anugavis/src/init.c

@@ -20 +20 @@
 #include "error.h"
 #include "globals.h"
+#include "init.h"
 #include "netcdf_util.h"
-#include "xmalloc.h"
+#include "xfunctions.h"
 
 int AnugaVis_Init(int width, int height, const char *swwFilePath){
@@ -43 +44 @@
   }
 
+  SDL_WM_SetCaption("ANUGA Visualiser", "ANUGA Visualiser");
   glEnable(GL_DEPTH_TEST);
   glShadeModel(GL_FLAT);
@@ -63 +65 @@
      (nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_volumes",
                             &anugavis.number_of_volumes) != NC_NOERR) ||
+     (nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_timesteps",
+                            &anugavis.number_of_timesteps) != NC_NOERR) ||
      ((anugavis.x = xmalloc(sizeof(float) * anugavis.number_of_points,
                             "AnugaVis_Init()")) == NULL) ||
@@ -77 +81 @@
      (nc_get_var_int_by_name(anugavis.netcdfId, "volumes",
                              anugavis.volumes) != NC_NOERR)){
-    nc_close(anugavis.netcdfId);
-    if(anugavis.x != NULL) free(anugavis.x);
-    if(anugavis.y != NULL) free(anugavis.y);
-    if(anugavis.volumes != NULL) free(anugavis.volumes);
-    SDL_Quit();
+    AnugaVis_DeInit();
     return -1;
   }
@@ -91 +91 @@
     AnugaVis_UndefineHeightQuantity(anugavis.heights->name);
   nc_close(anugavis.netcdfId);
-  free(anugavis.x);
-  free(anugavis.y);
-  free(anugavis.volumes);
+  if(anugavis.x != NULL) free(anugavis.x);
+  if(anugavis.y != NULL) free(anugavis.y);
+  if(anugavis.volumes != NULL) free(anugavis.volumes);
   SDL_Quit();
 }

anuga_work/development/anugavis/src/xfunctions.c

@@ -10 +10 @@
 #endif
 #include "error.h"
-#include "xmalloc.h"
+#include "xfunctions.h"
 
 void *xmalloc(size_t size, const char *message){

anuga_work/development/anugavis/src/xfunctions.h

@@ -1 @@
-#ifndef XMALLOC_H
-#define XMALLOC_H
+#ifndef XFUNCTIONS_H
+#define XFUNCTIONS_H
 
 /* For a given func, xfunc behaves like func but sets an error message
- * using AnugaVis_SetError().
+ * using AnugaVis_SetError() if something goes wrong.
  */
 extern void *xmalloc(size_t size, const char *message);