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

Timestamp:

Apr 2, 2013, 8:02:50 PM (12 years ago)

Author:

ldelgass

Message:

Use nv namespace for classes in nanovis rather than prefixing class names with
Nv (still need to convert shader classes).

File:

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

trunk/packages/vizservers/nanovis/nanovis.h

@@ -49 +49 @@
     class Fonts;
 }
+
+class Camera;
+class Flow;
+class Grid;
+class HeightMap;
+class LIC;
 class OrientationIndicator;
-}
-
-class VolumeRenderer;
-class NvParticleRenderer;
-class VelocityArrowsSlice;
-class NvLIC;
 class PlaneRenderer;
 class Texture2D;
-class HeightMap;
-class Grid;
-class NvCamera;
 class TransferFunction;
+class VelocityArrowsSlice;
 class Volume;
-class Flow;
+class VolumeRenderer;
 
 class NanoVis
@@ -101 +99 @@
     static void removeAllData();
 
-    static const NvCamera *getCamera()
+    static const Camera *getCamera()
     {
         return cam;
@@ -161 +159 @@
     static unsigned char *screenBuffer;
     static Texture2D *legendTexture;
-    static nv::util::Fonts *fonts;
+    static util::Fonts *fonts;
     static int updir;
-    static NvCamera *cam;
-    static nv::graphics::RenderContext *renderContext;
+    static Camera *cam;
+    static graphics::RenderContext *renderContext;
 
     static TransferFunctionHashmap tfTable; ///< maps transfunc name to TransferFunction object
@@ -177 +175 @@
     static VolumeRenderer *volRenderer;
     static VelocityArrowsSlice *velocityArrowsSlice;
-    static NvLIC *licRenderer;
+    static LIC *licRenderer;
     static PlaneRenderer *planeRenderer;
-    static nv::OrientationIndicator *orientationIndicator;
+    static OrientationIndicator *orientationIndicator;
     static Grid *grid;
 
@@ -192 +190 @@
 };
 
+}
+
 #endif