Changeset 2831 for trunk/packages/vizservers/nanovis/Command.cpp

Timestamp:

Mar 9, 2012, 10:12:14 AM (12 years ago)

Author:

ldelgass

Message:

Refactor texture classes, misc. cleanups, cut down on header pollution -- still
need to fix header deps in Makefile.in

File:

• trunk/packages/vizservers/nanovis/Command.cpp (modified) (12 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -24 +24 @@
 /*
  * TODO:  In no particular order...
- *        x Convert to Tcl_CmdObj interface. (done)
  *        o Use Tcl command option parser to reduce size of procedures, remove
  *          lots of extra error checking code. (almost there)
@@ -33 +32 @@
  *          the vector. 1) Use a list instead of a vector. 2) carry
  *          an id field that's a number that gets incremented each new volume.
- *        x Create R2, matrix, etc. libraries. (done)
  *        o Add bookkeeping for volumes, heightmaps, flows, etc. to track
  *          1) id #  2) simulation # 3) include/exclude.  The include/exclude
@@ -40 +38 @@
  */
 
-
-
 #include <assert.h>
 #include <stdlib.h>
+
 #include <tcl.h>
 
@@ -53 +50 @@
 #include <RpBuffer.h>
 
-#include "Trace.h"
 #include "nanovis.h"
 #include "CmdProc.h"
-#include "PointSetRenderer.h"
-#include "PointSet.h"
-#include "ZincBlendeVolume.h"
-#include "NvColorTableRenderer.h"
-#include "NvEventLog.h"
+#include "Trace.h"
+
+#if PLANE_CMD
+#include "PlaneRenderer.h"
+#endif
+#include "Grid.h"
+#include "HeightMap.h"
+#include "NvCamera.h"
 #include "NvZincBlendeReconstructor.h"
-#include "VolumeInterpolator.h"
-#include "HeightMap.h"
-#include "Grid.h"
-#include "NvCamera.h"
-#include "RenderContext.h"
-#include "NvLIC.h"
 #include "Unirect.h"
-
-#define PLANE_CMD               0
-
-// EXTERN DECLARATIONS
-// in Nv.cpp
-
-// in nanovis.cpp
-extern std::vector<PointSet*> g_pointSet;
-
-extern PlaneRenderer* plane_render;
-extern Texture2D* plane[10];
-
-// Tcl interpreter for incoming messages
+#include "VelocityArrowsSlice.h"
+#include "VolumeRenderer.h"
 
 // default transfer function
@@ -1506 +1488 @@
                tfPtr->name());
         (*iter)->transferFunction(tfPtr);
-#ifdef POINTSET
+#ifdef USE_POINTSET_RENDERER
         // TBD..
-        // POINTSET
-        if ((*iter)->pointsetIndex != -1) {
-            g_pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
-        }
-#endif /*POINTSET*/
+ //        if ((*iter)->pointsetIndex != -1) {
+//             NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
+//         }
+#endif
     }
     return TCL_OK;
@@ -2013 +1994 @@
 
 static Rappture::CmdSpec heightMapOps[] = {
-    {"create",       2, HeightMapCreateOp,      10, 10,
-     "tag xmin ymin xmax ymax xnum ynum values",},
+    {"create",       2, HeightMapCreateOp,      10, 10, "tag xmin ymin xmax ymax xnum ynum values",},
     {"cull",         2, HeightMapCullOp,        3, 3, "mode",},
     {"data",         1, HeightMapDataOp,        3, 0, "oper ?args?",},
@@ -2193 +2173 @@
     //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))];
+    char *tmp = new char[int(w*h*sizeof(float))];
     if (tmp == NULL) {
         Tcl_AppendResult(interp, "can't allocate stream data", (char *)NULL);
@@ -2204 +2184 @@
                                 // error and return a non-zero exit status.
     }
-    plane[index] = new Texture2D(w, h, GL_FLOAT, GL_LINEAR, 1, (float*)tmp);
+    NanoVis::plane[index] = new Texture2D(w, h, GL_FLOAT, GL_LINEAR, 1, (float*)tmp);
     delete[] tmp;
     return TCL_OK;
 }
-
 
 static int
@@ -2229 +2208 @@
         return TCL_ERROR;
     }
-    //plane_render->add_plane(plane[plane_index], tf[tf_index]);
+    //NanoVis::plane_renderer->add_plane(NanoVis::plane[plane_index], tf[tf_index]);
     return TCL_OK;
 }
@@ -2257 +2236 @@
         plane_index = -1;
     }
-    plane_render->set_active_plane(plane_index);
+    NanoVis::plane_renderer->set_active_plane(plane_index);
     return TCL_OK;
 }
@@ -2328 +2307 @@
 initTcl()
 {
-
     /*
      * Ideally the connection is authenticated by nanoscale.  I still like the
@@ -2350 +2328 @@
     Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   NULL, NULL);
     Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
+#if PLANE_CMD
+    Tcl_CreateObjCommand(interp, "plane",       PlaneCmd,       NULL, NULL);
+#endif
     Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      NULL, NULL);
     Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    NULL, NULL);