Changeset 4889 for nanovis/branches/1.1/nanovis.h

Timestamp:

Dec 19, 2014 10:00:34 PM (9 years ago)

Author:

ldelgass

Message:

Merge r3611:3618 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• nanovis.h (modified) (5 diffs)

nanovis/branches/1.1/nanovis.h

@@ -40 +40 @@
     class Fonts;
 }
-}
 
-class NvCamera;
+class Camera;
 class Flow;
 class Grid;
 class HeightMap;
-class NvLIC;
-class NvParticleRenderer;
+class LIC;
 class PlaneRenderer;
 class Texture2D;
@@ -91 +89 @@
     static void removeAllData();
 
-    static const NvCamera *getCamera()
+    static const Camera *getCamera()
     {
         return cam;
@@ -156 +154 @@
     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
@@ -172 +170 @@
     static VolumeRenderer *volRenderer;
     static VelocityArrowsSlice *velocityArrowsSlice;
-    static NvLIC *licRenderer;
+    static LIC *licRenderer;
     static PlaneRenderer *planeRenderer;
     static Grid *grid;
@@ -186 +184 @@
 };
 
+}
+
 #endif