Changeset 5636 for anuga_work/development/anugavis/src

Timestamp:

Aug 11, 2008, 12:11:33 PM (17 years ago)

Author:

jack

Message:

Almost ready to run.

Location:

anuga_work/development/anugavis/src

Files:

• Makefile.am (modified) (1 diff)
• anugavis.cc (modified) (4 diffs)
• anugavis.hh (modified) (2 diffs)
• height_quantity.cc (modified) (2 diffs)
• sww_file.hh (modified) (1 diff)
• vector.cc (added)
• vector.hh (added)

anuga_work/development/anugavis/src/Makefile.am

@@ -23 +23 @@
                         xfunctions.h
 libanugavis_a_LIBADD = $(LIBOBJS)
-libanugavis_cxx_a_SOURCES = anugavis.cc \
-                            anugavis.hh \
-                            height_quantity.cc \
-                            height_quantity.hh \
-                            output.cc \
-                            output.hh \
-                            sww_file.cc \
-                            sww_file.hh
+libanugavis_cxx_a_SOURCES = anugavis.cc         anugavis.hh             \
+                            height_quantity.cc  height_quantity.hh      \
+                            output.cc           output.hh               \
+                            sww_file.cc         sww_file.hh             \
+                            vector.cc           vector.hh
 libanugavis_cxx_a_LIBADD = $(LIBOBJS)
 

anuga_work/development/anugavis/src/anugavis.cc

@@ -3 +3 @@
 #endif
 
-#include <iostream>
+#include <algorithm>
 #include <string>
 #include <boost/shared_ptr.hpp>
@@ -22 +22 @@
 
 using boost::shared_ptr;
+using std::for_each;
 using std::string;
 
 AnugaVis::AnugaVis(const string &file_name, int width, int height):
-  screen(NULL), sww_file(new SWWFile(file_name)){
+  frame(0), paused(false), screen(NULL), sww_file(new SWWFile(file_name)){
+  init_camera();
   init_SDL(width, height);
   init_OpenGL(width, height);
@@ -40 +42 @@
 
 void AnugaVis::run(void){
+  while(this->step());
+}
 
+void AnugaVis::init_camera(void){
+  this->eye = Vector(this->sww_file->minX, this->sww_file->minY, 0);
+  this->focus = Vector(this->sww_file->minX +
+                       (this->sww_file->maxX - this->sww_file->minX) / 2,
+                       this->sww_file->minY + 
+                       (this->sww_file->maxY - this->sww_file->minY) / 2,
+                       0);
+  this->eye.z = (eye - focus).magnitude();
 }
 
@@ -73 +85 @@
   glLightfv(GL_LIGHT0, GL_DIFFUSE, lightDiffuse);
 }
+
+static const Uint32 TARGET_TICK_RATE = 50;
+bool AnugaVis::step(void){
+  static Uint32 ticks = 0;
+  static Uint32 lastframe;
+  bool more = true;
+
+  if(ticks == 0) lastframe = ticks = SDL_GetTicks();
+  else ticks = SDL_GetTicks();
+  if(ticks - lastframe < TARGET_TICK_RATE) return more;
+  
+  lastframe = ticks;
+  if(this->frame < this->sww_file->number_of_timesteps - 1){
+    if(!this->paused) this->frame++;
+  }else
+    this->paused = 1;
+
+  return false;
+}

anuga_work/development/anugavis/src/anugavis.hh

@@ -10 +10 @@
 #include "height_quantity.hh"
 #include "sww_file.hh"
+#include "vector.hh"
 
 using boost::shared_ptr;
@@ -22 +23 @@
   void run(void);
 private:
+  void init_camera(void);
   void init_SDL(int width, int height);
   void init_OpenGL(int width, int height);
+  bool step(void);
+  Vector eye;
+  Vector focus;
+  int frame;
+  list<shared_ptr<HeightQuantity> > heights;
+  bool paused;
   SDL_Surface *screen;
   shared_ptr<SWWFile> sww_file;
-  list<shared_ptr<HeightQuantity> > heights;
 };
 

anuga_work/development/anugavis/src/height_quantity.cc

@@ -63 +63 @@
   size_t span_2[2] = {1, 0};
   int ncstatus;
+  int volume;
+  int vertex;
+  int vertIndex;
   if(this->dynamic){
+    start_2[0] = frame;
     span_2[1] = this->sww_file->number_of_points;
     ncstatus = nc_get_vara_float(this->sww_file->netcdf_id, this->varid,
@@ -73 +77 @@
   }
   if(ncstatus != NC_NOERR) throw nc_strerror(ncstatus);
-  /* TODO: Compile the triangles into an OGL displaylist. */
+  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){
+        vertIndex = this->sww_file->volumes[volume * 
+                                            this->sww_file->number_of_vertices +
+                                            vertex];
+        glVertex3f(this->sww_file->x[vertIndex],
+                   this->sww_file->y[vertIndex],
+                   this->points[vertIndex]);
+      }
+    }
+  }
+  glEnd();
+  glEndList();
 }

anuga_work/development/anugavis/src/sww_file.hh

@@ -18 +18 @@
 
 class SWWFile{
+  friend class AnugaVis;
   friend class HeightQuantity;
 public: