Changeset 1028 for trunk/packages

Timestamp:

Jun 9, 2008 9:08:02 AM (16 years ago)

Author:

gah

Message:

various cleanups

Location:

trunk/packages/vizservers/nanovis

Files:

• Axis.cpp (modified) (1 diff)
• Axis.h (modified) (3 diffs)
• Command.cpp (modified) (121 diffs)
• HeightMap.cpp (modified) (4 diffs)
• Makefile.in (modified) (2 diffs)
• Mat4x4.cpp (modified) (3 diffs)
• Mat4x4.h (modified) (2 diffs)
• NvLIC.cpp (modified) (15 diffs)
• NvParticleRenderer.cpp (modified) (6 diffs)
• PCASplit.cpp (modified) (2 diffs)
• PCASplit.h (modified) (1 diff)
• Plane.cpp (modified) (3 diffs)
• Plane.h (modified) (1 diff)
• PointSet.cpp (modified) (4 diffs)
• PointSet.h (modified) (1 diff)
• RpDX.cpp (modified) (12 diffs)
• RpDX.h (modified) (2 diffs)
• Texture3D.cpp (modified) (3 diffs)
• Vector3.h (modified) (1 diff)
• Vector4.h (modified) (2 diffs)
• VolumeRenderer.cpp (modified) (10 diffs)
• config.h (modified) (1 diff)
• dxReader2.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (22 diffs)
• nanovis.h (modified) (4 diffs)

trunk/packages/vizservers/nanovis/Axis.cpp

@@ -122 +122 @@
     _name = NULL;
     SetName(name);
+    _units = NULL;
     _title = NULL;
     _valueMin = DBL_MAX, _valueMax = -DBL_MAX;

trunk/packages/vizservers/nanovis/Axis.h

@@ -187 +187 @@
     };
 
-    char *_name;                /* Name of the axis. Malloc-ed */
+    const char *_name;          /* Name of the axis. Malloc-ed */
 
     unsigned int _flags;
 
-    char *_title;               /* Title of the axis. */
+    const char *_title;         /* Title of the axis. */
+
+    const char *_units;         /* Units of the axis. */
 
     double _valueMin, _valueMax; /* The limits of the data. */
@@ -227 +229 @@
 public:
     Axis(const char *name);
+    ~Axis(void) {
+        if (_name != NULL) {
+            free((void *)_name);
+        }
+        if (_units != NULL) {
+            free((void *)_units);
+        }
+        if (_title != NULL) {
+            free((void *)_title);
+        }
+    }
 
     void ResetRange(void);
@@ -243 +256 @@
         return _minor.FirstTick(iter);
     }
-    void GetDataLimits(double min, double max);
+    void GetDataLimits(double &min, double &max) {
+        min = _valueMin, max = _valueMax;
+    }
     double Map(double x);
     double InvMap(double x);
-    char *GetName(void) {
-        return _name;
+    const char *GetName(void) {
+        return (_name == NULL) ? "???" : _name;
     }
     void SetName(const char *name) {
-        _name = new char[strlen(name) + 1];
-        strcpy(_name, name);
+        if (_name != NULL) {
+            free((void *)_name);
+        }
+        _name = strdup(name);
+    }
+    const char *GetUnits(void) {
+        return (_units == NULL) ? "???" : _units;
+    }
+    void SetUnits(const char *units) {
+        if (_units != NULL) {
+            free((void *)_units);
+        }
+        _units = strdup(units);
+    }
+    const char *GetTitle(void) {
+        return (_title == NULL) ? "???" : _title;
+    }
+    void SetTitle(const char *title) {
+        if (_title != NULL) {
+            free((void *)_title);
+        }
+        _title = strdup(title);
     }
     void SetMin(double min) {

trunk/packages/vizservers/nanovis/Command.cpp

@@ -73 +73 @@
 #include <NvLIC.h>
 
-//#define ISO_TEST                1
+#define ISO_TEST                1
 #define PLANE_CMD               0
 #define __TEST_CODE__           0
@@ -143 +143 @@
 #endif
 static Tcl_ObjCmdProc ScreenCmd;
-static Tcl_ObjCmdProc ScreenShotCmd;
+static Tcl_ObjCmdProc SnapshotCmd;
 static Tcl_ObjCmdProc TransfuncCmd;
 static Tcl_ObjCmdProc UniRect2dCmd;
@@ -175 +175 @@
 static int
 GetCullMode(Tcl_Interp *interp, Tcl_Obj *objPtr, 
-            graphics::RenderContext::CullMode *modePtr)
-{
-    char *string = Tcl_GetString(objPtr);
+            graphics::RenderContext::CullMode *modePtr)
+{
+    const char *string = Tcl_GetString(objPtr);
     if (strcmp(string, "none") == 0) {
         *modePtr = graphics::RenderContext::NO_CULL;
@@ -186 +186 @@
     } else {
         Tcl_AppendResult(interp, "invalid cull mode \"", string, 
-                         "\": should be front, back, or none\"", (char *)NULL);
+                         "\": should be front, back, or none\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -196 +196 @@
                 graphics::RenderContext::ShadingModel *modelPtr)
 {
-    char *string = Tcl_GetString(objPtr);
+    const char *string = Tcl_GetString(objPtr);
+
     if (strcmp(string,"flat") == 0) {
         *modelPtr = graphics::RenderContext::FLAT;
@@ -213 +214 @@
                graphics::RenderContext::PolygonMode *modePtr)
 {
-    char *string = Tcl_GetString(objPtr);
+    const char *string = Tcl_GetString(objPtr);
+
     if (strcmp(string,"wireframe") == 0) {
         *modePtr = graphics::RenderContext::LINE;
@@ -220 +222 @@
     } else {
         Tcl_AppendResult(interp, "invalid polygon mode \"", string, 
-                         "\": should be wireframe or fill\"", (char *)NULL);
+                         "\": should be wireframe or fill\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -243 +245 @@
 static HeightMap *
 CreateHeightMap(ClientData clientData, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     float xMin, yMin, xMax, yMax;
@@ -250 +252 @@
     if (objc != 7) {
         Tcl_AppendResult(interp, 
-                         "wrong # of values: should be xMin yMin xMax yMax xNum yNum heights",
-                         (char *)NULL);
+        "wrong # of values: should be xMin yMin xMax yMax xNum yNum heights",
+        (char *)NULL);
         return NULL;
     }
@@ -280 +282 @@
     if (heights == NULL) {
         Tcl_AppendResult(interp, "can't allocate array of heights", 
-                         (char *)NULL);
+                         (char *)NULL);
         return NULL;
     }
@@ -317 +319 @@
     if (index < 0) {
         Tcl_AppendResult(interp, "can't have negative index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -347 +349 @@
     if (hmPtr == NULL) {
         Tcl_AppendResult(interp, "no heightmap defined for index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -376 +378 @@
     if (index < 0) {
         Tcl_AppendResult(interp, "can't have negative index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -412 +414 @@
     if (vol == NULL) {
         Tcl_AppendResult(interp, "no volume defined for index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -433 +435 @@
  */
 static int
-GetVolumeIndices(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-                 vector<unsigned int>* vectorPtr)
+GetVolumeIndices(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv,
+                 vector<unsigned int>* vectorPtr)
 {
     if (objc == 0) {
@@ -471 +473 @@
  */
 static int
-GetVolumes(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-           vector<Volume *>* vectorPtr)
+GetVolumes(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv,
+           vector<Volume *>* vectorPtr)
 {
     if (objc == 0) {
@@ -487 +489 @@
                 return TCL_ERROR;
             }
-            vectorPtr->push_back(volPtr);
+            vectorPtr->push_back(volPtr);
         }
     }
@@ -507 +509 @@
  */
 static int
-GetHeightMaps(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-           vector<HeightMap *>* vectorPtr)
+GetHeightMaps(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv,
+           vector<HeightMap *>* vectorPtr)
 {
     if (objc == 0) {
@@ -523 +525 @@
                 return TCL_ERROR;
             }
-            vectorPtr->push_back(hmPtr);
+            vectorPtr->push_back(hmPtr);
         }
     }
@@ -560 +562 @@
     }
     Tcl_AppendResult(interp, "bad axis \"", string,
-                     "\": should be x, y, or z", (char*)NULL);
+                     "\": should be x, y, or z", (char*)NULL);
     return TCL_ERROR;
 }
@@ -593 +595 @@
 GetAxisDirFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr, int *dirPtr)
 {
-    char *string = Tcl_GetString(objPtr);
+    const char *string = Tcl_GetString(objPtr);
 
     int sign = 1;
@@ -620 +622 @@
  */
 static int
-GetColor(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv, float *rgbPtr)
+GetColor(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, float *rgbPtr)
 {
     if (objc < 3) {
         Tcl_AppendResult(interp, "missing color values\": ",
-                         "should list of R G B values 0.0 - 1.0", (char*)NULL);
+                         "should list of R G B values 0.0 - 1.0", (char*)NULL);
         return TCL_ERROR;
     }
@@ -661 +663 @@
         if (ferror(stdin)) {
             Tcl_AppendResult(interp, "while reading data stream: ",
-                             Tcl_PosixError(interp), (char*)NULL);
+                             Tcl_PosixError(interp), (char*)NULL);
             return TCL_ERROR;
         }
         if (feof(stdin)) {
             Tcl_AppendResult(interp, "premature EOF while reading data stream",
-                             (char*)NULL);
+                             (char*)NULL);
             return TCL_ERROR;
         }
@@ -687 +689 @@
 
 static int
-CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     double x0, y0, z0;
@@ -700 +702 @@
 
 static int
-CameraAngleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraAngleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     double xangle, yangle, zangle;
@@ -713 +715 @@
 
 static int
-CameraZoomOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraZoomOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     double zoom;
@@ -744 +746 @@
  */
 static int
-CameraCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -756 +758 @@
 }
 
-static int
-ScreenShotCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *CONST *objv)
-{
-#ifdef XINETD
-    NanoVis::resize_offscreen_buffer(1024, 1024);
-    NanoVis::cam->set_screen_size(30, 90, 1024 - 60, 1024 - 120);
+/*ARGSUSED*/
+static int
+SnapshotCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    int w, h;
+
+    w = NanoVis::win_width, h = NanoVis::win_height;
+    NanoVis::resize_offscreen_buffer(2048, 2048);
+#ifdef notdef
+    NanoVis::cam->set_screen_size(0, 0, NanoVis::win_width,NanoVis::win_height);
+    NanoVis::cam->set_screen_size(30, 90, 2048 - 60, 2048 - 120);
+#endif
     NanoVis::offscreen_buffer_capture();  //enable offscreen render
     NanoVis::display();
-
-    // INSOO
-    // TBD
-    /*
-      Volume* vol = NanoVis::volume[0];
-      TransferFunction* tf;
-      tf = NanoVis::vol_renderer->get_volume_shading(vol);
-      if (tf != NULL) 
-      {
-      float data[512];
-
-      for (int i=0; i < 256; i++) {
-      data[i] = data[i+256] = (float)(i/255.0);
-      }
-      Texture2D* plane = new Texture2D(256, 2, GL_FLOAT, GL_LINEAR, 1, data);
-      NanoVis::color_table_renderer->render(1024, 1024, plane, tf, vol->wAxis.Min(),
-                vol->wAxis.Max());
-      delete plane;
-    
-      }
-    */
+    NanoVis::read_screen();
+#ifdef notdef
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); 
 #endif
-
+    NanoVis::ppm_write("nv>print -bytes");
+    NanoVis::resize_offscreen_buffer(w, h);
     return TCL_OK;
 }
@@ -793 +784 @@
 static int
 CutplanePositionOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                   Tcl_Obj *CONST *objv)
+                   Tcl_Obj *const *objv)
 {
     float relval;
@@ -825 +816 @@
 static int
 CutplaneStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     bool state;
@@ -877 +868 @@
  */
 static int
-CutplaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CutplaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -901 +893 @@
  */
 static int
-LegendCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+LegendCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc != 4) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " volIndex width height\"", (char*)NULL);
+            Tcl_GetString(objv[0]), " volIndex width height\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -917 +909 @@
     if (tf == NULL) {
         Tcl_AppendResult(interp, "no transfer function defined for volume \"", 
-                         Tcl_GetString(objv[1]), "\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-    char *label;
+                         Tcl_GetString(objv[1]), "\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+    const char *label;
     label = Tcl_GetString(objv[1]);
 
@@ -929 +921 @@
     }
     if (volPtr->update_pending) {
-        NanoVis::SetVolumeRanges();
+        NanoVis::SetVolumeRanges();
     }
     NanoVis::render_legend(tf, Volume::valueMin, Volume::valueMax, w, h, label);
@@ -945 +937 @@
  */
 static int
-ScreenCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+ScreenCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc != 3) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " width height\"", (char*)NULL);
+                         Tcl_GetString(objv[0]), " width height\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -974 +966 @@
 static int
 TransfuncCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
+             Tcl_Obj *const *objv)
 {
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-
-    char *string = Tcl_GetString(objv[1]);
+                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
-    if ((c == 'd') && (strcmp(string, "define") == 0)) 
-    {
+    if ((c == 'd') && (strcmp(string, "define") == 0)) {
         if (objc != 5) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                    Tcl_GetString(objv[0]), " define name colorMap alphaMap\"", 
-                (char*)NULL);
+                Tcl_GetString(objv[0]), " define name colorMap alphaMap\"", 
+                (char*)NULL);
             return TCL_ERROR;
         }
@@ -1005 +996 @@
         if ((cmapc % 4) != 0) {
             Tcl_AppendResult(interp, "wrong # elements is colormap: should be ",
-                "{ v r g b ... }", (char*)NULL);
+                "{ v r g b ... }", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1013 +1004 @@
         if ((wmapc % 2) != 0) {
             Tcl_AppendResult(interp, "wrong # elements in alphamap: should be ",
-                " { v w ... }", (char*)NULL);
+                " { v w ... }", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1026 +1017 @@
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
                     Tcl_AppendResult(interp, "bad colormap value \"", 
-                        Tcl_GetString(cmapv[i+j]), 
-                        "\": should be in the range 0-1", (char*)NULL);
+                        Tcl_GetString(cmapv[i+j]), 
+                        "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
@@ -1045 +1036 @@
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
                     Tcl_AppendResult(interp, "bad alphamap value \"", 
-                        Tcl_GetString(wmapv[i+j]),
-                        "\": should be in the range 0-1", (char*)NULL);
+                        Tcl_GetString(wmapv[i+j]),
+                        "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
@@ -1066 +1057 @@
     } else {
         Tcl_AppendResult(interp, "bad option \"", string,
-                "\": should be define", (char*)NULL);
+                "\": should be define", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1082 +1073 @@
  */
 static int
-UpCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+UpCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc != 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " x|y|z|-x|-y|-z\"", (char*)NULL);
+                         Tcl_GetString(objv[0]), " x|y|z|-x|-y|-z\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1102 +1093 @@
 static int
 VolumeAnimationCaptureOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                         Tcl_Obj *CONST *objv)
+                         Tcl_Obj *const *objv)
 {
     int total;
     if (Tcl_GetIntFromObj(interp, objv[3], &total) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     VolumeInterpolator* interpolator;
@@ -1112 +1103 @@
     interpolator->start();
     if (interpolator->is_started()) {
-        char *fileName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
-        for (int frame_num = 0; frame_num < total; ++frame_num) {
-            float fraction;
-            
-            fraction = ((float)frame_num) / (total - 1);
-            Trace("fraction : %f\n", fraction);
-            //interpolator->update(((float)frame_num) / (total - 1));
-            interpolator->update(fraction);
-            
-            NanoVis::offscreen_buffer_capture();  //enable offscreen render
-            
-            NanoVis::display();
-            NanoVis::read_screen();
-            
-            glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+        const char *fileName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
+        for (int frame_num = 0; frame_num < total; ++frame_num) {
+            float fraction;
             
-            NanoVis::bmp_write_to_file(frame_num, fileName);
-        }
+            fraction = ((float)frame_num) / (total - 1);
+            Trace("fraction : %f\n", fraction);
+            //interpolator->update(((float)frame_num) / (total - 1));
+            interpolator->update(fraction);
+            
+            NanoVis::offscreen_buffer_capture();  //enable offscreen render
+            
+            NanoVis::display();
+            NanoVis::read_screen();
+            
+            glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+            
+            NanoVis::bmp_write_to_file(frame_num, fileName);
+        }
     }
     return TCL_OK;
@@ -1136 +1127 @@
 static int
 VolumeAnimationClearOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     NanoVis::vol_renderer->clearAnimatedVolumeInfo();
@@ -1144 +1135 @@
 static int
 VolumeAnimationStartOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     NanoVis::vol_renderer->startVolumeAnimation();
@@ -1152 +1143 @@
 static int
 VolumeAnimationStopOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                      Tcl_Obj *CONST *objv)
+                      Tcl_Obj *const *objv)
 {
     NanoVis::vol_renderer->stopVolumeAnimation();
@@ -1160 +1151 @@
 static int
 VolumeAnimationVolumesOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                         Tcl_Obj *CONST *objv)
+                         Tcl_Obj *const *objv)
 {
     vector<unsigned int> ivol;
     if (GetVolumeIndices(interp, objc - 3, objv + 3, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     Trace("parsing volume index\n");
     vector<unsigned int>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        Trace("index: %d\n", *iter);
-        NanoVis::vol_renderer->addAnimatedVolume(NanoVis::volume[*iter], *iter);
+        Trace("index: %d\n", *iter);
+        NanoVis::vol_renderer->addAnimatedVolume(NanoVis::volume[*iter], *iter);
     }
     return TCL_OK;
@@ -1187 +1178 @@
 static int
 VolumeAnimationOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps, volumeAnimationOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1202 +1193 @@
 static int
 VolumeDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                    Tcl_Obj *CONST *objv)
+                    Tcl_Obj *const *objv)
 {
     printf("Data Loading\n");
@@ -1335 +1326 @@
         
         if (Volume::update_pending) {
-            NanoVis::SetVolumeRanges();
+            NanoVis::SetVolumeRanges();
         }
         volPtr = NanoVis::volume[n];
         sprintf(info, "nv>data id %d min %g max %g vmin %g vmax %g\n", 
                 n, volPtr->wAxis.Min(), volPtr->wAxis.Max(),
-                Volume::valueMin, Volume::valueMax);
+                Volume::valueMin, Volume::valueMax);
         write(0, info, strlen(info));
     }
@@ -1348 +1339 @@
 static int
 VolumeDataStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     bool state;
@@ -1380 +1371 @@
 static int
 VolumeDataOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
+             Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1394 +1385 @@
 static int
 VolumeOutlineColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                     Tcl_Obj *CONST *objv)
+                     Tcl_Obj *const *objv)
 {
     float rgb[3];
     if (GetColor(interp, objc - 3, objv + 3, rgb) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 6, objv + 6, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_outline_color(rgb);
+        (*iter)->set_outline_color(rgb);
     }
     return TCL_OK;
@@ -1413 +1404 @@
 static int
 VolumeOutlineStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                     Tcl_Obj *CONST *objv)
+                     Tcl_Obj *const *objv)
 {
     bool state;
     if (GetBooleanFromObj(interp, objv[3], &state) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (state) {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->enable_outline();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->enable_outline();
+        }
     } else {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->disable_outline();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->disable_outline();
+        }
     }
     return TCL_OK;
@@ -1447 +1438 @@
 static int
 VolumeOutlineOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1461 +1452 @@
 static int
 VolumeShadingDiffuseOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     float diffuse;
     if (GetFloatFromObj(interp, objv[3], &diffuse) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
 
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->set_diffuse(diffuse);
+        (*iter)->set_diffuse(diffuse);
     }
     return TCL_OK;
@@ -1481 +1472 @@
 static int
 VolumeShadingIsosurfaceOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                          Tcl_Obj *CONST *objv)
+                          Tcl_Obj *const *objv)
 {
     bool iso_surface;
     if (GetBooleanFromObj(interp, objv[3], &iso_surface) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_isosurface(iso_surface);
+        (*iter)->set_isosurface(iso_surface);
     }
     return TCL_OK;
@@ -1500 +1491 @@
 static int
 VolumeShadingOpacityOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
 
     float opacity;
     if (GetFloatFromObj(interp, objv[3], &opacity) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     printf("set opacity %f\n", opacity);
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_opacity_scale(opacity);
+        (*iter)->set_opacity_scale(opacity);
     }
     return TCL_OK;
@@ -1521 +1512 @@
 static int
 VolumeShadingSpecularOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                        Tcl_Obj *CONST *objv)
+                        Tcl_Obj *const *objv)
 {
     float specular;
     if (GetFloatFromObj(interp, objv[3], &specular) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_specular(specular);
+        (*iter)->set_specular(specular);
     }
     return TCL_OK;
@@ -1540 +1531 @@
 static int
 VolumeShadingTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                         Tcl_Obj *CONST *objv)
+                         Tcl_Obj *const *objv)
 {
     TransferFunction *tf;
-    char *name = Tcl_GetString(objv[3]);
+    const char *name = Tcl_GetString(objv[3]);
     tf = NanoVis::get_transfunc(name);
     if (tf == NULL) {
-        Tcl_AppendResult(interp, "transfer function \"", name,
-                         "\" is not defined", (char*)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "transfer function \"", name,
+                         "\" is not defined", (char*)NULL);
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        NanoVis::vol_renderer->shade_volume(*iter, tf);
+        NanoVis::vol_renderer->shade_volume(*iter, tf);
 #ifdef POINTSET
-        // TBD..
-        // POINTSET
-        if ((*iter)->pointsetIndex != -1) {
-            g_pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
-        }
+        // TBD..
+        // POINTSET
+        if ((*iter)->pointsetIndex != -1) {
+            g_pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
+        }
 #endif /*POINTSET*/
     }
@@ -1579 +1570 @@
 static int
 VolumeShadingOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps, 
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1593 +1584 @@
 static int
 VolumeAxisOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
-{
-    char *string = Tcl_GetString(objv[2]);
+             Tcl_Obj *const *objv)
+{
+    const char *string = Tcl_GetString(objv[2]);
     char c;
     c = string[0];
     if ((c == 'l') && (strcmp(string, "label") == 0)) {
-        int axis;
-        if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        vector<Volume *> ivol;
-        if (GetVolumes(interp, objc - 5, objv + 5, &ivol) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        vector<Volume *>::iterator iter;
-        char *label;
-        label = Tcl_GetString(objv[4]);
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->set_label(axis, label);
-        }
+        int axis;
+        if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        vector<Volume *> ivol;
+        if (GetVolumes(interp, objc - 5, objv + 5, &ivol) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        vector<Volume *>::iterator iter;
+        const char *label;
+        label = Tcl_GetString(objv[4]);
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->set_label(axis, label);
+        }
     } else {
-        Tcl_AppendResult(interp, "bad option \"", string, 
-                         "\": should be label", (char*)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad option \"", string, 
+                         "\": should be label", (char*)NULL);
+        return TCL_ERROR;
     }
     return TCL_OK;
@@ -1623 +1614 @@
 static int
 VolumeStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *CONST *objv)
+              Tcl_Obj *const *objv)
 {
     bool state;
     if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 3, objv + 3, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (state) {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->enable();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->enable();
+        }
     } else {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->disable();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->disable();
+        }
     }
     return TCL_OK;
@@ -1649 +1640 @@
 static int
 VolumeTestOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
+             Tcl_Obj *const *objv)
 {
     NanoVis::volume[1]->disable_data();
@@ -1684 +1675 @@
  */
 static int
-VolumeCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+VolumeCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps, 
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1697 +1688 @@
 
 static int
-FlowCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+FlowCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Rappture::Outcome err;
@@ -1703 +1694 @@
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " option ?arg arg?", (char *)NULL);
-        return TCL_ERROR;
-    }
-    char *string = Tcl_GetString(objv[1]);
+                Tcl_GetString(objv[0]), " option ?arg arg?", (char *)NULL);
+        return TCL_ERROR;
+    }
+    const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
     if ((c == 'v') && (strcmp(string, "vectorid") == 0)) {
         if (objc != 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " vectorid volume", (char *)NULL);
+                Tcl_GetString(objv[0]), " vectorid volume", (char *)NULL);
             return TCL_ERROR;
         }
@@ -1720 +1711 @@
         if (NanoVis::particleRenderer != NULL) {
             NanoVis::particleRenderer->setVectorField(volPtr->id, 1.0f, 
-                volPtr->height / (float)volPtr->width,
-                volPtr->depth  / (float)volPtr->width,
-                volPtr->wAxis.Max());
+                volPtr->height / (float)volPtr->width,
+                volPtr->depth  / (float)volPtr->width,
+                volPtr->wAxis.Max());
             NanoVis::initParticle();
         }
         if (NanoVis::licRenderer != NULL) {
             NanoVis::licRenderer->setVectorField(volPtr->id,
-                1.0f / volPtr->aspect_ratio_width,
-                1.0f / volPtr->aspect_ratio_height,
-                1.0f / volPtr->aspect_ratio_depth,
-                volPtr->wAxis.Max());
+                1.0f / volPtr->aspect_ratio_width,
+                1.0f / volPtr->aspect_ratio_height,
+                1.0f / volPtr->aspect_ratio_depth,
+                volPtr->wAxis.Max());
             NanoVis::licRenderer->set_offset(NanoVis::lic_slice_z);
         }
@@ -1736 +1727 @@
         if (objc != 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " lic on|off\"", (char*)NULL);
+                             Tcl_GetString(objv[0]), " lic on|off\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1747 +1738 @@
         if (objc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " particle visible|slice|slicepos arg \"",
-                (char*)NULL);
+                Tcl_GetString(objv[0]), " particle visible|slice|slicepos arg \"",
+                (char*)NULL);
             return TCL_ERROR;
         }
-        char *string = Tcl_GetString(objv[2]);
+        const char *string = Tcl_GetString(objv[2]);
         c = string[0];
         if ((c == 'v') && (strcmp(string, "visible") == 0)) {
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " particle visible on|off\"", 
-                                 (char*)NULL);
+                                 Tcl_GetString(objv[0]), " particle visible on|off\"", 
+                                 (char*)NULL);
                 return TCL_ERROR;
             }
@@ -1768 +1759 @@
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]),
-                                 " particle slice volume\"", (char*)NULL);
+                                 Tcl_GetString(objv[0]),
+                                 " particle slice volume\"", (char*)NULL);
                 return TCL_ERROR;
             }
@@ -1780 +1771 @@
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " particle slicepos value\"", 
-                                 (char*)NULL);
+                                 Tcl_GetString(objv[0]), " particle slicepos value\"", 
+                                 (char*)NULL);
                 return TCL_ERROR;
             }
@@ -1805 +1796 @@
             }
         } else {
-            Tcl_AppendResult(interp, "unknown option \"",string,"\": should be \"",
-                             Tcl_GetString(objv[0]), " visible, slice, or slicepos\"",
-                             (char *)NULL);
+            Tcl_AppendResult(interp, "unknown option \"", string,
+                "\": should be \"", Tcl_GetString(objv[0]), 
+                " visible, slice, or slicepos\"", (char *)NULL);
             return TCL_ERROR;
         }
@@ -1815 +1806 @@
         if (objc > 4 || objc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " capture numframes [directory]\"", 
-                             (char*)NULL);
+                             Tcl_GetString(objv[0]), " capture numframes [directory]\"", 
+                             (char*)NULL);
             return TCL_ERROR;
         }
@@ -1833 +1824 @@
         //
         Trace("FLOW started\n");
-        char *fileName;
+        const char *fileName;
         fileName = (objc < 4) ? NULL : Tcl_GetString(objv[3]);
         for (int frame_count = 0; frame_count < total_frame_count; 
@@ -1869 +1860 @@
         if (objc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " data follows ?args?", (char *)NULL);
+                Tcl_GetString(objv[0]), " data follows ?args?", (char *)NULL);
             return TCL_ERROR;
         }
-        char *string = Tcl_GetString(objv[2]);;
+        const char *string = Tcl_GetString(objv[2]);;
         c = string[0];
         if ((c == 'f') && (strcmp(string,"follows") == 0)) {
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " data follows length", 
-                                 (char *)NULL);
+                    Tcl_GetString(objv[0]), " data follows length", 
+                    (char *)NULL);
                 return TCL_ERROR;
             }
@@ -1910 +1901 @@
 
                 NanoVis::vol_renderer->add_volume(volPtr, 
-                        NanoVis::get_transfunc("default"));
+                        NanoVis::get_transfunc("default"));
             }
         }
@@ -1922 +1913 @@
 static int
 HeightMapDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     Rappture::Buffer buf;
@@ -1945 +1936 @@
 static int
 HeightMapDataVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     bool visible;
@@ -1957 +1948 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setVisible(visible);
+        (*iter)->setVisible(visible);
     }
     return TCL_OK;
@@ -1970 +1961 @@
 static int 
 HeightMapDataOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1985 +1976 @@
 static int
 HeightMapLineContourColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                            Tcl_Obj *CONST *objv)
+                            Tcl_Obj *const *objv)
 {
     float rgb[3];
@@ -1997 +1988 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setLineContourColor(rgb);
+        (*iter)->setLineContourColor(rgb);
     }
     return TCL_OK;
@@ -2004 +1995 @@
 static int
 HeightMapLineContourVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                              Tcl_Obj *CONST *objv)
+                              Tcl_Obj *const *objv)
 {
     bool visible;
@@ -2016 +2007 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setLineContourVisible(visible);
+        (*iter)->setLineContourVisible(visible);
     }
     return TCL_OK;
@@ -2029 +2020 @@
 static int 
 HeightMapLineContourOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps, 
-        heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2043 +2034 @@
 static int
 HeightMapCullOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     graphics::RenderContext::CullMode mode;
@@ -2055 +2046 @@
 static int
 HeightMapCreateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     HeightMap *hmPtr;
@@ -2071 +2062 @@
 static int
 HeightMapLegendOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     HeightMap *hmPtr;
@@ -2081 +2072 @@
     if (tf == NULL) {
         Tcl_AppendResult(interp, "no transfer function defined for heightmap \"", 
-                         Tcl_GetString(objv[2]), "\"", (char*)NULL);
+                         Tcl_GetString(objv[2]), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2090 +2081 @@
     }
     if (HeightMap::update_pending) {
-        NanoVis::SetHeightmapRanges();
+        NanoVis::SetHeightmapRanges();
     }
     NanoVis::render_legend(tf, HeightMap::valueMin, HeightMap::valueMax, w, h, 
-        "label");
+        "label");
     return TCL_OK;
 }
@@ -2099 +2090 @@
 static int
 HeightMapPolygonOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                   Tcl_Obj *CONST *objv)
+                   Tcl_Obj *const *objv)
 {
     graphics::RenderContext::PolygonMode mode;
@@ -2111 +2102 @@
 static int
 HeightMapShadingOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                 Tcl_Obj *CONST *objv)
+                 Tcl_Obj *const *objv)
 {
     graphics::RenderContext::ShadingModel model;
@@ -2123 +2114 @@
 static int
 HeightMapTestOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     srand((unsigned)time(NULL));
@@ -2155 +2146 @@
 static int
 HeightMapTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                     Tcl_Obj *CONST *objv)
-{
-    char *name;
+                     Tcl_Obj *const *objv)
+{
+    const char *name;
     name = Tcl_GetString(objv[2]);
     TransferFunction *tf;
@@ -2172 +2163 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setColorMap(tf);
+        (*iter)->setColorMap(tf);
     }
     return TCL_OK;
@@ -2192 +2183 @@
 
 static int 
-HeightMapCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+HeightMapCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 { 
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2206 +2197 @@
 static int
 GridAxisColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     float r, g, b, a;
@@ -2226 +2217 @@
 static int
 GridAxisNameOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *CONST *objv)
-{
-    int axisId;
-    if (GetAxisFromObj(interp, objv[2], &axisId) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (NanoVis::grid) {
-#ifdef notdef
-        NanoVis::grid->setAxisName(axisId, Tcl_GetString(objv[3]));
-#endif
+               Tcl_Obj *const *objv)
+{
+    int axis;
+    if (GetAxisFromObj(interp, objv[2], &axis) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (NanoVis::grid != NULL) {
+        Axis *axisPtr;
+
+        switch (axis) {
+        case 0: axisPtr = &NanoVis::grid->xAxis; break;
+        case 1: axisPtr = &NanoVis::grid->yAxis; break;
+        case 2: axisPtr = &NanoVis::grid->zAxis; break;
+        }
+        axisPtr->SetName(Tcl_GetString(objv[3]));
+        axisPtr->SetUnits(Tcl_GetString(objv[4]));
     }
     return TCL_OK;
@@ -2242 +2239 @@
 static int
 GridLineColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     float r, g, b, a;
@@ -2261 +2258 @@
 
 static int
-GridVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+GridVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     bool visible;
@@ -2273 +2270 @@
 static Rappture::CmdSpec gridOps[] = {
     {"axiscolor",  5, GridAxisColorOp,  5, 6, "r g b ?a?",},
-    {"axisname",   5, GridAxisNameOp,   5, 5, "index width height",},
+    {"axisname",   5, GridAxisNameOp,   5, 5, "index title units",},
     {"linecolor",  7, GridLineColorOp,  5, 6, "r g b ?a?",},
     {"visible",    1, GridVisibleOp,    3, 3, "bool",},
@@ -2280 +2277 @@
 
 static int 
-GridCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+GridCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 { 
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2293 +2290 @@
 
 static int 
-AxisCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+AxisCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-    char *string = Tcl_GetString(objv[1]);
+                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+    const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
     if ((c == 'v') && (strcmp(string, "visible") == 0)) {
@@ -2319 +2316 @@
 #if PLANE_CMD
 static int 
-PlaneNewOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+PlaneNewOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     fprintf(stderr, "load plane for 2D visualization command\n");
@@ -2325 +2322 @@
     if (objc != 4) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " plane_index w h \"", (char*)NULL);
+            Tcl_GetString(objv[0]), " plane_index w h \"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2338 +2335 @@
     }
     
-    //Now read w*h*4 bytes. The server expects the plane to be a stream of floats 
+    //Now read w*h*4 bytes. The server expects the plane to be a stream of
+    //floats
     char* tmp = new char[int(w*h*sizeof(float))];
     if (tmp == NULL) {
@@ -2358 +2356 @@
 static int 
 PlaneLinkOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-            Tcl_Obj *CONST *objv)
+            Tcl_Obj *const *objv)
 {
     fprintf(stderr, "link the plane to the 2D renderer command\n");
@@ -2366 +2364 @@
     if (objc != 3) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " plane_index tf_index \"", (char*)NULL);
+            Tcl_GetString(objv[0]), " plane_index tf_index \"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2383 +2381 @@
 static int 
 PlaneEnableOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *CONST *objv)
+              Tcl_Obj *const *objv)
 {
     fprintf(stderr,"enable a plane so the 2D renderer can render it command\n");
@@ -2389 +2387 @@
     if (objc != 3) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " plane_index mode \"", (char*)NULL);
+            Tcl_GetString(objv[0]), " plane_index mode \"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2415 +2413 @@
 
 static int 
-PlaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+PlaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 { 
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nPlaneOps, planeOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2441 +2439 @@
  */
 static int
-UniRect2dCmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+UniRect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
 {    
     int xNum, yNum, zNum;
@@ -2449 +2448 @@
     if ((objc & 0x01) == 0) {
         Tcl_AppendResult(interp, Tcl_GetString(objv[0]), ": ", 
-                         "wrong number of arguments: should be key-value pairs", 
-                         (char *)NULL);
+                "wrong number of arguments: should be key-value pairs", 
+                (char *)NULL);
         return TCL_ERROR;
     }
@@ -2458 +2457 @@
     int i;
     for (i = 1; i < objc; i += 2) {
-        char *string;
+        const char *string;
 
         string = Tcl_GetString(objv[i]);
@@ -2510 +2509 @@
         } else {
             Tcl_AppendResult(interp, "unknown key \"", string, 
-                             "\": should be xmin, xmax, xnum, ymin, ymax, ynum, or zvalues",
-                             (char *)NULL);
+                "\": should be xmin, xmax, xnum, ymin, ymax, ynum, or zvalues",
+                (char *)NULL);
             return TCL_ERROR;
         }
@@ -2521 +2520 @@
     if (zNum != (xNum * yNum)) {
         Tcl_AppendResult(interp, "wrong number of z values must be xnum*ynum",
-                         (char *)NULL);
+                (char *)NULL);
         return TCL_ERROR;
     }
@@ -2559 +2558 @@
     Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
     Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "screenshot",  ScreenShotCmd,  NULL, NULL);
+    Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    NULL, NULL);
     Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   NULL, NULL);
     Tcl_CreateObjCommand(interp, "unirect2d",   UniRect2dCmd,   NULL, NULL);
@@ -2632 +2631 @@
     if (status != TCL_OK) {
         std::ostringstream errmsg;
-        errmsg << "ERROR: " << Tcl_GetStringResult(interp) << std::endl;
+        errmsg << "NanoVis Server Error: " << Tcl_GetStringResult(interp) << std::endl;
         write(0, errmsg.str().c_str(), errmsg.str().size());
         return;
@@ -2677 +2676 @@
     write(0, rle, rle_size);    //unsigned byte
 #else
-    NanoVis::bmp_write("nv>image -bytes");
+    NanoVis::ppm_write("nv>image -bytes");
 #endif
 }

trunk/packages/vizservers/nanovis/HeightMap.cpp

@@ -20 +20 @@
 double HeightMap::valueMax = 1.0;
 
-#define TOPCONTOUR
+#define TOPCONTOUR      0
 HeightMap::HeightMap() : 
     _vertexBufferObjectID(0), 
@@ -150 +150 @@
         }
 
-#ifdef TOPCONTOUR
+#if TOPCONTOUR
         if (_topContourVisible) {
             glDisable(GL_BLEND);
@@ -303 +303 @@
     _contour = lineFilter.create(0.0f, 1.0f, 10, heights, xCount, yCount);
 
-#ifdef TOPCONTOUR
+#if TOPCONTOUR
     ContourLineFilter topLineFilter;
     topLineFilter.setHeightTop(true);
@@ -379 +379 @@
     _contour = lineFilter.create(0.0f, 1.0f, 10, heightMap, xCount, yCount);
     
-#ifdef TOPCONTOUR
+#if TOPCONTOUR
     ContourLineFilter topLineFilter;
     topLineFilter.setHeightTop(true);

trunk/packages/vizservers/nanovis/Makefile.in

@@ -128 +128 @@
                 TransferFunction.o \
                 Util.o \
-                Vector3.o \
-                Vector4.o \
                 Volume.o \
                 VolumeInterpolator.o \
@@ -267 +265 @@
 PlaneRenderer.o: PlaneRenderer.cpp PlaneRenderer.h
 Mat4x4.o: Mat4x4.cpp Mat4x4.h
-Vector4.o: Vector4.cpp Vector4.h
-Vector3.o: Vector3.cpp Vector3.h
 Plane.o: Plane.cpp Plane.h
 ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h

trunk/packages/vizservers/nanovis/Mat4x4.cpp

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -18 +19 @@
 #include <assert.h>
 
-Mat4x4::Mat4x4(){}
-
-Mat4x4::Mat4x4(float *vals){
-        int i;
-        for (i=0;i<16;i++)
-                m[i] = vals[i];
+Mat4x4::Mat4x4(float *vals) {
+    int i;
+    for (i=0;i<16;i++)
+        m[i] = vals[i];
 }
 
-Mat4x4::~Mat4x4(){}
-
-void Mat4x4::print(){
-        fprintf(stderr, "\n%f %f %f %f\n", m[0], m[1], m[2], m[3]);
-        fprintf(stderr, "%f %f %f %f\n", m[4], m[5], m[6], m[7]);
-        fprintf(stderr, "%f %f %f %f\n", m[8], m[9], m[10], m[11]);
-        fprintf(stderr, "%f %f %f %f\n\n", m[12], m[13], m[14], m[15]);
+void 
+Mat4x4::print(){
+    fprintf(stderr, "\n%f %f %f %f\n", m[0], m[1], m[2], m[3]);
+    fprintf(stderr, "%f %f %f %f\n", m[4], m[5], m[6], m[7]);
+    fprintf(stderr, "%f %f %f %f\n", m[8], m[9], m[10], m[11]);
+    fprintf(stderr, "%f %f %f %f\n\n", m[12], m[13], m[14], m[15]);
 }
 
-Mat4x4 Mat4x4::inverse(){
-        Mat4x4 p;
-
+Mat4x4 
+Mat4x4::inverse(){
+    Mat4x4 p;
+        
     float m00 = m[0], m01 = m[4], m02 = m[8], m03 = m[12];
     float m10 = m[1], m11 = m[5], m12 = m[9], m13 = m[13];
@@ -105 +104 @@
     p.m[15]= cof33 * inv0;      
         
-        return p;
-        /*
-        Mat4x4 ret;
-        int i, j;
-        double dst[4][4];
-        double tmp[12];
-
-        // calculate pairs for first 8 mements (cofactors)
-        tmp[0] = m[10] * m[15];
-        tmp[1] = m[11] * m[14];
-        tmp[2] = m[9] * m[15];
-        tmp[3] = m[11] * m[13];
-        tmp[4] = m[9] * m[14];
-        tmp[5] = m[10] * m[13];
-        tmp[6] = m[8] * m[15];
-        tmp[7] = m[11] * m[12];
-        tmp[8] = m[8] * m[14];
-        tmp[9] = m[10] * m[12];
-        tmp[10] = m[8] * m[13];
-        tmp[11] = m[9] * m[12];
-
-        // calculate first 8 mements (cofactors) 
-        dst[0][0] = tmp[0]*m[5] + tmp[3]*m[6] + tmp[4]*m[7];
-        dst[0][0] -= tmp[1]*m[5] + tmp[2]*m[6] + tmp[5]*m[7];
-        dst[0][1] = tmp[1]*m[4] + tmp[6]*m[6] + tmp[9]*m[7];
-        dst[0][1]-= tmp[0]*m[4] + tmp[7]*m[6] + tmp[8]*m[7];
-        dst[0][2] = tmp[2]*m[4] + tmp[7]*m[5] + tmp[10]*m[7];
-        dst[0][2] -= tmp[3]*m[4] + tmp[6]*m[5] + tmp[11]*m[7];
-        dst[0][3] = tmp[5]*m[4] + tmp[8]*m[5] + tmp[11]*m[6];
-        dst[0][3] -= tmp[4]*m[4] + tmp[9]*m[5] + tmp[10]*m[6];
-        dst[1][0] = tmp[1]*m[1] + tmp[2]*m[2] + tmp[5]*m[3];
-        dst[1][0] -= tmp[0]*m[1] + tmp[3]*m[2] + tmp[4]*m[3];
-        dst[1][1] = tmp[0]*m[0] + tmp[7]*m[2] + tmp[8]*m[3];
-        dst[1][1] -= tmp[1]*m[0] + tmp[6]*m[2] + tmp[9]*m[3];
-        dst[1][2] = tmp[3]*m[0] + tmp[6]*m[1] + tmp[11]*m[3];
-        dst[1][2] -= tmp[2]*m[0] + tmp[7]*m[1] + tmp[10]*m[3];
-        dst[1][3] = tmp[4]*m[0] + tmp[9]*m[1] + tmp[10]*m[2];
-        dst[1][3] -= tmp[5]*m[0] + tmp[8]*m[1] + tmp[11]*m[2];
-
-        // calculate pairs for second 8 mements (cofactors)
-        tmp[0] = m[2]*m[7];
-        tmp[1] = m[3]*m[6];
-        tmp[2] = m[1]*m[7];
-        tmp[3] = m[3]*m[5];
-        tmp[4] = m[1]*m[6];
-        tmp[5] = m[2]*m[5];
-        tmp[6] = m[0]*m[7];
-        tmp[7] = m[3]*m[4];
-        tmp[8] = m[0]*m[6];
-        tmp[9] = m[2]*m[4];
-        tmp[10] = m[0]*m[5];
-        tmp[11] = m[1]*m[4];
-
-        // calculate second 8 mements (cofactors)
-        dst[2][0] = tmp[0]*m[13] + tmp[3]*m[14] + tmp[4]*m[15];
-        dst[2][0] -= tmp[1]*m[13] + tmp[2]*m[14] + tmp[5]*m[15];
-        dst[2][1] = tmp[1]*m[12] + tmp[6]*m[14] + tmp[9]*m[15];
-        dst[2][1] -= tmp[0]*m[12] + tmp[7]*m[14] + tmp[8]*m[15];
-        dst[2][2] = tmp[2]*m[12] + tmp[7]*m[13] + tmp[10]*m[15];
-        dst[2][2]-= tmp[3]*m[12] + tmp[6]*m[13] + tmp[11]*m[15];
-        dst[2][3] = tmp[5]*m[12] + tmp[8]*m[13] + tmp[11]*m[14];
-        dst[2][3]-= tmp[4]*m[12] + tmp[9]*m[13] + tmp[10]*m[14];
-        dst[3][0] = tmp[2]*m[10] + tmp[5]*m[11] + tmp[1]*m[9];
-        dst[3][0]-= tmp[4]*m[11] + tmp[0]*m[9] + tmp[3]*m[10];
-        dst[3][1] = tmp[8]*m[11] + tmp[0]*m[8] + tmp[7]*m[10];
-        dst[3][1]-= tmp[6]*m[10] + tmp[9]*m[11] + tmp[1]*m[8];
-        dst[3][2] = tmp[6]*m[9] + tmp[11]*m[11] + tmp[3]*m[8];
-        dst[3][2]-= tmp[10]*m[11] + tmp[2]*m[8] + tmp[7]*m[9];
-        dst[3][3] = tmp[10]*m[10] + tmp[4]*m[8] + tmp[9]*m[9];
-        dst[3][3]-= tmp[8]*m[9] + tmp[11]*m[10] + tmp[5]*m[8];
-
-        // calculate determinant
-        double determinant=m[0]*dst[0][0]+m[1]*dst[0][1]+m[2]*dst[0][2]+m[3]*dst[0][3];
-
-        assert(fabs(determinant) != 0.0);
-
-        // calculate matrix inverse
-        determinant = 1/determinant;
-        for(i = 0; i < 4; i++){
-                for (j = 0; j < 4; j++){
-                        dst[i][j] *= determinant;
-                        ret.m[i*4+j] = dst[i][j];
-                }
-        }
-
-        return ret;
-        */
+    return p;
 }
 
-Vector4 Mat4x4::multiply_row_vector(Vector4 v){
-        Vector4 ret;
-    ret.x = m[0]*v.x + m[1]*v.y + m[2]*v.z + m[3]*v.w;
-    ret.y = m[4]*v.x + m[5]*v.y + m[6]*v.z + m[7]*v.w;
-    ret.z = m[8]*v.x + m[9]*v.y + m[10]*v.z + m[11]*v.w;
-        ret.w = m[12]*v.x + m[13]*v.y + m[14]*v.z + m[15]*v.w;
-        return ret;
+Vector4 
+Mat4x4::multiply_row_vector(Vector4 v){
+    Vector4 ret;
+    ret.x = (m[0]  * v.x) + (m[1]  * v.y) + (m[2]  * v.z) + (m[3]  * v.w);
+    ret.y = (m[4]  * v.x) + (m[5]  * v.y) + (m[6]  * v.z) + (m[7]  * v.w);
+    ret.z = (m[8]  * v.x) + (m[9]  * v.y) + (m[10] * v.z) + (m[11] * v.w);
+    ret.w = (m[12] * v.x) + (m[13] * v.y) + (m[14] * v.z) + (m[15] * v.w);
+    return ret;
 }
 
-Vector4 Mat4x4::transform(Vector4 vector){
-        Vector4 ret;
-        ret.x = vector.x*m[0]+vector.y*m[4]+vector.z*m[8]+vector.w*m[12];
-        ret.y = vector.x*m[1]+vector.y*m[5]+vector.z*m[9]+vector.w*m[13];
-        ret.z = vector.x*m[2]+vector.y*m[6]+vector.z*m[10]+vector.w*m[14];
-        ret.w = vector.x*m[3]+vector.y*m[7]+vector.z*m[11]+vector.w*m[15];
-
-        return ret;
+Vector4 
+Mat4x4::transform(Vector4 v){
+    Vector4 ret;
+    ret.x = v.x*m[0]+v.y*m[4]+v.z*m[8]+v.w*m[12];
+    ret.y = v.x*m[1]+v.y*m[5]+v.z*m[9]+v.w*m[13];
+    ret.z = v.x*m[2]+v.y*m[6]+v.z*m[10]+v.w*m[14];
+    ret.w = v.x*m[3]+v.y*m[7]+v.z*m[11]+v.w*m[15];
+    return ret;
 }
 
-Mat4x4 Mat4x4::operator *(Mat4x4 mat){
-        Mat4x4 ret;
-        
-        ret.m[0] = m[0]*mat.m[0]+m[1]*mat.m[4]+m[2]*mat.m[8]+m[3]*mat.m[12];
-        ret.m[1] = m[0]*mat.m[1]+m[1]*mat.m[5]+m[2]*mat.m[9]+m[3]*mat.m[13];
-        ret.m[2] = m[0]*mat.m[2]+m[1]*mat.m[6]+m[2]*mat.m[10]+m[3]*mat.m[14];
-        ret.m[3] = m[0]*mat.m[3]+m[1]*mat.m[7]+m[2]*mat.m[11]+m[3]*mat.m[15];
-
-        ret.m[4] = m[4]*mat.m[0]+m[5]*mat.m[4]+m[6]*mat.m[8]+m[7]*mat.m[12];
-        ret.m[5] = m[4]*mat.m[1]+m[5]*mat.m[5]+m[6]*mat.m[9]+m[7]*mat.m[13];
-        ret.m[6] = m[4]*mat.m[2]+m[5]*mat.m[6]+m[6]*mat.m[10]+m[7]*mat.m[14];
-        ret.m[7] = m[4]*mat.m[3]+m[5]*mat.m[7]+m[6]*mat.m[11]+m[7]*mat.m[15];
-
-        ret.m[8] = m[8]*mat.m[0]+m[9]*mat.m[4]+m[10]*mat.m[8]+m[11]*mat.m[12];
-        ret.m[9] = m[8]*mat.m[1]+m[9]*mat.m[5]+m[10]*mat.m[9]+m[11]*mat.m[13];
-        ret.m[10] = m[8]*mat.m[2]+m[9]*mat.m[6]+m[10]*mat.m[10]+m[11]*mat.m[14];
-        ret.m[11] = m[8]*mat.m[3]+m[9]*mat.m[7]+m[10]*mat.m[11]+m[11]*mat.m[15];
-
-        ret.m[12] = m[12]*mat.m[0]+m[13]*mat.m[4]+m[14]*mat.m[8]+m[15]*mat.m[12];
-        ret.m[13] = m[12]*mat.m[1]+m[13]*mat.m[5]+m[14]*mat.m[9]+m[15]*mat.m[13];
-        ret.m[14] = m[12]*mat.m[2]+m[13]*mat.m[6]+m[14]*mat.m[10]+m[15]*mat.m[14];
-        ret.m[15] = m[12]*mat.m[3]+m[13]*mat.m[7]+m[14]*mat.m[11]+m[15]*mat.m[15];
-
-        return ret;
+Mat4x4 
+Mat4x4::operator *(Mat4x4 mat){
+    Mat4x4 ret;
+    
+    ret.m[0] = m[0]*mat.m[0]+m[1]*mat.m[4]+m[2]*mat.m[8]+m[3]*mat.m[12];
+    ret.m[1] = m[0]*mat.m[1]+m[1]*mat.m[5]+m[2]*mat.m[9]+m[3]*mat.m[13];
+    ret.m[2] = m[0]*mat.m[2]+m[1]*mat.m[6]+m[2]*mat.m[10]+m[3]*mat.m[14];
+    ret.m[3] = m[0]*mat.m[3]+m[1]*mat.m[7]+m[2]*mat.m[11]+m[3]*mat.m[15];
+    
+    ret.m[4] = m[4]*mat.m[0]+m[5]*mat.m[4]+m[6]*mat.m[8]+m[7]*mat.m[12];
+    ret.m[5] = m[4]*mat.m[1]+m[5]*mat.m[5]+m[6]*mat.m[9]+m[7]*mat.m[13];
+    ret.m[6] = m[4]*mat.m[2]+m[5]*mat.m[6]+m[6]*mat.m[10]+m[7]*mat.m[14];
+    ret.m[7] = m[4]*mat.m[3]+m[5]*mat.m[7]+m[6]*mat.m[11]+m[7]*mat.m[15];
+    
+    ret.m[8] = m[8]*mat.m[0]+m[9]*mat.m[4]+m[10]*mat.m[8]+m[11]*mat.m[12];
+    ret.m[9] = m[8]*mat.m[1]+m[9]*mat.m[5]+m[10]*mat.m[9]+m[11]*mat.m[13];
+    ret.m[10] = m[8]*mat.m[2]+m[9]*mat.m[6]+m[10]*mat.m[10]+m[11]*mat.m[14];
+    ret.m[11] = m[8]*mat.m[3]+m[9]*mat.m[7]+m[10]*mat.m[11]+m[11]*mat.m[15];
+    
+    ret.m[12] = m[12]*mat.m[0]+m[13]*mat.m[4]+m[14]*mat.m[8]+m[15]*mat.m[12];
+    ret.m[13] = m[12]*mat.m[1]+m[13]*mat.m[5]+m[14]*mat.m[9]+m[15]*mat.m[13];
+    ret.m[14] = m[12]*mat.m[2]+m[13]*mat.m[6]+m[14]*mat.m[10]+m[15]*mat.m[14];
+    ret.m[15] = m[12]*mat.m[3]+m[13]*mat.m[7]+m[14]*mat.m[11]+m[15]*mat.m[15];
+    
+    return ret;
 }
 
-Mat4x4 Mat4x4::transpose(){
-        Mat4x4 ret;
-        for(int i=0; i<4; i++){
-                for(int j=0; j<4; j++){
-                        ret.m[j+4*i] = this->m[i+4*j];
-                }
+Mat4x4 
+Mat4x4::transpose(){
+    Mat4x4 ret;
+    for(int i=0; i<4; i++){
+        for(int j=0; j<4; j++){
+            ret.m[j+4*i] = this->m[i+4*j];
         }
-        return ret;
+    }
+    return ret;
 }
 

trunk/packages/vizservers/nanovis/Mat4x4.h

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -20 +21 @@
 class Mat4x4  
 {
-        
+        
 public:
-        float m[16];    //row by row
-        Mat4x4();
-        Mat4x4(float *vals);
-        ~Mat4x4();
+    float m[16];        //row by row
+    Mat4x4() {
+        /*empty*/
+    };
+    Mat4x4(float *vals);
 
-        void print();
-        Mat4x4 inverse();
-        Mat4x4 transpose();
-        Vector4 multiply_row_vector(Vector4 v);
-        Vector4 transform(Vector4 v);
-        Mat4x4 operator*(Mat4x4 op);
+    void print(void);
+    Mat4x4 inverse(void);
+    Mat4x4 transpose(void);
+    Vector4 multiply_row_vector(Vector4 v);
+    Vector4 transform(Vector4 v);
+    Mat4x4 operator*(Mat4x4 op);
 };
 

trunk/packages/vizservers/nanovis/NvLIC.cpp

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -23 +24 @@
 #include <Trace.h>
 
-NvLIC::NvLIC(int _size, int _width, int _height, float _offset, CGcontext _context)
-    : Renderable(Vector3(0.0f,0.0f,0.0f)),
+NvLIC::NvLIC(int _size, int _width, int _height, float _offset, 
+             CGcontext _context) : 
+    Renderable(Vector3(0.0f,0.0f,0.0f)),
     disListID(0),
-        width(_width),
-        height(_height),
-        size(_size),
+    width(_width),
+    height(_height),
+    size(_size),
     scale(1.0f, 1.0f, 1.0f),
-        offset(_offset),
+    offset(_offset),
     iframe(0),
-        Npat(64),
-        alpha((int) 0.12*255),
-        tmax(NPIX/(SCALE*NPN)),
-        dmax(SCALE/NPIX),
+    Npat(64),
+    alpha((int) 0.12*255),
+    tmax(NPIX/(SCALE*NPN)),
+    dmax(SCALE/NPIX),
     max(1.0f),
-        m_g_context(_context),
+    m_g_context(_context),
     vectorFieldID((NVISid) 0),
     _activate(false)
@@ -78 +80 @@
 
     glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, 
-                  GL_TEXTURE_RECTANGLE_NV, slice_vector_tex, 0);
+                  GL_TEXTURE_RECTANGLE_NV, slice_vector_tex, 0);
 
 
@@ -149 +151 @@
     
     for (i = 0; i < 256; i++) {
-        lut[i] = i < 127 ? 0 : 255;
+        lut[i] = i < 127 ? 0 : 255;
     }
     for (i = 0; i < NPN; i++) {
-        for (j = 0; j < NPN; j++) {
-            phase[i][j] = rand() % 256; 
+        for (j = 0; j < NPN; j++) {
+            phase[i][j] = rand() >> 8; 
         }
     }
     for (k = 0; k < Npat; k++) {
-        t = k*256/Npat;
-        for (i = 0; i < NPN; i++) {
-            for (j = 0; j < NPN; j++) {
-                pat[i][j][0] =
-                    pat[i][j][1] =
-                    pat[i][j][2] = lut[(t + phase[i][j]) % 255];
-                pat[i][j][3] = alpha;
-            }
-        }
-        glNewList(disListID + k, GL_COMPILE);
-        glBindTexture(GL_TEXTURE_2D, pattern_tex);
-        glTexImage2D(GL_TEXTURE_2D, 0, 4, NPN, NPN, 0, 
-                     GL_RGBA, GL_UNSIGNED_BYTE, pat);
-        glEndList();
+        t = (k << 8) / Npat;
+        for (i = 0; i < NPN; i++) {
+            for (j = 0; j < NPN; j++) {
+                pat[i][j][0] = pat[i][j][1] = pat[i][j][2] = 
+                    lut[(t + phase[i][j]) % 255];
+                pat[i][j][3] = alpha;
+            }
+        }
+        glNewList(disListID + k, GL_COMPILE);
+        glBindTexture(GL_TEXTURE_2D, pattern_tex);
+        glTexImage2D(GL_TEXTURE_2D, 0, 4, NPN, NPN, 0, GL_RGBA, 
+                     GL_UNSIGNED_BYTE, pat);
+        glEndList();
     }
     
     glBindTexture(GL_TEXTURE_2D, pattern_tex);
     glTexImage2D(GL_TEXTURE_2D, 0, 4, NPN, NPN, 0, 
-                 GL_RGBA, GL_UNSIGNED_BYTE, pat);
+                 GL_RGBA, GL_UNSIGNED_BYTE, pat);
     Trace("finish make_patterns\n");
 }
@@ -187 +188 @@
     for(int i=0; i<NMESH; i++){
         for(int j=0; j<NMESH; j++){
-
-      float x=DM*i;
-      float y=DM*j;
-
-      float magnitude = sqrt(x*x+y*y)/1.414;
-      
-      //from green to red
-      GLubyte r = (GLubyte) floor(magnitude*255);
-      GLubyte g = 0;
-      GLubyte b = 255 - r;
-      GLubyte a = 122;
-
-      mag[i][j][0] = r;
-      mag[i][j][1] = g;
-      mag[i][j][2] = b;
-      mag[i][j][3] = a;
+            float x=DM*i;
+            float y=DM*j;
+            
+            float magnitude = sqrt(x*x+y*y)/1.414;
+            
+            //from green to red
+            GLubyte r = (GLubyte) floor(magnitude*255);
+            GLubyte g = 0;
+            GLubyte b = 255 - r;
+            GLubyte a = 122;
+            
+            mag[i][j][0] = r;
+            mag[i][j][1] = g;
+            mag[i][j][2] = b;
+            mag[i][j][3] = a;
         }
     }
@@ -213 +213 @@
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, NMESH, NMESH, 0, GL_RGBA, GL_UNSIGNED_BYTE, mag);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, NMESH, NMESH, 0, GL_RGBA, 
+                 GL_UNSIGNED_BYTE, mag);
     glBindTexture(GL_TEXTURE_2D, 0);
 }
 
-void NvLIC::get_slice()
+void 
+NvLIC::get_slice()
 {
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, vel_fbo);
@@ -242 +244 @@
 
     glBegin(GL_QUADS);
+    {
         glTexCoord3f(0., 0., offset); glVertex2f(0.,   0.);
         glTexCoord3f(1., 0., offset); glVertex2f(size, 0.);
         glTexCoord3f(1., 1., offset); glVertex2f(size, size);
         glTexCoord3f(0., 1., offset); glVertex2f(0.,   size);
+    }
     glEnd();
     
@@ -261 +265 @@
     int lim = size * size * 4;
     float* v= slice_vector;
-    for (int i = 0; i < lim; ++i)
-    {
-        if (isnan(*v)) *v = 0.0f;    
+    for (int i = 0; i < lim; ++i) {
+        if (isnan(*v)) {
+            *v = 0.0f;    
+        }
         ++v;
     }
@@ -269 +274 @@
 
 //line integral convolution
-void NvLIC::convolve()
+void 
+NvLIC::convolve()
 {
     int   i, j; 
     float x1, x2, y, px, py;
-
+    
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
-
+    
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity(); 
@@ -283 +289 @@
     //glScalef(2.0, 2.0, 1.0);
     glOrtho(0.0f, 1.0f, 0.0f, 1.0f, -10.0f, 10.0f);
-
+    
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity(); 
-
+    
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
+    
     //sa = 0.010*cos(iframe*2.0*M_PI/200.0);
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, pattern_tex);
     sa = 0.01;
-
-    for (i = 0; i < NMESH-1; i++) 
-    {
+    
+    for (i = 0; i < NMESH-1; i++) {
         x1 = DM*i; x2 = x1 + DM;
         glBegin(GL_QUAD_STRIP);
         for (j = 0; j < NMESH-1; j++) {
-          y = DM*j;
-          glTexCoord2f(x1, y); 
-          get_velocity(x1, y, &px, &py);
-          glVertex2f(px, py);
-
-          glTexCoord2f(x2, y); 
-          get_velocity(x2, y, &px, &py); 
-          glVertex2f(px, py);
+            y = DM*j;
+            glTexCoord2f(x1, y); 
+            get_velocity(x1, y, &px, &py);
+            glVertex2f(px, py);
+            
+            glTexCoord2f(x2, y); 
+            get_velocity(x2, y, &px, &py); 
+            glVertex2f(px, py);
         }
         glEnd();
-   }
-   iframe = iframe + 1;
-
-   glEnable(GL_BLEND); 
-
+    }
+    iframe = iframe + 1;
+    
+    glEnable(GL_BLEND); 
+    
     // INSOO ADD
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
+    
     glEnable(GL_TEXTURE_2D);
-   glCallList(iframe % Npat + disListID);
-   glBegin(GL_QUAD_STRIP);
-      glTexCoord2f(0.0,  0.0);  glVertex2f(0.0, 0.0);
-      glTexCoord2f(0.0,  tmax); glVertex2f(0.0, 1.0);
-      glTexCoord2f(tmax, 0.0);  glVertex2f(1.0, 0.0);
-      glTexCoord2f(tmax, tmax); glVertex2f(1.0, 1.0);
-   glEnd();
+    glCallList(iframe % Npat + disListID);
+    glBegin(GL_QUAD_STRIP);
+    {
+        glTexCoord2f(0.0,  0.0);  glVertex2f(0.0, 0.0);
+        glTexCoord2f(0.0,  tmax); glVertex2f(0.0, 1.0);
+        glTexCoord2f(tmax, 0.0);  glVertex2f(1.0, 0.0);
+        glTexCoord2f(tmax, tmax); glVertex2f(1.0, 1.0);
+        glEnd();
+    }
     glDisable(GL_TEXTURE_2D);
-
-   /*
-   //inject dye
-   glDisable(GL_TEXTURE_2D);
-   glColor4f(1.,0.8,0.,1.);
-   glBegin(GL_QUADS);
-     glVertex2d(0.6, 0.6);
-     glVertex2d(0.6, 0.62);
-     glVertex2d(0.62, 0.62);
-     glVertex2d(0.62, 0.6);
-   glEnd();
-   */
-
+    
+    /*
+    //inject dye
+    glDisable(GL_TEXTURE_2D);
+    glColor4f(1.,0.8,0.,1.);
+    glBegin(GL_QUADS);
+    glVertex2d(0.6, 0.6);
+    glVertex2d(0.6, 0.62);
+    glVertex2d(0.62, 0.62);
+    glVertex2d(0.62, 0.6);
+    glEnd();
+    */
+    
     /// INSOO ADDED
     glDisable(GL_ALPHA_TEST);
-
-   glDisable(GL_BLEND);
-   glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, NPIX, NPIX, 0);
-   
-   /*
-   //blend magnitude texture
-   glBindTexture(GL_TEXTURE_2D, mag_tex);
-   glEnable(GL_TEXTURE_2D);
-   glEnable(GL_BLEND);
-   glBegin(GL_QUADS);
-      glTexCoord2f(0.0,  0.0);  glVertex2f(0.0, 0.0);
-      glTexCoord2f(0.0,  1.0); glVertex2f(0.0, 1.);
-      glTexCoord2f(1.0, 1.0);  glVertex2f(1., 1.);
-      glTexCoord2f(1.0, 0.0); glVertex2f(1., 0.0);
-   glEnd();
-   */
-
-   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-
+    
+    glDisable(GL_BLEND);
+    glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, NPIX, NPIX, 0);
+    
+    /*
+    //blend magnitude texture
+    glBindTexture(GL_TEXTURE_2D, mag_tex);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_BLEND);
+    glBegin(GL_QUADS);
+    glTexCoord2f(0.0,  0.0);  glVertex2f(0.0, 0.0);
+    glTexCoord2f(0.0,  1.0); glVertex2f(0.0, 1.);
+    glTexCoord2f(1.0, 1.0);  glVertex2f(1., 1.);
+    glTexCoord2f(1.0, 0.0); glVertex2f(1., 0.0);
+    glEnd();
+    */
+
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     glPopAttrib();
-
     glPopMatrix();
     glMatrixMode(GL_PROJECTION);
@@ -371 +376 @@
 
 
-void NvLIC::display()
-{
-  glBindTexture(GL_TEXTURE_2D, color_tex);
-  glEnable(GL_TEXTURE_2D);
-
-  //draw line integral convolution quad
-  glEnable(GL_DEPTH_TEST);
-
-  glPushMatrix();
-
+void 
+NvLIC::display()
+{
+    glBindTexture(GL_TEXTURE_2D, color_tex);
+    glEnable(GL_TEXTURE_2D);
+    
+    //draw line integral convolution quad
+    glEnable(GL_DEPTH_TEST);
+    
+    glPushMatrix();
+    
     //glScalef(scale.x, scale.y, scale.z); 
     float w = 1.0f / scale.x;
     glScalef(1.0f, 1.0f / scale.y / w, 1.0f / scale.z / w); 
-
-  glBegin(GL_QUADS);
-    glTexCoord2f(0, 0); glVertex3f(0, 0, offset);
-    glTexCoord2f(1, 0); glVertex3f(1, 0, offset);
-    glTexCoord2f(1, 1); glVertex3f(1, 1, offset);
-    glTexCoord2f(0, 1); glVertex3f(0, 1, offset);
-  glEnd();
-
-  glPopMatrix();
-
-  glBindTexture(GL_TEXTURE_2D,0);
-
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_TEXTURE_2D);
-
-}
+    
+    glBegin(GL_QUADS);
+    {
+        glTexCoord2f(0, 0); glVertex3f(0, 0, offset);
+        glTexCoord2f(1, 0); glVertex3f(1, 0, offset);
+        glTexCoord2f(1, 1); glVertex3f(1, 1, offset);
+        glTexCoord2f(0, 1); glVertex3f(0, 1, offset);
+    }
+    glEnd();
+    
+    glPopMatrix();
+    
+    glBindTexture(GL_TEXTURE_2D,0);
+    
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_TEXTURE_2D);
+}
+
 /*
 {
@@ -433 +441 @@
 
 
-void NvLIC::setVectorField(unsigned int texID, float scaleX, float scaleY, float scaleZ, float max)
+void 
+NvLIC::setVectorField(unsigned int texID, float scaleX, float scaleY, 
+                      float scaleZ, float max)
 {
     Trace("NvLIC: vector field is assigned [%d]\n", texID);
@@ -443 +453 @@
 }
 
-void NvLIC::get_velocity(float x, float y, float *px, float *py) 
+void 
+NvLIC::get_velocity(float x, float y, float *px, float *py) 
 {
    float vx, vy, r;
@@ -456 +467 @@
 
     //Trace("(vx vx) = (%f %f), r=%f, ", vx, vy, r);
-   if (r > dmax*dmax) { 
+   if (r > (dmax*dmax)) { 
       r  = sqrt(r); 
       vx *= dmax/r; 
@@ -468 +479 @@
 }
 
-void NvLIC::set_offset(float v)
-{
-  offset = v;
-  get_slice();
-}
+void 
+NvLIC::set_offset(float v)
+{
+    offset = v;
+    get_slice();
+}

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -27 +28 @@
 
 NvParticleRenderer::NvParticleRenderer(int w, int h, CGcontext context)
-: scale(1, 1, 1), _activate(false)
-{
-  psys_width = w;
-  psys_height = h;
-
-  psys_frame = 0;
-  reborn = true;
-  flip = true;
-  max_life = 500;
-
-  data = (Particle*) malloc(w*h*sizeof(Particle));
-
-  m_vertex_array = new RenderVertexArray(psys_width*psys_height, 3, GL_FLOAT);
-
-  assert(glGetError()==0);
-
-  glGenFramebuffersEXT(2, psys_fbo);
-  glGenTextures(2, psys_tex);
-
-  glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[0]);
-
-  glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[0]);
-  glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-#ifdef NV_32
-  glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_FLOAT_RGBA32_NV, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
-#else
-  glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_RGBA, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
-#endif
-  glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_NV, psys_tex[0], 0);
-
-  glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[1]);
-
-  glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[1]);
-  glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-#ifdef NV_32
-  glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_FLOAT_RGBA32_NV, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
-#else
-  glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_RGBA, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
-#endif
-  glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_NV, psys_tex[1], 0);
-
-  glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-
-  CHECK_FRAMEBUFFER_STATUS();
-
-  //load related shaders
-  /*
-  m_g_context = context;
-
-  R2string path = R2FilePath::getInstance()->getPath("update_pos.cg");
-  m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path);
-  m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
-  m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");
-  m_pos_tex_param = cgGetNamedParameter(m_pos_fprog, "pos_tex");
-  m_scale_param = cgGetNamedParameter(m_pos_fprog, "scale");
-  cgGLSetTextureParameter(m_vel_tex_param, volume);
-  cgGLSetParameter3f(m_scale_param, scale_x, scale_y, scale_z);
-  */
-
-  _advectionShader = new NvParticleAdvectionShader();
+    : scale(1, 1, 1), _activate(false)
+{
+    psys_width = w;
+    psys_height = h;
+
+    psys_frame = 0;
+    reborn = true;
+    flip = true;
+    max_life = 500;
+
+    data = (Particle*) malloc(w*h*sizeof(Particle));
+
+    m_vertex_array = new RenderVertexArray(psys_width*psys_height, 3, GL_FLOAT);
+
+    assert(glGetError()==0);
+
+    glGenFramebuffersEXT(2, psys_fbo);
+    glGenTextures(2, psys_tex);
+
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[0]);
+
+    glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[0]);
+    glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+#ifdef NV_32
+    glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_FLOAT_RGBA32_NV, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
+#else
+    glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_RGBA, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
+#endif
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_NV, psys_tex[0], 0);
+
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[1]);
+
+    glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[1]);
+    glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+#ifdef NV_32
+    glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_FLOAT_RGBA32_NV, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
+#else
+    glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_RGBA, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, NULL);
+#endif
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_NV, psys_tex[1], 0);
+
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+    CHECK_FRAMEBUFFER_STATUS();
+
+    //load related shaders
+    /*
+      m_g_context = context;
+
+      R2string path = R2FilePath::getInstance()->getPath("update_pos.cg");
+      m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path);
+      m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
+      m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");
+      m_pos_tex_param = cgGetNamedParameter(m_pos_fprog, "pos_tex");
+      m_scale_param = cgGetNamedParameter(m_pos_fprog, "scale");
+      cgGLSetTextureParameter(m_vel_tex_param, volume);
+      cgGLSetParameter3f(m_scale_param, scale_x, scale_y, scale_z);
+    */
+
+    _advectionShader = new NvParticleAdvectionShader();
 
 }
@@ -135 +136 @@
     glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0, GL_RGBA, psys_width, psys_height, 0, GL_RGBA, GL_FLOAT, (float*)data);#
 #endif
-    glBindTexture(GL_TEXTURE_RECTANGLE_NV, 0);
+                                                                                                                       glBindTexture(GL_TEXTURE_RECTANGLE_NV, 0);
   
     flip = true;
@@ -151 +152 @@
    
     if (flip) 
-    {
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[1]);
-        glEnable(GL_TEXTURE_RECTANGLE_NV);
-        glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[0]);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        //glClear(GL_COLOR_BUFFER_BIT);
-
-        glViewport(0, 0, psys_width, psys_height);
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        //gluOrtho2D(0, psys_width, 0, psys_height);
-        glOrtho(0, psys_width, 0, psys_height, -10.0f, 10.0f);
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-
-        _advectionShader->bind(psys_tex[0]);
+        {
+            glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[1]);
+            glEnable(GL_TEXTURE_RECTANGLE_NV);
+            glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[0]);
+
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            //glClear(GL_COLOR_BUFFER_BIT);
+
+            glViewport(0, 0, psys_width, psys_height);
+            glMatrixMode(GL_PROJECTION);
+            glLoadIdentity();
+            //gluOrtho2D(0, psys_width, 0, psys_height);
+            glOrtho(0, psys_width, 0, psys_height, -10.0f, 10.0f);
+            glMatrixMode(GL_MODELVIEW);
+            glLoadIdentity();
+
+            _advectionShader->bind(psys_tex[0]);
      
-     //cgGLBindProgram(m_pos_fprog);
-     //cgGLSetParameter1f(m_pos_timestep_param, 0.05);
-     //cgGLEnableTextureParameter(m_vel_tex_param);
-     //cgGLSetTextureParameter(m_pos_tex_param, psys_tex[0]);
-     //cgGLEnableTextureParameter(m_pos_tex_param);
-     //cgGLEnableProfile(CG_PROFILE_FP30);
+            //cgGLBindProgram(m_pos_fprog);
+            //cgGLSetParameter1f(m_pos_timestep_param, 0.05);
+            //cgGLEnableTextureParameter(m_vel_tex_param);
+            //cgGLSetTextureParameter(m_pos_tex_param, psys_tex[0]);
+            //cgGLEnableTextureParameter(m_pos_tex_param);
+            //cgGLEnableProfile(CG_PROFILE_FP30);
      
-     draw_quad(psys_width, psys_height, psys_width, psys_height);
-
-     //cgGLDisableProfile(CG_PROFILE_FP30);
-     //cgGLDisableTextureParameter(m_vel_tex_param);
-     //cgGLDisableTextureParameter(m_pos_tex_param);
-        glDisable(GL_TEXTURE_RECTANGLE_NV);
-   }
-   else
-   {
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[0]);
-        glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[1]);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        //glClear(GL_COLOR_BUFFER_BIT);
-
-        glViewport(0, 0, psys_width, psys_height);
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        //gluOrtho2D(0, psys_width, 0, psys_height);
-        glOrtho(0, psys_width, 0, psys_height, -10.0f, 10.0f);
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-
-        _advectionShader->bind(psys_tex[1]);
-
-     //cgGLBindProgram(m_pos_fprog);
-     //cgGLSetParameter1f(m_pos_timestep_param, 0.05);
-     //cgGLEnableTextureParameter(m_vel_tex_param);
-     //cgGLSetTextureParameter(m_pos_tex_param, psys_tex[1]);
-     //cgGLEnableTextureParameter(m_pos_tex_param);
-     //cgGLEnableProfile(CG_PROFILE_FP30);
-
-        draw_quad(psys_width, psys_height, psys_width, psys_height);
-        //draw_quad(psys_width, psys_height, 1.0f, 1.0f);
-
-     //cgGLDisableProfile(CG_PROFILE_FP30);
-     //cgGLDisableTextureParameter(m_vel_tex_param);
-     //cgGLDisableTextureParameter(m_pos_tex_param);
-    }
+            draw_quad(psys_width, psys_height, psys_width, psys_height);
+
+            //cgGLDisableProfile(CG_PROFILE_FP30);
+            //cgGLDisableTextureParameter(m_vel_tex_param);
+            //cgGLDisableTextureParameter(m_pos_tex_param);
+            glDisable(GL_TEXTURE_RECTANGLE_NV);
+        }
+    else
+        {
+            glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[0]);
+            glBindTexture(GL_TEXTURE_RECTANGLE_NV, psys_tex[1]);
+
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            //glClear(GL_COLOR_BUFFER_BIT);
+
+            glViewport(0, 0, psys_width, psys_height);
+            glMatrixMode(GL_PROJECTION);
+            glLoadIdentity();
+            //gluOrtho2D(0, psys_width, 0, psys_height);
+            glOrtho(0, psys_width, 0, psys_height, -10.0f, 10.0f);
+            glMatrixMode(GL_MODELVIEW);
+            glLoadIdentity();
+
+            _advectionShader->bind(psys_tex[1]);
+
+            //cgGLBindProgram(m_pos_fprog);
+            //cgGLSetParameter1f(m_pos_timestep_param, 0.05);
+            //cgGLEnableTextureParameter(m_vel_tex_param);
+            //cgGLSetTextureParameter(m_pos_tex_param, psys_tex[1]);
+            //cgGLEnableTextureParameter(m_pos_tex_param);
+            //cgGLEnableProfile(CG_PROFILE_FP30);
+
+            draw_quad(psys_width, psys_height, psys_width, psys_height);
+            //draw_quad(psys_width, psys_height, 1.0f, 1.0f);
+
+            //cgGLDisableProfile(CG_PROFILE_FP30);
+            //cgGLDisableTextureParameter(m_vel_tex_param);
+            //cgGLDisableTextureParameter(m_pos_tex_param);
+        }
 
     _advectionShader->unbind();
 
-   //soft_read_verts();
+    //soft_read_verts();
    
-   update_vertex_buffer();
+    update_vertex_buffer();
 
     flip = (!flip);
@@ -226 +227 @@
     psys_frame++;
     if(psys_frame==max_life)
-    {
-        psys_frame=0;
-        reborn = true;
-    }
+        {
+            psys_frame=0;
+            reborn = true;
+        }
 
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -277 +278 @@
 {
     scale.set(scaleX, scaleY, scaleZ);
-  _advectionShader->setScale(scale);
-  _advectionShader->setVelocityVolume(texID, max);
-}
+    _advectionShader->setScale(scale);
+    _advectionShader->setVelocityVolume(texID, max);
+}

trunk/packages/vizservers/nanovis/PCASplit.cpp

@@ +1 @@
+
 #include <stdio.h>
 #include "PCASplit.h"
@@ -15 +16 @@
 namespace PCA {
 
-PCASplit::PCASplit()
-: _maxLevel(4), _minDistance(0.5f), _distanceScale(0.2f), _indexCount(0), _finalMaxLevel(0)
-{
-        _indices = new unsigned int[MAX_INDEX];
-        _memClusterChunk1 = new ClusterListNode[MAX_INDEX];
-        _memClusterChunk2 = new ClusterListNode[MAX_INDEX];
-        _curMemClusterChunk = _memClusterChunk1;
-        _memClusterChunkIndex = 0;
+PCASplit::PCASplit() : 
+    _maxLevel(4), 
+    _minDistance(0.5f), 
+    _distanceScale(0.2f), 
+    _indexCount(0), 
+    _finalMaxLevel(0)
+{
+    _indices = new unsigned int[MAX_INDEX];
+    _memClusterChunk1 = new ClusterListNode[MAX_INDEX];
+    _memClusterChunk2 = new ClusterListNode[MAX_INDEX];
+    _curMemClusterChunk = _memClusterChunk1;
+    _memClusterChunkIndex = 0;
 }
 
 PCASplit::~PCASplit()
 {
-        delete [] _indices;
-        delete [] _memClusterChunk1;
-        delete [] _memClusterChunk2;
-}
-
-void PCASplit::computeCentroid(Point* data, int count, Vector3& mean/*, float& minValue, float& maxValue*/)
-{
-        float sumx= 0, sumy = 0, sumz = 0;
-        float size = 0;
-        float sumsize = 0;
-        for (int i = 0; i < count; ++i)
-        {
-                size = data[i].size;
-                sumx += data[i].position.x * size;
-                sumy += data[i].position.y * size;
-                sumz += data[i].position.z * size;
-                sumsize += size;
-        }
-
-        sumsize = 1.0f / sumsize;
-        mean.set(sumx * sumsize, sumy * sumsize, sumz * sumsize);
-}
-
-void PCASplit::computeCovariant(Point* data, int count, const Vector3& mean, float* m)
-{
-        memset(m, 0, sizeof(float) * 9);
-
-        for (int i = 0; i < count; ++i)
-        {
-                m[0] += (data[i].position.x - mean.x) * (data[i].position.x - mean.x);
-                m[1] += (data[i].position.x - mean.x) * (data[i].position.y - mean.y);
-                m[2] += (data[i].position.x - mean.x) * (data[i].position.z - mean.z);
-                m[4] += (data[i].position.y - mean.y) * (data[i].position.y - mean.y);
-                m[5] += (data[i].position.y - mean.y) * (data[i].position.z - mean.z);
-                m[8] += (data[i].position.z - mean.z) * (data[i].position.z - mean.z);
-        }
-
-        float invCount = 1.0f / (count - 1);
-        m[0] *= invCount;
-        m[1] *= invCount;
-        m[2] *= invCount;
-        m[4] *= invCount;
-        m[5] *= invCount;
-        m[8] *= invCount;
-        m[3] = m[1];
-        m[6] = m[2];
-        m[7] = m[5];
-}
-
-void PCASplit::computeDistortion(Point* data, int count, const Vector3& mean, float& distortion, float& finalSize)
-{
-        distortion = 0.0f;
-        finalSize = 0.0f;
-        
-        float maxSize = 0.0f;
-        float distance;
-        for (int i = 0; i < count; ++i)
-        {
-                // sum 
-                distance = mean.distanceSquare(data[i].position.x, data[i].position.y, data[i].position.z);
-                distortion += distance;
-
-                if (data[i].size > maxSize)
-                {
-                        maxSize = data[i].size;
-                }
-
-                /*
-                finalSize += data[i].size * sqrt(distance);
-                */
-                if (distance > finalSize) finalSize = distance;
-        }
-
-        // equation 2
-        //finalSize = 0.5f * sqrt (finalSize) / (float) (count - 1) + maxSize;
-        finalSize = sqrt (finalSize) + maxSize;
-}
-        
-void PCASplit::init()
-{
-        _curClusterNode = 0;
-        _curClusterCount = 0;
-}
-
-Cluster* PCASplit::createClusterBlock(ClusterListNode* clusterList, int count, int level)
-{
-        static int cc = 0;
-        cc += count;
-        Cluster* clusterBlock = new Cluster[count];
-
-        _clusterHeader->numOfClusters[level - 1] = count;
-        _clusterHeader->startPointerCluster[level - 1] = clusterBlock;
-
-        printf("Cluster created %d [in level %d]:total %d\n", count, level, cc);
+    delete [] _indices;
+    delete [] _memClusterChunk1;
+    delete [] _memClusterChunk2;
+}
+
+void 
+PCASplit::computeCentroid(Point* data, int count, Vector3& mean)
+{
+    float sumx= 0, sumy = 0, sumz = 0;
+    float size = 0;
+    float sumsize = 0;
+    for (int i = 0; i < count; ++i) {
+        size = data[i].size;
+        sumx += data[i].position.x * size;
+        sumy += data[i].position.y * size;
+        sumz += data[i].position.z * size;
+        sumsize += size;
+    }
+    sumsize = 1.0f / sumsize;
+    mean.set(sumx * sumsize, sumy * sumsize, sumz * sumsize);
+}
+
+void 
+PCASplit::computeCovariant(Point* data, int count, const Vector3& mean, 
+                           float* m)
+{
+    memset(m, 0, sizeof(float) * 9);
+
+    for (int i = 0; i < count; ++i) {
+        m[0] += (data[i].position.x - mean.x) * (data[i].position.x - mean.x);
+        m[1] += (data[i].position.x - mean.x) * (data[i].position.y - mean.y);
+        m[2] += (data[i].position.x - mean.x) * (data[i].position.z - mean.z);
+        m[4] += (data[i].position.y - mean.y) * (data[i].position.y - mean.y);
+        m[5] += (data[i].position.y - mean.y) * (data[i].position.z - mean.z);
+        m[8] += (data[i].position.z - mean.z) * (data[i].position.z - mean.z);
+    }
+    
+    float invCount = 1.0f / (count - 1);
+    m[0] *= invCount;
+    m[1] *= invCount;
+    m[2] *= invCount;
+    m[4] *= invCount;
+    m[5] *= invCount;
+    m[8] *= invCount;
+    m[3] = m[1];
+    m[6] = m[2];
+    m[7] = m[5];
+}
+
+void 
+PCASplit::computeDistortion(Point* data, int count, const Vector3& mean, 
+                            float& distortion, float& finalSize)
+{
+    distortion = 0.0f;
+    finalSize = 0.0f;
+        
+    float maxSize = 0.0f;
+    float distance;
+    for (int i = 0; i < count; ++i) {
+        // sum 
+        distance = mean.distanceSquare(data[i].position.x, data[i].position.y, data[i].position.z);
+        distortion += distance;
+        
+        if (data[i].size > maxSize) {
+            maxSize = data[i].size;
+        }
+        
+        /*
+          finalSize += data[i].size * sqrt(distance);
+        */
+        if (distance > finalSize) {
+            finalSize = distance;
+        }
+    }
+    // equation 2
+    //finalSize = 0.5f * sqrt (finalSize) / (float) (count - 1) + maxSize;
+    finalSize = sqrt (finalSize) + maxSize;
+}
+        
+void 
+PCASplit::init()
+{
+    _curClusterNode = 0;
+    _curClusterCount = 0;
+}
+
+Cluster* 
+PCASplit::createClusterBlock(ClusterListNode* clusterList, int count, int level)
+{
+    static int cc = 0;
+    cc += count;
+    Cluster* clusterBlock = new Cluster[count];
+
+    _clusterHeader->numOfClusters[level - 1] = count;
+    _clusterHeader->startPointerCluster[level - 1] = clusterBlock;
+
+    printf("Cluster created %d [in level %d]:total %d\n", count, level, cc);
     fflush(stdout);
-        
-        int i = 0;
-        ClusterListNode* clusterNode = clusterList;
-        while (clusterNode)
-        {
-                clusterBlock[i].centroid = clusterList->data->centroid_t;
-                clusterBlock[i].level = level;
-                clusterBlock[i].scale = clusterList->data->scale_t;
-
-                clusterNode = clusterNode->next;
-                ++i;
-        }
-        if (count != i) 
-        {
-                printf("ERROR\n");
-        }
-        return clusterBlock;
+        
+    int i = 0;
+    ClusterListNode* clusterNode = clusterList;
+    while (clusterNode) {
+        clusterBlock[i].centroid = clusterList->data->centroid_t;
+        clusterBlock[i].level = level;
+        clusterBlock[i].scale = clusterList->data->scale_t;
+        
+        clusterNode = clusterNode->next;
+        ++i;
+    }
+    if (count != i) {
+        printf("ERROR\n");
+    }
+    return clusterBlock;
 }
 
 ClusterAccel* PCASplit::doIt(Point* data, int count)
 {
-        init();
-
-        _clusterHeader = new ClusterAccel(_maxLevel);
-        
-        Cluster* root = new Cluster;
+    init();
+
+    _clusterHeader = new ClusterAccel(_maxLevel);
+        
+    Cluster* root = new Cluster;
+    Cluster_t* cluster_t = new Cluster_t();
+    cluster_t->points_t = data;
+    cluster_t->numOfPoints_t = count;
+    root->level = 1;
+        
+    _clusterHeader->root = root;
+    _clusterHeader->numOfClusters[0] = 1;
+    _clusterHeader->startPointerCluster[0] = root;
+        
+    Vector3 mean;
+    float distortion, scale;
+        
+    computeCentroid(cluster_t->points_t, cluster_t->numOfPoints_t, mean);
+    computeDistortion(cluster_t->points_t, cluster_t->numOfPoints_t, mean, 
+                      distortion, scale);
+        
+    cluster_t->centroid_t = mean;
+    cluster_t->scale_t = scale;
+        
+    float mindistance = _minDistance;
+    int level = 2;
+
+    ClusterListNode* clustNodeList = &(_memClusterChunk2[0]);
+    clustNodeList->data = cluster_t;
+    clustNodeList->next = 0;
+        
+    _curRoot = root;
+    do {
+        analyze(clustNodeList, _curRoot, level, mindistance);
+
+        mindistance *= _distanceScale;
+        ++level;
+
+        // swap memory buffer & init
+        _curMemClusterChunk = (_curMemClusterChunk == _memClusterChunk1)?
+            _memClusterChunk2 : _memClusterChunk1;
+        _memClusterChunkIndex = 0;
+
+        clustNodeList = _curClusterNode;
+
+    } while (level <= _maxLevel);
+
+    return _clusterHeader;
+}
+
+void 
+PCASplit::addLeafCluster(Cluster_t* cluster)
+{
+    ClusterListNode* clusterNode = 
+        &_curMemClusterChunk[_memClusterChunkIndex++];
+    clusterNode->data = cluster;
+    clusterNode->next = _curClusterNode;
+    _curClusterNode = clusterNode;
+    ++_curClusterCount;
+}
+
+void 
+PCASplit::split(Point* data, int count, float limit)
+{
+    Vector3 mean;
+    float m[9];
+
+    computeCentroid(data, count, mean);
+    float scale, distortion;
+    computeDistortion(data, count, mean, distortion, scale);
+        
+    //if (distortion < limit)
+    if (scale < limit) {
         Cluster_t* cluster_t = new Cluster_t();
+        cluster_t->centroid_t = mean;
         cluster_t->points_t = data;
         cluster_t->numOfPoints_t = count;
-        root->level = 1;
-        
-        _clusterHeader->root = root;
-        _clusterHeader->numOfClusters[0] = 1;
-        _clusterHeader->startPointerCluster[0] = root;
-        
-        Vector3 mean;
-        float distortion, scale;
-        
-        computeCentroid(cluster_t->points_t, cluster_t->numOfPoints_t, mean);
-        computeDistortion(cluster_t->points_t, cluster_t->numOfPoints_t, mean, distortion, scale);
-        
-        cluster_t->centroid_t = mean;
         cluster_t->scale_t = scale;
-        
-        float mindistance = _minDistance;
-        int level = 2;
-
-        ClusterListNode* clustNodeList = &(_memClusterChunk2[0]);
-        clustNodeList->data = cluster_t;
-        clustNodeList->next = 0;
-        
-        _curRoot = root;
-        do {
-                analyze(clustNodeList, _curRoot, level, mindistance);
-
-                mindistance *= _distanceScale;
-                ++level;
-
-                // swap memory buffer & init
-                _curMemClusterChunk = (_curMemClusterChunk == _memClusterChunk1)?
-                                                                _memClusterChunk2 : _memClusterChunk1;
-                _memClusterChunkIndex = 0;
-
-                clustNodeList = _curClusterNode;
-
-        } while (level <= _maxLevel);
-
-        return _clusterHeader;
-}
-
-void PCASplit::addLeafCluster(Cluster_t* cluster)
-{
-        ClusterListNode* clusterNode = &_curMemClusterChunk[_memClusterChunkIndex++];
-        clusterNode->data = cluster;
-        clusterNode->next = _curClusterNode;
-        _curClusterNode = clusterNode;
-        ++_curClusterCount;
-}
-
-void PCASplit::split(Point* data, int count, float limit)
-{
-        Vector3 mean;
-        float m[9];
-
-        computeCentroid(data, count, mean);
-        float scale, distortion;
-        computeDistortion(data, count, mean, distortion, scale);
-        
-        //if (distortion < limit)
-        if (scale < limit)
-        {
-                Cluster_t* cluster_t = new Cluster_t();
-                cluster_t->centroid_t = mean;
-                cluster_t->points_t = data;
-                cluster_t->numOfPoints_t = count;
-                cluster_t->scale_t = scale;
-                addLeafCluster(cluster_t);
-                return;
-        }
-
-        computeCovariant(data, count, mean, m);
-
-        SymmetricMatrix A(3);
-        for (int i = 1; i <= 3; ++i) 
-                for (int j = 1; j <= i; ++j)
-                {
-                        A(i, j) = m[(i - 1) * 3 + j - 1];
+        addLeafCluster(cluster_t);
+        return;
+    }
+    
+    computeCovariant(data, count, mean, m);
+    
+    SymmetricMatrix A(3);
+    for (int i = 1; i <= 3; ++i) {
+        for (int j = 1; j <= i; ++j) {
+            A(i, j) = m[(i - 1) * 3 + j - 1];
+        }
+    }
+        
+    Matrix U; DiagonalMatrix D;
+    eigenvalues(A,D,U);
+    Vector3 emax(U(1, 3), U(2, 3), U(3, 3));
+    
+    int left = 0, right = count - 1;
+    
+    Point p;
+    for (;left < right;) {
+        while (left < count && emax.dot(data[left].position - mean) >= 0.0f) {
+            ++left;
+        }
+        while (right >= 0 && emax.dot(data[right].position - mean) < 0.0f) {
+            --right;
+        }
+        if (left > right) {
+            break;
+        }
+        
+        p = data[left];
+        data[left] = data[right];
+        data[right] = p;
+        ++left, --right;
+        
+    }
+    
+    if (left == 0 || right == count - 1) {
+        printf("error\n");
+        exit(1);
+    } else {
+        split(data, left, limit);
+        split(data + left, count - left, limit);
+    }
+}
+
+void 
+PCASplit::analyze(ClusterListNode* clusterNode, Cluster* parent, int level, 
+                  float limit)
+{
+    if (level > _maxLevel) {
+        return;
+    } 
+    if (level > _finalMaxLevel) {
+        _finalMaxLevel = level;
+    }
+        
+    init();
+
+    ClusterListNode* clNode = clusterNode;
+        
+    // initialize the indexCount of indices
+    _indexCount = 0;
+    while (clNode) {
+        if (clNode->data) {
+            split(clNode->data->points_t, clNode->data->numOfPoints_t, limit);
+            _indices[_indexCount++] = _curClusterCount;
+        }
+        clNode = clNode->next;
+    }
+        
+    //Vector3 mean;
+    //computeCentroid(cluster->points, cluster->numOfPoints, mean);
+
+    // the process values of split are in _curClusterNode and _curClusterCount
+    ClusterListNode* curClusterNode = _curClusterNode;
+    unsigned int curClusterNodeCount = _curClusterCount;
+
+    if (curClusterNodeCount) {
+        
+        // create and init centroid
+        Cluster* retClusterBlock = 
+            createClusterBlock(curClusterNode, curClusterNodeCount, level);
+        
+        _curRoot = retClusterBlock;
+        
+        if (level == _maxLevel) {
+            ClusterListNode* node = curClusterNode;
+            if (_indexCount > 0) {
+                // for parent
+                Point* points = new Point[curClusterNodeCount];
+                
+                parent[0].setChildren(retClusterBlock, _indices[0]);
+                parent[0].setPoints(points, _indices[0]);
+                
+                for (unsigned int i = 0, in = 0; i < curClusterNodeCount; ++i) {
+                    if (i >= _indices[in]) {
+                        in++;
+                        parent[in].setChildren(retClusterBlock + _indices[in - 1], _indices[in] - _indices[in - 1]);
+                        parent[in].setPoints(points + _indices[in - 1], _indices[in] - _indices[in - 1]);
+                    }
+                                        
+                    retClusterBlock[i].scale = node->data->scale_t;
+                    retClusterBlock[i].centroid = node->data->centroid_t;
+                    retClusterBlock[i].points = node->data->points_t;
+                    retClusterBlock[i].numOfPoints = node->data->numOfPoints_t;
+                    retClusterBlock[i].color.set(float(rand()) / RAND_MAX, 
+                                                 float(rand()) / RAND_MAX, 
+                                                 float(rand()) / RAND_MAX,
+                                                 0.2);
+                    
+                    points[i].position = node->data->centroid_t;
+                    points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
+                    points[i].size = node->data->scale_t;
+                    
+                    node = node->next;
                 }
-
-        
-        Matrix U; DiagonalMatrix D;
-        eigenvalues(A,D,U);
-        Vector3 emax(U(1, 3), U(2, 3), U(3, 3));
-        
-        int left = 0, right = count - 1;
-
-        Point p;
-        for (;left < right;)
-        {
-                while (left < count && emax.dot(data[left].position - mean) >= 0.0f) ++left;
-                while (right >= 0 && emax.dot(data[right].position - mean) < 0.0f) --right;
+            }
+        } else {
+            Point* points = new Point[curClusterNodeCount];
+            ClusterListNode* node = curClusterNode;
+            
+            if (_indexCount > 0) {
+                parent[0].setPoints(points, _indices[0]);
+                parent[0].setChildren(retClusterBlock, _indices[0]);
+                for (int k = 1; k < _indexCount; ++k) {
+                    parent[k].setPoints(points + _indices[k - 1], 
+                                        _indices[k] - _indices[k - 1]);
+                    parent[k].setChildren(retClusterBlock + _indices[k - 1], 
+                                          _indices[k] - _indices[k - 1]);
+                }
+                                
+                // set points of sub-clusters
+                for (unsigned int i = 0; i < curClusterNodeCount; ++i) {
+                    points[i].position = node->data->centroid_t;
+                    points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
+                    points[i].size = node->data->scale_t;
+                    node = node->next;
+                }
                 
-                if (left > right) break;
-
-                p = data[left];
-                data[left] = data[right];
-                data[right] = p;
-                ++left, --right;
-                
-        }
-
-        if (left == 0 || right == count - 1)
-        {
-                printf("error\n");
-                exit(1);
-        }
-        else
-        {
-                split(data, left, limit);
-                split(data + left, count - left, limit);
-        }
-}
-
-void PCASplit::analyze(ClusterListNode* clusterNode, Cluster* parent, int level, float limit)
-{
-    fflush(stdout);
-        if (level > _maxLevel) return;
-        else if (level > _finalMaxLevel) _finalMaxLevel = level;
-        
-        init();
-
-        ClusterListNode* clNode = clusterNode;
-        
-        // initialize the indexCount of indices
-        _indexCount = 0;
-
-        while (clNode)
-        {
-                if (clNode->data)
-                {
-                        split(clNode->data->points_t, clNode->data->numOfPoints_t, limit);
-                        _indices[_indexCount++] = _curClusterCount;
-                }
-                        
-                clNode = clNode->next;
-        }
-        
-        //Vector3 mean;
-        //computeCentroid(cluster->points, cluster->numOfPoints, mean);
-
-        // the process values of split are in _curClusterNode and _curClusterCount
-        ClusterListNode* curClusterNode = _curClusterNode;
-        unsigned int curClusterNodeCount = _curClusterCount;
-
-        if (curClusterNodeCount)
-        {
-
-                // create and init centroid
-                Cluster* retClusterBlock = createClusterBlock(curClusterNode, curClusterNodeCount, level);
-                
-                _curRoot = retClusterBlock;
-
-                if (level == _maxLevel)
-                {
-                        ClusterListNode* node = curClusterNode;
-                        if (_indexCount > 0)
-                        {
-                                // for parent
-                                Point* points = new Point[curClusterNodeCount];
-                                
-                                parent[0].setChildren(retClusterBlock, _indices[0]);
-                                parent[0].setPoints(points, _indices[0]);
-
-                                for (unsigned int i = 0, in = 0; i < curClusterNodeCount; ++i)
-                                {
-                                        if (i >= _indices[in])
-                                        {
-                                                in++;
-                                                parent[in].setChildren(retClusterBlock + _indices[in - 1], _indices[in] - _indices[in - 1]);
-                                                parent[in].setPoints(points + _indices[in - 1], _indices[in] - _indices[in - 1]);
-                                        }
-                                        
-                                        retClusterBlock[i].scale = node->data->scale_t;
-                                        retClusterBlock[i].centroid = node->data->centroid_t;
-                                        retClusterBlock[i].points = node->data->points_t;
-                                        retClusterBlock[i].numOfPoints = node->data->numOfPoints_t;
-                                        retClusterBlock[i].color.set(
-                                                float(rand()) / RAND_MAX, float(rand()) / RAND_MAX, float(rand()) / RAND_MAX,
-                                                0.2);
-
-                                        points[i].position = node->data->centroid_t;
-                                        points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
-                                        points[i].size = node->data->scale_t;
-
-                                        node = node->next;
-                                        
-                                        //::glGenBuffers(1, &(cluster[i].vbo));
-                                        //glBindBuffer(GL_ARRAY_BUFFER, cluster[i].vbo);
-                                        //      glBufferData(GL_ARRAY_BUFFER,
-                                        //      sizeof(Point) * cluster[i].numOfPoints,
-                                        //      cluster[i].points,
-                                        //      GL_STATIC_DRAW);
-                                        //glBindBuffer(GL_ARRAY_BUFFER, 0);
-                                
-                                }
-
-                                /*
-                                ::glGenBuffers(1, &(_clusterHeader->_vbo[level - 1]));
-                                ::glBindBuffer(GL_ARRAY_BUFFER, _clusterHeader->_vbo[level - 1]);
-                                ::glBufferData(GL_ARRAY_BUFFER,
-                                                sizeof(Point) * curClusterNodeCount,
-                                                points,
-                                                GL_STATIC_DRAW);
-                                ::glBindBuffer(GL_ARRAY_BUFFER, 0);
-                                */
-                        }
-                        
-                        
-                        
-                }
-                else
-                {
-                        Point* points = new Point[curClusterNodeCount];
-                        ClusterListNode* node = curClusterNode;
-                        
-                        if (_indexCount > 0)
-                        {
-                                parent[0].setPoints(points, _indices[0]);
-                                parent[0].setChildren(retClusterBlock, _indices[0]);
-                                for (int k = 1; k < _indexCount; ++k)
-                                {
-                                        parent[k].setPoints(points + _indices[k - 1], _indices[k] - _indices[k - 1]);
-                                        parent[k].setChildren(retClusterBlock + _indices[k - 1], _indices[k] - _indices[k - 1]);
-                                }
-                                
-                                // set points of sub-clusters
-                                for (unsigned int i = 0; i < curClusterNodeCount; ++i)
-                                {
-                                        points[i].position = node->data->centroid_t;
-                                        points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
-                                        points[i].size = node->data->scale_t;
-                                        node = node->next;
-                                }
-
-                        }
-                }
-        }
-}
-
-}
-
+            }
+        }
+    }
+}
+
+} /*namespace PCA */
+

trunk/packages/vizservers/nanovis/PCASplit.h

@@ -37 +37 @@
 public :
 
-        Cluster() : color(1.0f, 1.0f, 1.0f, 1.0f), scale(0.0f), numOfChildren(0), numOfPoints(0),
-                        points(0), children(0), vbo(0)/*, minValue(0.0f), maxValue(0.0f)*/
-                        , level(0)
+        Cluster() : 
+            color(1.0f, 1.0f, 1.0f, 1.0f), 
+            scale(0.0f), 
+            numOfChildren(0), 
+            numOfPoints(0),
+            points(0), 
+            children(0), 
+            vbo(0)/*, minValue(0.0f), maxValue(0.0f)*/
+            , level(0)
         {
         }

trunk/packages/vizservers/nanovis/Plane.cpp

@@ -15 +15 @@
 #include <assert.h>
 #include "Plane.h"
-
-Plane::Plane(){}
 
 Plane::Plane(float _a, float _b, float _c, float _d) {
@@ -36 +34 @@
 }
 
-void Plane::get_normal(Vector3 &normal){
-    normal.x = a;
-    normal.y = b;
-    normal.z = c;
-}
 
-void Plane::get_point(Vector3 &point){
-    if(a != 0){ 
-                point.x = -d/a;
-                point.y = 0;
-                point.z = 0;
-    } 
-        else if(b != 0){
-                point.y = -d/b;
-                point.x = 0;
-                point.z = 0;
-    } 
-        else if(c != 0){
-                point.z = -d /c;
-                point.y = 0;
-                point.x = 0;
-    } 
-        else{
-                assert(false);
-    }
-}
+void 
+Plane::transform(Mat4x4 mat) {
+    Vector4 coeffs(a, b, c, d);
 
-Vector4 Plane::get_coeffs(){
-    Vector4 ret(a, b, c, d);
-        return ret;
-}
-
-void Plane::set_coeffs(float _a, float _b, float _c, float _d){
-    a = _a;
-    b = _b;
-    c = _c;
-    d = _d;
-}
-
-void Plane::transform(Mat4x4 mat) {
-    Vector4 coeffs(a, b, c, d);
-        Mat4x4 inv = mat.inverse();
-        Vector4 new_coeffs = inv.multiply_row_vector(coeffs);
-
+    Mat4x4 inv = mat.inverse();
+    Vector4 new_coeffs = inv.multiply_row_vector(coeffs);
     a = new_coeffs.x;
     b = new_coeffs.y;
@@ -86 +47 @@
 }
 
-void Plane::transform(float *m){
-        Mat4x4 mat(m);
-        transform(mat);
+void 
+Plane::get_point(Vector3 &point){
+    if (a != 0) { 
+        point.x = -d/a;
+        point.y = 0;
+        point.z = 0;
+    } else if (b != 0) {
+        point.y = -d/b;
+        point.x = 0;
+        point.z = 0;
+    } else if (c != 0) {
+        point.z = -d /c;
+        point.y = 0;
+        point.x = 0;
+    } else{
+        assert(false);
+    }
 }
-
-bool Plane::retains(Vector3 point){
-    return (a * point.x + b * point.y + c * point.z + d >= 0);
-}

trunk/packages/vizservers/nanovis/Plane.h

@@ -20 +20 @@
 
 class Plane {
+    float a, b, c, d;
 public:
-    float a, b, c, d;
         
     Plane(float a, float b, float c, float d);
     Plane(float coeffs[4]);
-    Plane();
+    Plane(void) {
+        /*empty*/
+    };
     
-    void get_normal(Vector3 &normal);
     void get_point(Vector3 &point);
-    Vector4 get_coeffs();
-    void set_coeffs(float _a, float _b, float _c, float _d);
-    void transform(Mat4x4 mat);
-    void transform(float *m);
-    bool retains(Vector3 point);
     //bool clips(float point[3]) const { return !retains(point); }
 
+    void transform(Mat4x4 mat);
+    void transform(float *m) {
+        Mat4x4 mat(m);
+        transform(mat);
+    }
+    bool retains(Vector3 point) {
+        return ((a*point.x + b*point.y + c*point.z + d) >= 0);
+    }
+    Vector4 get_coeffs(void) {
+        return Vector4(a, b, c, d);
+    }
+    void set_coeffs(float a_val, float b_val, float c_val, float d_val) {
+        a = a_val, b = b_val, c = c_val, d = d_val;
+    }
+    void get_normal(Vector3 &normal) {
+        normal.x = a;
+        normal.y = b;
+        normal.z = c;
+    }
 };
 

trunk/packages/vizservers/nanovis/PointSet.cpp

@@ -4 +4 @@
 #include <stdio.h>
 
-PointSet::PointSet() : 
-    _sortLevel(4), 
-    _cluster(0), 
-    _max(1.0f),
-    _min(0.0f), 
-    _visible(false)
-{
-    /*empty*/
-}
-
-PointSet::~PointSet()
-{
-    if (_cluster)
-    {
-        delete _cluster;
-    }
-}
-
-void PointSet::initialize(Vector4* values, const unsigned int count, const Vector3& scale, const Vector3& origin, float min, float max)
+void 
+PointSet::initialize(Vector4* values, const unsigned int count, 
+                     const Vector3& scale, const Vector3& origin, 
+                     float min, float max)
 {
     PCA::PCASplit pcaSplit;
@@ -32 +17 @@
 
     PCA::Point* points = (PCA::Point*) malloc(sizeof(PCA::Point) * count);
-    for (unsigned int i = 0; i < count; ++i)
-    {
+    for (unsigned int i = 0; i < count; ++i) {
         points[i].position.set(values[i].x, values[i].y, values[i].z);
         points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
@@ -40 +24 @@
     }
 
-    if (_cluster != 0)
-    {
+    if (_cluster != 0) {
         delete _cluster;
     }
@@ -49 +32 @@
 }
 
-void PointSet::updateColor(float* color,  int colorCount)
+void 
+PointSet::updateColor(float* color,  int colorCount)
 {
-        if (_cluster == 0) return;
-
+    if (_cluster == 0) {
+        return;
+    }
     int level = 4;
 
-        PCA::Cluster* cluster = _cluster->startPointerCluster[level - 1];
-        PCA::Cluster* c = &(cluster[0]);
-        PCA::Cluster* end = &(cluster[_cluster->numOfClusters[level - 1] - 1]);
-
-        Vector3 pos;
-        
+    PCA::Cluster* cluster = _cluster->startPointerCluster[level - 1];
+    PCA::Cluster* c = &(cluster[0]);
+    PCA::Cluster* end = &(cluster[_cluster->numOfClusters[level - 1] - 1]);
+    
+    Vector3 pos;
+    
     PCA::Point* points;
     Vector4* colors = (Vector4*) color;
-        int numOfPoints;
+    int numOfPoints;
     int index;
     float d = _max - _min;
-        for (; c <= end; c = (PCA::Cluster*) ((int) c + sizeof(PCA::Cluster)))
-        {
+    for (/*empty*/; c <= end; c = (PCA::Cluster*)((int)c+sizeof(PCA::Cluster))){
         points = c->points;
         numOfPoints = c->numOfPoints;
-
-        for (int i = 0; i < numOfPoints; ++i)
-        {
+        
+        for (int i = 0; i < numOfPoints; ++i) {
             index = (points[i].value - _min) / d  * (colorCount - 1);
-            if (index >= colorCount) index = colorCount - 1;
-            //printf("TEST %f %d/%d -> %d (%f %f %f)\n", points[i].value, i, numOfPoints, index, 
-            //                                    colors[index].x, colors[index].y, colors[index].z);
-            //fflush(stdout);
+            if (index >= colorCount) {
+                index = colorCount - 1;
+            }
             points[i].color = colors[index];
         }
-
-        }
+    }
 }
 

trunk/packages/vizservers/nanovis/PointSet.h

@@ -17 +17 @@
     bool _visible;
 public :
-    PointSet();
-    ~PointSet();
+    void initialize(Vector4* values, const unsigned int count, 
+                    const Vector3& scale, const Vector3& origin, 
+                    float min, float max);
+    void updateColor(float* color, int  count);
 
-public :
-    void initialize(Vector4* values, const unsigned int count, const Vector3& scale, const Vector3& origin, float min, float max);
-    bool isVisible() const;
-    void setVisible(bool visible);
-    unsigned int getSortLevel()const;
-    PCA::ClusterAccel* getCluster();
-    void updateColor(float* color, int  count);
-    const Vector3& getScale() const;
-    Vector3& getScale();
-    const Vector3& getOrigin() const;
-    Vector3& getOrigin();
+    PointSet() :
+        _sortLevel(4), 
+        _cluster(0), 
+        _max(1.0f),
+        _min(0.0f), 
+        _visible(false)
+    {
+        /*empty*/
+    }
+    ~PointSet() {
+        if (_cluster) {
+            delete _cluster;
+        }
+    }
+
+    bool isVisible() const {
+        return _visible;
+    }
+    void setVisible(bool visible) {
+        _visible = visible;
+    }
+    unsigned int getSortLevel(void) const {
+        return _sortLevel;
+    }
+    PCA::ClusterAccel* getCluster(void) {
+        return _cluster;
+    }
+    Vector3& getScale(void) {
+        return _scale;
+    }
+    const Vector3& getScale(void) const {
+        return _scale;
+    }
+    Vector3& getOrigin(void) {
+        return _origin;
+    }
+    const Vector3& getOrigin(void) const {
+        return _origin;
+    }
 };
 
-inline bool PointSet::isVisible() const
-{
-    return _visible;
-}
-
-inline void PointSet::setVisible(bool visible)
-{
-    _visible = visible;
-}
-
-inline unsigned int PointSet::getSortLevel()const
-{
-    return _sortLevel;
-}
-
-inline PCA::ClusterAccel* PointSet::getCluster()
-{
-    return _cluster;
-}
-
-inline Vector3& PointSet::getScale()
-{
-    return _scale;
-}
-
-inline const Vector3& PointSet::getScale() const
-{
-    return _scale;
-}
-
-inline Vector3& PointSet::getOrigin()
-{
-    return _origin;
-}
-
-inline const Vector3& PointSet::getOrigin() const
-{
-    return _origin;
-}
-
-#endif // 
+#endif /*__POINT_SET_H__*/

trunk/packages/vizservers/nanovis/RpDX.cpp

@@ -22 +22 @@
 using namespace Rappture;
 
-DX::DX(const char* filename) :
+DX::DX(const char* filename, Outcome *resultPtr) :
     _dataMin(FLT_MAX),
     _dataMax(-FLT_MAX),
@@ -47 +47 @@
 
     if (filename == NULL) {
-        // error
+        resultPtr->AddError("filename is NULL");
+        return;
     }
     // open the file with libdx
@@ -54 +55 @@
     DXenable_locks(0);
     _dxobj = DXImportDX((char*)filename,NULL,NULL,NULL,NULL);
+    if (_dxobj == NULL) {
+        resultPtr->AddError("can't import DX file \"%s\"", filename);
+        return;
+    }
 
     fprintf(stdout, "dxobj=%x\n", (unsigned int)_dxobj);
     fflush(stdout);
 
-    // parse out the positions array
-    // FIXME: nanowire will need a different way to parse out the positions array
-    // since it uses a productarray to store its positions.
-    // possibly use DXGetProductArray()
+    // parse out the positions array 
+
+    // FIXME: nanowire will need a different way to parse out the positions
+    //        array since it uses a productarray to store its positions.  
+    //        Possibly use DXGetProductArray().
     dxpos = (Array) DXGetComponentValue((Field) _dxobj, (char *)"positions");
+    if (dxpos == NULL) {
+        resultPtr->AddError("can't get component value of \"positions\"");
+        return;
+    }
     DXGetArrayInfo(dxpos, &_n, &type, &category, &_rank, &_shape);
 
     fprintf(stdout, "_n = %d\n",_n);
     if (type != TYPE_FLOAT) {
-        fprintf(stderr, "WARNING: positions is not type float (type=%d)\n",
-            type);
-        fflush(stderr);
+        resultPtr->AddError("\"positions\" is not type float (type=%d)\n", type);
+        return;
     }
     fprintf(stdout, "_rank = %d\n",_rank);
@@ -77 +86 @@
     pos = (float*) DXGetArrayData(dxpos);
     if (pos == NULL) {
-        fprintf(stdout, "DXGetArrayData failed to return positions array\n");
-        fflush(stdout);
+        resultPtr->AddError("DXGetArrayData failed to return positions array");
+        return;
     }
 
@@ -85 +94 @@
     if (DXQueryGridConnections(dxgrid, &_numAxis, NULL) == NULL) {
         // raise error, data is not a regular grid and we cannot handle it
-        fprintf(stdout,"DX says our grid is not regular, we cannot handle this data\n");
-        fflush(stdout);
+        resultPtr->AddError("DX says our grid is not regular, we cannot handle this data");
+        return;
     }
 
@@ -92 +101 @@
     if (_positions == NULL) {
         // malloc failed, raise error
-        fprintf(stdout, "malloc of _positions array failed");
-        fflush(stdout);
+        resultPtr->AddError("malloc of _positions array failed");
+        return;
     }
     memcpy(_positions,pos,sizeof(float)*_n*_numAxis);
@@ -100 +109 @@
     if (_axisLen == NULL) {
         // malloc failed, raise error
-        fprintf(stdout, "malloc of _axisLen array failed");
-        fflush(stdout);
+        resultPtr->AddError("malloc of _axisLen array failed");
+        return;
     }
     memset(_axisLen, 0, _numAxis);
@@ -107 +116 @@
     _delta = new float[_numAxis*_numAxis];
     if (_delta == NULL) {
-        // malloc failed, raise error
-        fprintf(stdout, "malloc of _delta array failed");
-        fflush(stdout);
+        resultPtr->AddError("malloc of _delta array failed");
+        return;
     }
     memset(_delta, 0, _numAxis*_numAxis);
@@ -115 +123 @@
     _origin = new float[_numAxis];
     if (_origin == NULL) {
-        // malloc failed, raise error
-        fprintf(stdout, "malloc of _origin array failed");
-        fflush(stdout);
+        resultPtr->AddError("malloc of _origin array failed");
+        return;
     }
     memset(_origin, 0, _numAxis);
@@ -123 +130 @@
     _max = new float[_numAxis];
     if (_max == NULL) {
-        // malloc failed, raise error
-        fprintf(stdout, "malloc of _max array failed");
-        fflush(stdout);
+        resultPtr->AddError("malloc of _max array failed");
+        return;
     }
     memset(_max, 0, _numAxis);
@@ -148 +154 @@
     _data = new float[_n];
     if (_data == NULL) {
-        // malloc failed, raise error
-        fprintf(stdout, "malloc of _data array failed");
-        fflush(stdout);
+        resultPtr->AddError("malloc of _data array failed");
+        return;
     }
 
@@ -167 +172 @@
         }
     default:
-        fprintf(stdout, "don't know how to handle data of type %d\n", type);
-        fflush(stdout);
+        resultPtr->AddError("don't know how to handle data of type %d\n", type);
+        return;
     }
 

trunk/packages/vizservers/nanovis/RpDX.h

@@ -19 +19 @@
 // #include "rappture2.h"
 #include <dx/dx.h>
+#include <RpOutcome.h>
 
 namespace Rappture {
@@ -25 +26 @@
 public:
     DX();
-    DX(const char* filename);
+    DX(const char* filename, RpOutcome *resultPtr);
     DX(const DX& rpdx);
     DX& operator=(const DX& rpdx);

trunk/packages/vizservers/nanovis/Texture3D.cpp

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -25 +26 @@
 Texture3D::Texture3D(int width, int height, int depth, GLuint type=GL_FLOAT, GLuint interp=GL_LINEAR, int components=4)
 {
-        assert(type == GL_UNSIGNED_BYTE || type == GL_FLOAT|| type ==GL_UNSIGNED_INT);
-        assert(interp == GL_LINEAR || interp == GL_NEAREST);
-        
-        this->width = width;
-        this->height = height;
-        this->depth = depth;
-
-        //int m = (width > height) ? width : height;
-        //m = (m > depth) ? m : depth; 
-
-        //int m = max(max(width, height), depth);
-        this->aspect_ratio_width = 1.;
-        this->aspect_ratio_height = (double)height/(double)width;
-        this->aspect_ratio_depth = (double)depth/(double)width;
-
-        //this->aspect_ratio_width = (double)width/(double)m;
-        //this->aspect_ratio_height = (double)height/(double)m;
-        //this->aspect_ratio_depth = (double)depth/(double)m;
-
-        this->type = type;
-        this->interp_type = interp;
-        this->n_components = components;
-
-        this->id = 0;
-        gl_resource_allocated = false;
+    assert(type == GL_UNSIGNED_BYTE || type == GL_FLOAT|| type ==GL_UNSIGNED_INT);
+    assert(interp == GL_LINEAR || interp == GL_NEAREST);
+        
+    this->width = width;
+    this->height = height;
+    this->depth = depth;
+
+    //int m = (width > height) ? width : height;
+    //m = (m > depth) ? m : depth; 
+
+    //int m = max(max(width, height), depth);
+    this->aspect_ratio_width = 1.;
+    this->aspect_ratio_height = (double)height/(double)width;
+    this->aspect_ratio_depth = (double)depth/(double)width;
+
+    //this->aspect_ratio_width = (double)width/(double)m;
+    //this->aspect_ratio_height = (double)height/(double)m;
+    //this->aspect_ratio_depth = (double)depth/(double)m;
+
+    this->type = type;
+    this->interp_type = interp;
+    this->n_components = components;
+
+    this->id = 0;
+    gl_resource_allocated = false;
 }
 
 void Texture3D::update(float* data)
 {
-        //load texture with 16 bit half floating point precision if card is 6 series NV40
-        //half float with linear interpolation is only supported by 6 series and up cards
-        //If NV40 not defined, data is quantized to 8-bit from 32-bit.
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-        glBindTexture(GL_TEXTURE_3D, id);
-        assert(id!=-1);
-
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-
-        if(interp_type==GL_LINEAR){
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        }
-        else{
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        }
-
-        //to do: add handling to more formats
-        if(type==GL_FLOAT){
-          switch(n_components){
-            #ifdef NV40
-                case 1:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE16F_ARB, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
-                        break;
-                case 2:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA16F_ARB, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
-                        break;
-                case 3:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB16F_ARB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
-                        break;
-                case 4:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA16F_ARB, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
-                        break;
-            #else
-                case 1:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
-                        break;
-                case 2:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
-                        break;
-                case 3:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
-                        break;
-                case 4:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
-                        break;
-            #endif
-                default:
-                        break;
-          }
-        }
-
-
-        assert(glGetError()==0);
-        
-        gl_resource_allocated = true;
+    //load texture with 16 bit half floating point precision if card is 6 series NV40
+    //half float with linear interpolation is only supported by 6 series and up cards
+    //If NV40 not defined, data is quantized to 8-bit from 32-bit.
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+    glBindTexture(GL_TEXTURE_3D, id);
+    assert(id!=-1);
+
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+
+    if(interp_type==GL_LINEAR){
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    }
+    else{
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    }
+
+    //to do: add handling to more formats
+    if(type==GL_FLOAT){
+        switch(n_components){
+#ifdef NV40
+        case 1:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE16F_ARB, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
+            break;
+        case 2:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA16F_ARB, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
+            break;
+        case 3:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB16F_ARB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
+            break;
+        case 4:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA16F_ARB, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
+            break;
+#else
+        case 1:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
+            break;
+        case 2:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
+            break;
+        case 3:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
+            break;
+        case 4:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
+            break;
+#endif
+        default:
+            break;
+        }
+    }
+
+
+    assert(glGetError()==0);
+        
+    gl_resource_allocated = true;
 
 }
@@ -119 +120 @@
 GLuint Texture3D::initialize(float *data)
 {
-        if (id != 0) glDeleteTextures(1, &id);
-
-        //load texture with 16 bit half floating point precision if card is 6 series NV40
-        //half float with linear interpolation is only supported by 6 series and up cards
-        //If NV40 not defined, data is quantized to 8-bit from 32-bit.
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-        glGenTextures(1, &id);
-        glBindTexture(GL_TEXTURE_3D, id);
-        assert(id!=-1);
-
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-
-        if(interp_type==GL_LINEAR){
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        }
-        else{
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        }
-
-        //to do: add handling to more formats
-        if(type==GL_FLOAT){
-          switch(n_components){
-            #ifdef NV40
-                case 1:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE16F_ARB, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
-                        break;
-                case 2:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA16F_ARB, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
-                        break;
-                case 3:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB16F_ARB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
-                        break;
-                case 4:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA16F_ARB, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
-                        break;
-            #else
-                case 1:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
-                        break;
-                case 2:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
-                        break;
-                case 3:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
-                        break;
-                case 4:
-                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
-                        break;
-            #endif
-                default:
-                        break;
-          }
-        }
-
-
-        assert(glGetError()==0);
-        
-        gl_resource_allocated = true;
-        return id;
+    if (id != 0) glDeleteTextures(1, &id);
+
+    //load texture with 16 bit half floating point precision if card is 6 series NV40
+    //half float with linear interpolation is only supported by 6 series and up cards
+    //If NV40 not defined, data is quantized to 8-bit from 32-bit.
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+    glGenTextures(1, &id);
+    glBindTexture(GL_TEXTURE_3D, id);
+    assert(id!=-1);
+
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+
+    if(interp_type==GL_LINEAR){
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    }
+    else{
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    }
+
+    //to do: add handling to more formats
+    if(type==GL_FLOAT){
+        switch(n_components){
+#ifdef NV40
+        case 1:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE16F_ARB, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
+            break;
+        case 2:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA16F_ARB, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
+            break;
+        case 3:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB16F_ARB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
+            break;
+        case 4:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA16F_ARB, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
+            break;
+#else
+        case 1:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
+            break;
+        case 2:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
+            break;
+        case 3:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
+            break;
+        case 4:
+            glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
+            break;
+#endif
+        default:
+            break;
+        }
+    }
+
+
+    assert(glGetError()==0);
+        
+    gl_resource_allocated = true;
+    return id;
 }
 
 void Texture3D::activate()
 {
-        glEnable(GL_TEXTURE_3D);
-        glBindTexture(GL_TEXTURE_3D, id);
+    glEnable(GL_TEXTURE_3D);
+    glBindTexture(GL_TEXTURE_3D, id);
 }
 
 void Texture3D::deactivate()
 {
-        glDisable(GL_TEXTURE_3D);               
+    glDisable(GL_TEXTURE_3D);           
 }
 
 Texture3D::~Texture3D()
 {
-        glDeleteTextures(1, &id);
+    glDeleteTextures(1, &id);
 }
 
 void Texture3D::check_max_size(){
-        GLint max = 0;
-        glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE_EXT, &max);
-        
-        //printf("%d", glGetError());
-        fprintf(stderr, "max 3d texture size: %d\n", max);
+    GLint max = 0;
+    glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE_EXT, &max);
+        
+    //printf("%d", glGetError());
+    fprintf(stderr, "max 3d texture size: %d\n", max);
 }
 
 void Texture3D::check_max_unit(){
-        int max;
-        glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max);
-
-        fprintf(stderr, "max texture units: %d.\n", max);
-}
+    int max;
+    glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max);
+
+    fprintf(stderr, "max texture units: %d.\n", max);
+}

trunk/packages/vizservers/nanovis/Vector3.h

@@ -16 +16 @@
 #define _VECTOR3_H_
 
-class Mat4x4;
+/*
+ * FIXME: The files that explicitly use the "rot*", "length", "distance", or
+ * "normalize" methods, should include the following headers.  Don't do it
+ * here.
+ */
+#include <math.h> 
+#include "Mat4x4.h"
 
 class Vector3{
-
+private:
+    float radians(float degree) const {
+        return (M_PI * degree) / 180.0;
+    }
 public:
-        float x, y, z;
-        Vector3(float _x, float _y, float _z);
-        Vector3();
-
-        Vector3 operator +(Vector3 &op2);       
-        Vector3 operator -(Vector3 &op2);
-        Vector3 operator -(float scalar);
-        Vector3 operator +(float scalar);
-        bool equal(Vector3 &op2);
-        //float operator *(Vector3 &op2);       //dot product
-        float operator *(Vector3 &op2);         //dot product
-        Vector3 operator *(float op2);    //mul per component
-        Vector3 operator /(float op2);    //mul per component
-        void operator <(Vector3 &op2);    //assign      
-        Vector3 operator ^(Vector3 &op2); //cross product
-        Vector3 normalize();
-        Vector3 rot_x(float degree);      //rotation about x
-        Vector3 rot_y(float degree);      //rotation about y
-        Vector3 rot_z(float degree);      //rotation about z
-        void set(float newx, float newy, float newz);
-        void print();
-        float distance(Vector3 &another) const; //compute distance
-        float distanceSquare(Vector3 &another) const;   //compute distance
-        float distanceSquare(float vx, float vy, float vz) const;       //compute distance
-
-        //fast version
-        Vector3 cross(Vector3 op2);
-
-    float dot(const Vector3& vec) const;
-
-    void transform(const Vector3& vec, const Mat4x4& mat);
-    float length() const;
+    float x, y, z;
+    Vector3(void) {
+        /*empty*/
+    }
+    Vector3(float x_val, float y_val, float z_val) {
+        set(x_val, y_val, z_val);
+    }
+    Vector3 operator +(float scalar) {
+        return Vector3(x + scalar, y + scalar, z + scalar);
+    }
+    Vector3 operator -(float scalar) {
+        return Vector3(x - scalar, y - scalar, z - scalar);
+    }
+    Vector3 operator *(float scalar) {
+        return Vector3(x * scalar, y * scalar, z * scalar);
+    }
+    Vector3 operator /(float scalar) {
+        return Vector3(x / scalar, y / scalar, z / scalar);
+    }
+    Vector3 operator +(Vector3 &op2) {
+        return Vector3(x + op2.x, y + op2.y, z + op2.z);
+    }
+    Vector3 operator -(Vector3 &op2) {
+        return Vector3(x - op2.x, y - op2.y, z - op2.z);
+    }
+    float operator *(Vector3 &op2){
+        return x*op2.x + y*op2.y + z*op2.z;
+    }
+    float dot(const Vector3& vec) const {
+        return x*vec.x + y*vec.y + z*vec.z;
+    }
+    bool equal(Vector3 &op2) {
+        return (x==op2.x) && (y==op2.y) && (z==op2.z);
+    }
+    Vector3 cross(Vector3 op2) {
+        return Vector3(y*op2.z - z*op2.y, z*op2.x - x*op2.z, x*op2.y - y*op2.x);
+    }
+    void operator<(Vector3 &op2) {
+        set(op2.x, op2.y, op2.z);
+    }
+    Vector3 operator ^(Vector3 &op2) {
+        return cross(op2);
+    }
+    Vector3 normalize(void) {
+        float len = length();
+        return Vector3(x / len, y / len, z / len);
+    }
+    Vector3 rot_x(float degree) {
+        float rad = radians(degree);
+        return Vector3(x, 
+                       y*cos(rad) - z*sin(rad), 
+                       y*sin(rad) + z*cos(rad));
+    }
+    Vector3 rot_y(float degree) {
+        float rad = radians(degree);
+        return Vector3(x*cos(rad) + z*sin(rad), 
+                       y, 
+                       -x*sin(rad) + z*cos(rad));
+    }
+    Vector3 rot_z(float degree) {
+        float rad = radians(degree);
+        return Vector3(x*cos(rad) - y*sin(rad), 
+                       x*sin(rad) + y*cos(rad), 
+                       z);
+    }
+    void set(float x_val, float y_val, float z_val) {
+        x = x_val, y = y_val, z = z_val;
+    }
+    void print(void){
+        fprintf(stderr, "x:%f, y:%f, z:%f\n", x, y, z);
+    }
+    float distance(Vector3 &v) const {
+        return sqrtf(distanceSquare(v));
+    }
+    float distanceSquare(Vector3 &v) const {
+        return (x-v.x)*(x-v.x) + (y-v.y)*(y-v.y) + (z-v.z)*(z-v.z);
+    }
+    float distanceSquare(float vx, float vy, float vz) const {
+        return (x-vx)*(x-vx) + (y-vy)*(y-vy) + (z-vz)*(z-vz);
+    }
+    void transform(const Vector3& v, const Mat4x4& mat) {
+        const float* m = mat.m;
+        x = m[0] * v.x + m[4] * v.y + m[8]  * v.z + m[12];
+        y = m[1] * v.x + m[5] * v.y + m[9]  * v.z + m[13];
+        z = m[2] * v.x + m[6] * v.y + m[10] * v.z + m[14];
+    }
+    float length(void) const {
+        return sqrt(x*x + y*y + z*z);
+    }
 };
 
-inline Vector3 Vector3::operator +(float scalar)
-{
-    Vector3 v;
-    v.x = x + scalar;
-    v.y = y + scalar;
-    v.z = z + scalar;
-    return v;
-}
 
-inline Vector3 Vector3::operator -(float scalar)
-{
-    Vector3 v;
-    v.x = x - scalar;
-    v.y = y - scalar;
-    v.z = z - scalar;
-    return v;
-}
 #endif

trunk/packages/vizservers/nanovis/Vector4.h

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -16 +17 @@
 #define _VECTOR4_H_
 
+#include <stdio.h>
+
 class Vector4  
 {
 public:
-        float x, y, z, w;
+    float x, y, z, w;
 
-        Vector4();
-        Vector4(float _x, float _y, float _z, float _w);
-        ~Vector4();
+    Vector4(void) {
+        /*empty*/
+    }
+    Vector4(float x_val, float y_val, float z_val, float w_val) {
+        set(x_val, y_val, z_val, w_val);
+    }
+    void perspective_devide(void) {
+        /* Divide vector by w */
+        x /= w, y /= w, z /= w, w = 1.;
+    }
 
-        void perspective_devide();
-        void print();
-        Vector4 operator +(Vector4 &op2); //plus        
-        Vector4 operator -(Vector4 &op2); //minus
-        float operator *(Vector4 &op2);   //dot product
-        Vector4 operator*(float op2);     //mul per component
-        Vector4 operator/(float op2);     //mul per component
-        void operator <(Vector4 &op2);    //assign      
+    void print(void) {
+        fprintf(stderr, "Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w);
+    }
 
-    void set(float x1, float y1, float z1, float w1);
+    Vector4 operator +(Vector4 &op2){
+        return Vector4(x + op2.x, y + op2.y, z + op2.z, w + op2.w);
+    }
+
+    Vector4 operator -(Vector4 &op2){
+        return Vector4(x - op2.x, y - op2.y, z - op2.z, w - op2.w);
+    }
+
+    float operator *(Vector4 &op2) {
+        return (x * op2.x) + (y * op2.y) + (z * op2.z) + (w * op2.w);
+    }
+
+    Vector4 operator *(float op2){
+        return Vector4(x * op2, y * op2, z * op2, w * op2);
+    }
+
+    Vector4 operator /(float op2) {
+        return Vector4(x / op2, y / op2, z / op2, w / op2);
+    }
+
+    void operator <(Vector4 &op2) {
+        set(op2.x, op2.y, op2.z, op2.w);
+    }
+    void set(float x_val, float y_val, float z_val, float w_val) {
+        x = x_val, y = y_val, z = z_val, w = w_val;
+    }
 };
 

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -22 +22 @@
 #include <sys/time.h>
 #include "Trace.h"
-
+#include "nanovis.h"
+#include "Grid.h"
+
+#define NUMDIGITS       6
 
 VolumeRenderer::VolumeRenderer():
@@ -242 +245 @@
         model_view_trans_inverse = model_view_trans.inverse();
 
-    //draw volume bounding box with translation (the correct location in space)
+        //draw volume bounding box with translation (the correct location in
+        //space)
         if (cur_vol->outline_is_enabled()) {
             float olcolor[3];
@@ -484 +488 @@
 
   //volume start location
-  Vector4 shift_4d(volume[volume_index]->location.x, volume[volume_index]->location.y, volume[volume_index]->location.z, 0);
+  Vector4 shift_4d(volume[volume_index]->location.x, 
+                   volume[volume_index]->location.y, 
+                   volume[volume_index]->location.z, 0);
 
   double x0 = 0;
@@ -570 +576 @@
     int axis = volume[volume_index]->get_cutplane(i)->orient;
 
-    if(axis==1){
+    if (axis==1) {
       vert1 = Vector4(-10, -10, offset, 1);
       vert2 = Vector4(-10, +10, offset, 1);
       vert3 = Vector4(+10, +10, offset, 1);
       vert4 = Vector4(+10, -10, offset, 1);
-    }
-    else if(axis==2){
+    } else if(axis==2){
       vert1 = Vector4(offset, -10, -10, 1);
       vert2 = Vector4(offset, +10, -10, 1);
       vert3 = Vector4(offset, +10, +10, 1);
       vert4 = Vector4(offset, -10, +10, 1);
-    }
-    else if(axis==3){
+    } else if(axis==3) {
       vert1 = Vector4(-10, offset, -10, 1);
       vert2 = Vector4(+10, offset, -10, 1);
@@ -692 +696 @@
 }
 
-void VolumeRenderer::draw_bounding_box(float x0, float y0, float z0,
-                float x1, float y1, float z1,
-                float r, float g, float b, float line_width)
+void 
+VolumeRenderer::draw_bounding_box(
+    float x0, float y0, float z0,
+    float x1, float y1, float z1,
+    float r, float g, float b, 
+    float line_width)
 {
-        glDisable(GL_TEXTURE_2D);
-
-        glColor4d(r, g, b, 1.0);
-        glLineWidth(line_width);
+    glPushMatrix();
+    glEnable(GL_DEPTH_TEST);
+    glDisable(GL_TEXTURE_2D);
+    glEnable(GL_BLEND);
+
+    glColor4d(r, g, b, 1.0);
+    glLineWidth(line_width);
+    
+    glBegin(GL_LINE_LOOP);
+    {
+        glVertex3d(x0, y0, z0);
+        glVertex3d(x1, y0, z0);
+        glVertex3d(x1, y1, z0);
+        glVertex3d(x0, y1, z0);
+    }
+    glEnd();
+    
+    glBegin(GL_LINE_LOOP);
+    {
+        glVertex3d(x0, y0, z1);
+        glVertex3d(x1, y0, z1);
+        glVertex3d(x1, y1, z1);
+        glVertex3d(x0, y1, z1);
+    }
+    glEnd();
+    
+    
+    glBegin(GL_LINE_LOOP);
+    {
+        glVertex3d(x0, y0, z0);
+        glVertex3d(x0, y0, z1);
+        glVertex3d(x0, y1, z1);
+        glVertex3d(x0, y1, z0);
+    }
+    glEnd();
+    
+    glBegin(GL_LINE_LOOP);
+    {
+        glVertex3d(x1, y0, z0);
+        glVertex3d(x1, y0, z1);
+        glVertex3d(x1, y1, z1);
+        glVertex3d(x1, y1, z0);
+    }
+    glEnd();
+
+#ifdef notdef
+    /* Rappture doesn't supply axis units yet. So turn labeling off until we
+     * can display the proper units with the distance of each bounding box
+     * dimension.
+     */
+    glColor4f(1.0f, 1.0f, 0.0f, 1.0f); 
+
+    if (NanoVis::fonts != NULL) {
+        double mv[16], prjm[16];
+        int viewport[4];
+        double wx, wy, wz;
+        double dx, dy, dz;
+
+        glGetDoublev(GL_MODELVIEW_MATRIX, mv);
+        glGetDoublev(GL_PROJECTION_MATRIX, prjm);
+        glGetIntegerv(GL_VIEWPORT, viewport);
         
-        glBegin(GL_LINE_LOOP);
-
-                glVertex3d(x0, y0, z0);
-                glVertex3d(x1, y0, z0);
-                glVertex3d(x1, y1, z0);
-                glVertex3d(x0, y1, z0);
-                
-        glEnd();
-
-        glBegin(GL_LINE_LOOP);
-
-                glVertex3d(x0, y0, z1);
-                glVertex3d(x1, y0, z1);
-                glVertex3d(x1, y1, z1);
-                glVertex3d(x0, y1, z1);
-                
-        glEnd();
-
-
-        glBegin(GL_LINE_LOOP);
-
-                glVertex3d(x0, y0, z0);
-                glVertex3d(x0, y0, z1);
-                glVertex3d(x0, y1, z1);
-                glVertex3d(x0, y1, z0);
-                
-        glEnd();
-
-        glBegin(GL_LINE_LOOP);
-
-                glVertex3d(x1, y0, z0);
-                glVertex3d(x1, y0, z1);
-                glVertex3d(x1, y1, z1);
-                glVertex3d(x1, y1, z0);
-                
-        glEnd();
-
-        glEnable(GL_TEXTURE_2D);
+        NanoVis::fonts->begin();
+        dx = x1 - x0;
+        dy = y1 - y0;
+        dz = z1 - z0;
+        if (gluProject((x0 + x1) * 0.5, y0, z0, mv, prjm, viewport, 
+                       &wx, &wy, &wz)) {
+            char buff[20];
+            double min, max;
+
+            NanoVis::grid->xAxis.GetDataLimits(min, max);
+            glLoadIdentity();
+            glTranslatef((int)wx, viewport[3] - (int) wy, 0.0f);
+            const char *units;
+            units = NanoVis::grid->xAxis.GetUnits();
+            sprintf(buff, "%.*g %s", NUMDIGITS, max - min, units);
+            NanoVis::fonts->draw(buff);
+        }
+        if (gluProject(x0, (y0 + y1) * 0.5, z0, mv, prjm, viewport, &
+                       wx, &wy, &wz)) {
+            char buff[20];
+            double min, max;
+
+            NanoVis::grid->yAxis.GetDataLimits(min, max);
+            glLoadIdentity();
+            glTranslatef((int)wx, viewport[3] - (int) wy, 0.0f);
+            const char *units;
+            units = NanoVis::grid->yAxis.GetUnits();
+            sprintf(buff, "%.*g %s", NUMDIGITS, max - min, units);
+            NanoVis::fonts->draw(buff);
+        }
+        if (gluProject(x0, y0, (z0 + z1) * 0.5, mv, prjm, viewport, 
+                       &wx, &wy, &wz)) {
+            glLoadIdentity();
+            glTranslatef((int)wx, viewport[3] - (int) wy, 0.0f);
+
+            double min, max;
+            NanoVis::grid->zAxis.GetDataLimits(min, max);
+            const char *units;
+            units = NanoVis::grid->zAxis.GetUnits();
+            char buff[20];
+            sprintf(buff, "%.*g %s", NUMDIGITS, max - min, units);
+            NanoVis::fonts->draw(buff);
+        }
+        NanoVis::fonts->end();
+    };
+#endif
+    glPopMatrix();
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
 }
 
@@ -793 +869 @@
   vertex[7][0]=x1; vertex[7][1]=y1; vertex[7][2]=z1; vertex[7][3]=1.0;
 
-  for(int i=0;i<8;i++)
-  {
+  for(int i=0;i<8;i++) {
     Vector4 tmp = mv.transform(Vector4(vertex[i][0], vertex[i][1], vertex[i][2], vertex[i][3]));
     tmp.perspective_devide();
@@ -834 +909 @@
 
     /* make sure the file is there and open it read-only (binary) */
-    if ((file = fopen(filename, "rb")) == NULL)
-    {
-      assert(false);
-    }
-    
-    if(!fread(&bfType, sizeof(short int), 1, file))
-    {
-      assert(false);
-      //printf("Error reading file!\n");
+    if ((file = fopen(filename, "rb")) == NULL) {
+        fprintf(stderr, "can't open font file \"%s\"\n", filename);
+        abort();
+    }
+    
+    if(!fread(&bfType, sizeof(short int), 1, file)) {
+        fprintf(stderr, "can't read 2 bytes from font file \"%s\"\n", filename);
+        abort();
     }
     
     /* check if file is a bitmap */
-    if (bfType != 19778)
-    {
-      assert(false);
-      //printf("Not a Bitmap-File!\n");
+    if (bfType != 19778) {
+        assert(false);
+        //printf("Not a Bitmap-File!\n");
     }
     
@@ -857 +930 @@
     
     /* get the position of the actual bitmap data */
-    if (!fread(&bfOffBits, sizeof(long int), 1, file))
-    {
-      assert(false);
-      //printf("Error reading file!\n");
+    if (!fread(&bfOffBits, sizeof(long int), 1, file)) {
+        assert(false);
+        //printf("Error reading file!\n");
     }
     //printf("Data at Offset: %ld\n", bfOffBits);
@@ -884 +956 @@
     
     /* get the number of bits per pixel */
-    if (!fread(&biBitCount, sizeof(short int), 1, file))
-    {
-      assert(false);
-      //printf("Error reading file!\n");
-      //return 0;
+    if (!fread(&biBitCount, sizeof(short int), 1, file)) {
+        assert(false);
+        //printf("Error reading file!\n");
+        //return 0;
     }
     
     //printf("Bits per Pixel: %d\n", biBitCount);
-    if (biBitCount != 24)
-    {
-      assert(false);
-      //printf("Bits per Pixel not 24\n");
-      //return 0;
+    if (biBitCount != 24) {
+        assert(false);
+        //printf("Bits per Pixel not 24\n");
+        //return 0;
     }
 
@@ -907 +977 @@
     /* seek to the actual data */
     fseek(file, bfOffBits, SEEK_SET);
-    if (!fread(data, biSizeImage, 1, file))
-    {
-       assert(false);
-       //printf("Error loading file!\n");
-    }
-
+    if (!fread(data, biSizeImage, 1, file)) {
+        assert(false);
+        //printf("Error loading file!\n");
+    }
+    
     /* swap red and blue (bgr -> rgb) */
-    for (i = 0; i < biSizeImage; i += 3)
-    {
+    for (i = 0; i < biSizeImage; i += 3) {
        temp = data[i];
        data[i] = data[i + 2];

trunk/packages/vizservers/nanovis/config.h

@@ -22 +22 @@
 //#define DO_RLE  //do run length compression
 
+/* 
+ * The following define controls whether new prototype features are to be
+ * compiled.  Right now by default it's off (0). That's because nanovis
+ * releases are built directly from the subversion repository.  So for now,
+ * we'll rely on developers to set this in their respective sandboxes.
+ */
+#define PROTOTYPE               0
+
+/* 
+ * The following define controls whether new load_volume_stream or
+ * load_volume_stream2 are used to load DX data.  The difference is that
+ * load_volume_stream2 doesn't do any interpolation of the points to a coarser
+ * mesh.  Right now, we're using load_volume_stream2 to make isosurfaces
+ * work correctly.  
+
+ * [In the future, we'll use the OpenDX library reader and determine at
+ * runtime if mesh decimation is required]
+ */
+#define ISO_TEST                1
+
+/* 
+ * The following define controls whether the plane* commands are 
+ * registered in the interpreter.  Right now it's off.  [Are these
+ * commands still required?]
+ */
+#define PLANE_CMD               0
+
 #endif 

trunk/packages/vizservers/nanovis/dxReader2.cpp

@@ -29 +29 @@
     // write the dx file to disk, because DXImportDX takes a file name
     // george suggested using a pipe here
+
+    // You can do it like this.  Give 
     sprintf(dxfilename, "/tmp/dx%d.dx", getpid());
 
@@ -37 +39 @@
     fclose(f);
 
-    Rappture::DX dxObj(dxfilename);
+    Rappture::DX dxObj(dxfilename, &outcome);
 
     if (remove(dxfilename) != 0) {

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -69 +69 @@
 #include <R2/R2FilePath.h>
 #include <R2/R2Fonts.h>
+
+#define SIZEOF_BMP_HEADER       54
 
 extern void NvInitCG(); // in Shader.cpp
@@ -104 +106 @@
 
 
+//frame buffer for final rendering
+NVISid NanoVis::final_fbo;
+NVISid NanoVis::final_color_tex;
+NVISid NanoVis::final_depth_rb;
+
 // pointers to volumes, currently handle up to 10 volumes
 /*FIXME: Is the above comment true? Is there a 10 volume limit */
@@ -139 +146 @@
 //static Lic* lic;
 
-//frame buffer for final rendering
-static NVISid final_fbo, final_color_tex, final_depth_rb;
 
 //bool advect=false;
@@ -253 +258 @@
 
 //report errors related to CG shaders
-void cgErrorCallback(void)
+void 
+cgErrorCallback(void)
 {
     CGerror lastError = cgGetError();
@@ -408 +414 @@
     //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screen_buffer); // INSOO's
 
-    std::ostringstream result;
-    result << "nv>legend " << volArg;
-    result << " " << min;
-    result << " " << max;
-    bmp_write(result.str().c_str());
+    char prefix[200];
+    sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
+    ppm_write(prefix);
     write(0, "\n", 1);
 
@@ -529 +533 @@
     CHECK_FRAMEBUFFER_STATUS();
     //assert(glGetError()==0);
-    fprintf(stdin,"  after assert\n");
-}
-
+}
+
+/*
+ * FIXME: This routine is fairly expensive (60000 floating pt divides).  
+ *        I've put an ifdef around the call to it so that the released
+ *        builds don't include it.  Define PROTOTYPE to 1 in config.h 
+ *        to turn it back on.
+ */
 void 
 make_test_2D_data()
 {
-
     int w = 300;
     int h = 200;
@@ -640 +648 @@
     
     particleRenderer = new NvParticleRenderer(NMESH, NMESH, g_context);
+
+#if PROTOTYPE
     licRenderer = new NvLIC(NMESH, NPIX, NPIX, 0.5, g_context);
+#endif
 
     ImageLoaderFactory::getInstance()->addLoaderImpl("bmp", new BMPImageLoaderImpl());
-
     grid = new Grid();
     grid->setFont(fonts);
@@ -722 +732 @@
    //create an 2D plane renderer
    plane_render = new PlaneRenderer(g_context, win_width, win_height);
+#if PROTOTYPE
    make_test_2D_data();
-
+#endif  /* PROTOTYPE */
    plane_render->add_plane(plane[0], get_transfunc("default"));
 
@@ -732 +743 @@
    NanoVis::init_lic(); 
 #endif
-}
-
-void 
-NanoVis::read_screen()
-{
-    glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, 
-                 screen_buffer);
 }
 
@@ -780 +784 @@
 
 // used internally to build up the BMP file header
-// writes an integer value into the header data structure at pos
-static void
+// Writes an integer value into the header data structure at pos
+static inline void
 bmp_header_add_int(unsigned char* header, int& pos, int data)
 {
+#ifdef WORDS_BIGENDIAN
+    header[pos++] = (data >> 24) & 0xFF;
+    header[pos++] = (data >> 16) & 0xFF;
+    header[pos++] = (data >> 8)  & 0xFF;
+    header[pos++] = (data)       & 0xFF;
+#else
     header[pos++] = data & 0xff;
     header[pos++] = (data >> 8) & 0xff;
     header[pos++] = (data >> 16) & 0xff;
     header[pos++] = (data >> 24) & 0xff;
+#endif
 }
 
@@ -793 +804 @@
 // FOR DEBUGGING
 void
-NanoVis::bmp_write_to_file(int frame_number, char* directory_name)
-{
-    unsigned char header[54];
+NanoVis::bmp_write_to_file(int frame_number, const char *directory_name)
+{
+    unsigned char header[SIZEOF_BMP_HEADER];
     int pos = 0;
     header[pos++] = 'B';
@@ -808 +819 @@
 
     // file size in bytes
-    int fsize = (3*win_width+pad)*win_height + sizeof(header);
+    int fsize = (3*win_width+pad)*win_height + SIZEOF_BMP_HEADER;
     bmp_header_add_int(header, pos, fsize);
 
@@ -815 +826 @@
 
     // offset in bytes to start of bitmap data
-    bmp_header_add_int(header, pos, sizeof(header));
+    bmp_header_add_int(header, pos, SIZEOF_BMP_HEADER);
 
     // size of the BITMAPINFOHEADER
@@ -875 +886 @@
         }
     }
-    fwrite((void*) header, sizeof(header), 1, f);
+    fwrite((void*) header, SIZEOF_BMP_HEADER, 1, f);
     fwrite((void*) screen_buffer, (3*win_width+pad)*win_height, 1, f);
     fclose(f);
@@ -881 +892 @@
 
 void
-NanoVis::bmp_write(const char* cmd)
-{
-    unsigned char header[54];
+NanoVis::bmp_write(const char *prefix)
+{
+    unsigned char header[SIZEOF_BMP_HEADER];
     int pos = 0;
-    header[pos++] = 'B';
-    header[pos++] = 'M';
 
     // BE CAREFUL:  BMP files must have an even multiple of 4 bytes
@@ -894 +903 @@
         pad = 4 - ((3*win_width) % 4);
     }
+    pad = 0;
+    int fsize = (3*win_width+pad)*win_height + sizeof(header);
+
+    char string[200];
+    sprintf(string, "%s %d\n", prefix, fsize);
+    write(0, string, strlen(string));
+
+    header[pos++] = 'B';
+    header[pos++] = 'M';
 
     // file size in bytes
-    int fsize = (3*win_width+pad)*win_height + sizeof(header);
     bmp_header_add_int(header, pos, fsize);
 
@@ -903 +920 @@
 
     // offset in bytes to start of bitmap data
-    bmp_header_add_int(header, pos, sizeof(header));
+    bmp_header_add_int(header, pos, SIZEOF_BMP_HEADER);
 
     // size of the BITMAPINFOHEADER
@@ -944 +961 @@
     }
 
-    std::ostringstream result;
-    result << cmd << " " << fsize << "\n";
-    write(0, result.str().c_str(), result.str().size());
-
-    write(0, header, sizeof(header));
+    write(0, header, SIZEOF_BMP_HEADER);
     write(0, screen_buffer, (3*win_width+pad)*win_height);
-
+}
+
+/*
+ * ppm_write --
+ *
+ *      Writes the screen image as PPM binary data to the nanovisviewer
+ *      client.  The PPM binary format is very simple.  
+ *
+ *              P6 w h 255\n
+ *              3-byte RGB pixel data.
+ *
+ *      The nanovisviewer client (using the TkImg library) will do less work
+ *      to unpack this format, as opposed to BMP or PNG.  (This doesn't
+ *      eliminate the need to look into DXT compression performed on the GPU).
+ *
+ *      Note that currently the image data from the screen is both row-padded
+ *      and the scan lines are reversed.  This routine could be made even
+ *      simpler (faster) if the screen buffer is an array of packed 3-bytes
+ *      per pixels (no padding) and where the origin is the top-left corner.
+ */
+void
+NanoVis::ppm_write(const char *prefix)
+{
+#define PPM_MAXVAL 255
+    char header[200];
+
+    // Generate the PPM binary file header
+    sprintf(header, "P6 %d %d %d\n", win_width, win_height, PPM_MAXVAL);
+
+    size_t header_length = strlen(header);
+    size_t data_length = win_width * win_height * 3;
+
+    char command[200];
+    sprintf(command, "%s %d\n", prefix, header_length + data_length);
+
+    size_t wordsPerRow = (win_width * 24 + 31) / 32;
+    size_t bytesPerRow = wordsPerRow * 4;
+    size_t rowLength = win_width * 3;
+    size_t nRecs = win_height + 2;
+
+    struct iovec *iov;
+    iov = (struct iovec *)malloc(sizeof(struct iovec) * nRecs);
+
+    // Write the nanovisviewer command, then the image header and data.
+    // Command
+    iov[0].iov_base = command;
+    iov[0].iov_len = strlen(command);
+    // Header of image data
+    iov[1].iov_base = header;
+    iov[1].iov_len = header_length;
+    // Image data.
+    int y;
+    unsigned char *srcRowPtr = screen_buffer;
+    for (y = win_height + 1; y >= 2; y--) {
+        iov[y].iov_base = srcRowPtr;
+        iov[y].iov_len = rowLength;
+        srcRowPtr += bytesPerRow;
+    }
+    writev(0, iov, nRecs);
+    free(iov);
 }
 
@@ -1022 +1094 @@
 }
 
-void 
-NanoVis::offscreen_buffer_capture()
-{
-    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
-}
-
-#ifdef notdef
-/* 
- * Is this routine being used? --gah
- */
-void 
-draw_bounding_box(float x0, float y0, float z0,
-                  float x1, float y1, float z1,
-                  float r, float g, float b, float line_width)
-{
-    glDisable(GL_TEXTURE_2D);
-    glColor4d(r, g, b, 1.0);
-    glLineWidth(line_width);
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x0, y0, z0);
-        glVertex3d(x1, y0, z0);
-        glVertex3d(x1, y1, z0);
-        glVertex3d(x0, y1, z0);
-    }
-    glEnd();
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x0, y0, z1);
-        glVertex3d(x1, y0, z1);
-        glVertex3d(x1, y1, z1);
-        glVertex3d(x0, y1, z1);
-    }
-    glEnd();
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x0, y0, z0);
-        glVertex3d(x0, y0, z1);
-        glVertex3d(x0, y1, z1);
-        glVertex3d(x0, y1, z0);
-    }
-    glEnd();
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x1, y0, z0);
-        glVertex3d(x1, y0, z1);
-        glVertex3d(x1, y1, z1);
-        glVertex3d(x1, y1, z0);
-    }
-    glEnd();
-    glEnable(GL_TEXTURE_2D);
-}
-#endif
-
 
 #ifdef notdef
@@ -1091 +1109 @@
 void soft_read_verts()
 {
-    glReadPixels(0, 0, psys->psys_width, psys->psys_height, GL_RGB, GL_FLOAT, vert);
+    glReadPixels(0, 0, psys->psys_width, psys->psys_height, GL_RGB, GL_FLOAT, 
+                 vert);
     //fprintf(stderr, "soft_read_vert");
     
@@ -1542 +1561 @@
         glEnable(GL_TEXTURE_2D);
         glEnable(GL_DEPTH_TEST);
-        
+
         //camera setting activated
         cam->activate();
@@ -1874 +1893 @@
 main(int argc, char** argv) 
 {
-
     char *path;
     path = NULL;

trunk/packages/vizservers/nanovis/nanovis.h

@@ -101 +101 @@
 
 class NanoVis {
+    //frame buffer for final rendering
+    static NVISid final_fbo, final_color_tex, final_depth_rb;
 public:
     static VolumeRenderer* vol_renderer;
@@ -139 +141 @@
     static bool vector_on;
 
+
     static TransferFunction* get_transfunc(const char *name);
     static TransferFunction* DefineTransferFunction(const char *name, 
@@ -150 +153 @@
     static void initParticle();
     static void resize_offscreen_buffer(int w, int h);
-    static void offscreen_buffer_capture(void);
-    static void bmp_write(const char* cmd);
-    static void bmp_write_to_file(int frame_number, char* directory_name);
+    static void ppm_write(const char *prefix);
+    static void bmp_write(const char *prefix);
+    static void bmp_write_to_file(int frame_number, const char* directory_name);
     static void display(void);
     static void update(void);
     static void display_offscreen_buffer();
-    static void read_screen();
     static void zoom(double zoom);
     static int render_legend(TransferFunction *tf, double min, double max, 
@@ -169 +171 @@
     static void update_trans(int delta_x, int delta_y, int delta_z);
 #endif
+
+    static void read_screen(void) {
+        glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, 
+                     screen_buffer);
+    }
+    static void offscreen_buffer_capture(void) {
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
+    }
 };