Changeset 5272

Timestamp:

May 2, 2008, 2:41:50 PM (17 years ago)

Author:

jack

Message:

Added vector module.

Location:

anuga_work/development/anugavis

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/height_quantity.c (modified) (3 diffs)
• src/vector.c (added)
• src/vector.h (added)

anuga_work/development/anugavis/configure.ac

@@ -15 +15 @@
 AX_CHECK_GLU
 AM_PATH_SDL([1.2.12], [], [AC_MSG_ERROR([SDL is required to build.])])
-AC_SUBST([SDL_LIBPATH])
 AC_SEARCH_LIBS([nc_open], [netcdf], [],
                [AC_MSG_ERROR([Can't link the NetCDF library. (LDFLAGS?)])])

anuga_work/development/anugavis/src/Makefile.am

@@ -15 +15 @@
                         netcdf_util.c \
                         netcdf_util.h \
+                        vector.c \
+                        vector.h \
                         xfunctions.c \
                         xfunctions.h
@@ -23 +25 @@
 anugavis_simple_SOURCES = anugavis_simple.c
 anugavis_simple_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
-anugavis_simple_LDADD = libanugavis.a @SDL_LIBS@ @GLU_LIBS@
+anugavis_simple_LDADD = libanugavis.a -lm @SDL_LIBS@ @GLU_LIBS@

anuga_work/development/anugavis/src/height_quantity.c

@@ -20 +20 @@
 #include "height_quantity.h"
 #include "netcdf_util.h"
+#include "vector.h"
 #include "xfunctions.h"
 
@@ -27 +28 @@
   unsigned int vertex;
   int vertIndex;
-  int x[3];
-  int y[3];
-  int z[3];
+  vector vs[3];
+  vector v1;
+  vector v2;
+  vector normal;
   float *heights = xmalloc(sizeof(float)
                            * anugavis.number_of_points
@@ -47 +49 @@
       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];
+        vs[vertex][0] = anugavis.x[vertIndex];
+        vs[vertex][1] = anugavis.y[vertIndex];
+        vs[vertex][2] = 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]));
+      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);
       for(vertex = 0 ; vertex < anugavis.number_of_vertices ; vertex++){
         vertIndex = anugavis.volumes[vol*anugavis.number_of_vertices + vertex];