Changeset 5684 for anuga_work/development

Timestamp:

Aug 26, 2008, 10:50:42 AM (17 years ago)

Author:

jack

Message:

Normal calculations for height quantities (broken).

Location:

anuga_work/development/anugavis/src

Files:

• anugavis.cc (modified) (4 diffs)
• height_quantity.cc (modified) (4 diffs)

anuga_work/development/anugavis/src/anugavis.cc

@@ -5 +5 @@
 #include <algorithm>
 #include <string>
+#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #ifdef HAVE_GL_GL_H
@@ -21 +22 @@
 #include "sww_file.hh"
 
+using boost::bind;
 using boost::shared_ptr;
 using std::for_each;
@@ -91 +93 @@
   static Uint32 lastframe;
   bool more = true;
+  float light[4];
 
   if(ticks == 0) lastframe = ticks = SDL_GetTicks();
@@ -102 +105 @@
     this->paused = 1;
 
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  gluLookAt(this->eye  .x, this->eye  .y, this->eye  .z,
+            this->focus.x, this->focus.y, this->focus.z,
+                        0,             0,             1);
+  light[0] = this->eye.x;
+  light[1] = this->eye.y;
+  light[2] = this->eye.z;
+  light[3] = 1.0;
+  glLightfv(GL_LIGHT0, GL_POSITION, light);
+  for_each(this->heights.begin(),
+           this->heights.end  (),
+           bind(&HeightQuantity::draw, _1, this->frame));
   return false;
 }

anuga_work/development/anugavis/src/height_quantity.cc

@@ -16 +16 @@
 #include <netcdf.h>
 #include "height_quantity.hh"
+#include "vector.hh"
 
 using std::string;
@@ -63 +64 @@
   size_t span_2[2] = {1, 0};
   int ncstatus;
-  int volume;
-  int vertex;
   int vertIndex;
   if(this->dynamic){
@@ -78 +77 @@
   if(ncstatus != NC_NOERR) throw nc_strerror(ncstatus);
   glNewList(this->display_list, GL_COMPILE);
-  glBegin(GL_TRIANGLES);
-  { 
-    
-    for(volume = 0 ; volume = this->sww_file->number_of_volumes ; ++volume){
-      for(vertex = 0 ; vertex < 3 ; ++vertex){
+  glBegin(GL_TRIANGLES);{
+    for(int volume = 0 ; volume = this->sww_file->number_of_volumes ; ++volume){
+      /* Compute normal. */
+      Vector vs[3];
+      for(int vertex = 0 ; vertex < 3 ; ++vertex){
+        int offset = volume * this->sww_file->number_of_vertices + vertex;
+        vertIndex = this->sww_file->volumes[offset];
+        vs[vertex] = Vector(this->sww_file->x[vertIndex],
+                            this->sww_file->y[vertIndex],
+                            this->points     [vertIndex]);
+      }
+      Vector normal = (vs[1] - vs[0]).cross(vs[2] - vs[0]);
+      if(normal.magnitude() < 0) normal = normal.scale(-1.0);
+      glNormal3f(normal.x, normal.y, normal.z);
+
+      /* Insert vertices. */
+      for(int vertex = 0 ; vertex < 3 ; ++vertex){
         vertIndex = this->sww_file->volumes[volume * 
                                             this->sww_file->number_of_vertices +
@@ -91 +102 @@
       }
     }
-  }
-  glEnd();
+  }glEnd();
   glEndList();
 }