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

Timestamp:

Apr 2, 2013, 8:02:50 PM (11 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.cpp (modified) (6 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -40 +40 @@
 #include "Grid.h"
 #include "HeightMap.h"
-#include "NvCamera.h"
-#include "NvLIC.h"
+#include "Camera.h"
+#include "LIC.h"
 #include "NvShader.h"
 #include "OrientationIndicator.h"
@@ -74 +74 @@
 Fonts *NanoVis::fonts;
 int NanoVis::updir = Y_POS;
-NvCamera *NanoVis::cam = NULL;
+Camera *NanoVis::cam = NULL;
 RenderContext *NanoVis::renderContext = NULL;
 
@@ -96 +96 @@
 VolumeRenderer *NanoVis::volRenderer = NULL;
 VelocityArrowsSlice *NanoVis::velocityArrowsSlice = NULL;
-NvLIC *NanoVis::licRenderer = NULL;
+LIC *NanoVis::licRenderer = NULL;
 PlaneRenderer *NanoVis::planeRenderer = NULL;
 OrientationIndicator *NanoVis::orientationIndicator = NULL;
@@ -318 +318 @@
         sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
 #ifdef USE_THREADS
-        queuePPM(nv::g_queue, prefix, screenBuffer, width, height);
+        queuePPM(g_queue, prefix, screenBuffer, width, height);
 #else
-        writePPM(nv::g_fdOut, prefix, screenBuffer, width, height);
+        writePPM(g_fdOut, prefix, screenBuffer, width, height);
 #endif
     }
@@ -544 +544 @@
 
     velocityArrowsSlice = new VelocityArrowsSlice;
-    licRenderer = new NvLIC(NMESH, NPIX, NPIX, _licAxis, _licSlice);
+    licRenderer = new LIC(NMESH, NPIX, NPIX, _licAxis, _licSlice);
 
     grid = new Grid();
@@ -564 +564 @@
 
     //create the camera with default setting
-    cam = new NvCamera(0, 0, winWidth, winHeight,
-                       def_eye_x, def_eye_y, def_eye_z);
+    cam = new Camera(0, 0, winWidth, winHeight,
+                     def_eye_x, def_eye_y, def_eye_z);
 
     glEnable(GL_TEXTURE_2D);