Changeset 2951 for trunk/packages/vizservers/nanovis/nanovis.h

Timestamp:

Apr 9, 2012, 8:25:40 AM (13 years ago)

Author:

ldelgass

Message:

Remove unused FlowVisRenderer? from build. Remove some unused globals from
nanovis.h, make Tcl command buffer a local. LIC renderer only needs a single
plane offset, not a vector, so change ctor.

File:

• trunk/packages/vizservers/nanovis/nanovis.h (modified) (5 diffs)

trunk/packages/vizservers/nanovis/nanovis.h

@@ -79 +79 @@
     static void displayOffscreenBuffer();
     static void display();
+    static void draw3dAxis();
     static void idle();
     static void update();
+    static void removeAllData();
 
     static void pan(float dx, float dy);
@@ -89 +91 @@
     static void setVolumeRanges();
     static void setHeightmapRanges();
-
+#ifdef notdef
     static void initParticle();
-
+#endif
     static void ppmWrite(const char *prefix);
     static void sendDataToClient(const char *command, const char *data,
@@ -155 +157 @@
     static int renderWindow;
     static unsigned char *screenBuffer;
+    static Texture2D *legendTexture;
     static Grid *grid;
     static R2Fonts *fonts;
@@ -161 +164 @@
     static graphics::RenderContext *renderContext;
 
+    static Tcl_HashTable tfTable;
     static Tcl_HashTable volumeTable;
-
-    static std::vector<NvVectorField *> flow;
     static Tcl_HashTable flowTable;
+    static Tcl_HashTable heightmapTable;
+
     static double magMin, magMax;
     static float xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
     static float xOrigin, yOrigin, zOrigin;
 
+    static NvColorTableRenderer *colorTableRenderer;
     static VolumeRenderer *volRenderer;
+#ifdef notdef
     static NvFlowVisRenderer *flowVisRenderer;
+#endif
     static VelocityArrowsSlice *velocityArrowsSlice;
     static NvLIC *licRenderer;
@@ -183 +190 @@
 #endif
 
-    static Tcl_HashTable tfTable;
-    static Texture2D *legendTexture;
-    static NvColorTableRenderer *colorTableRenderer;
-
-    static std::vector<HeightMap *> heightMap;
-    static Tcl_HashTable heightmapTable;
-
     static Tcl_Interp *interp;
-    static Tcl_DString cmdbuffer;
 
 private:
-    static float _licSliceX;
-    static float _licSliceY;
-    static float _licSliceZ;
-    static int _licAxis;     /* 0:x, 1:y, 2:z */
+    static float _licSlice;  ///< Slice position [0,1]
+    static int _licAxis;     ///< Slice axis: 0:x, 1:y, 2:z
 
     //frame buffer for final rendering