Changeset 4611 for nanovis/branches/1.1/nanovis.cpp

Timestamp:

Aug 2, 2014 1:45:12 AM (6 years ago)

Author:

ldelgass

Message:

merge r3596 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• nanovis.cpp (modified) (4 diffs)

nanovis/branches/1.1/nanovis.cpp

@@ -64 +64 @@
 #include "NvCamera.h"
 #include "NvShader.h"
-#include "NvColorTableRenderer.h"
 #include "NvFlowVisRenderer.h"
 #include "NvLIC.h"
@@ -144 +143 @@
 vrmath::Vector3f NanoVis::sceneMin, NanoVis::sceneMax;
 
-NvColorTableRenderer *NanoVis::colorTableRenderer = NULL;
 VolumeRenderer *NanoVis::volRenderer = NULL;
 #ifdef notdef
@@ -196 +194 @@
         TRACE("Deleting planeRenderer");
         delete planeRenderer;
-    }
-    if (colorTableRenderer != NULL) {
-        TRACE("Deleting colorTableRenderer");
-        delete colorTableRenderer;
     }
     if (legendTexture != NULL) {
@@ -890 +884 @@
     fonts->setFont("verdana");
 
-    colorTableRenderer = new NvColorTableRenderer();
-    colorTableRenderer->setFonts(fonts);
 #ifdef notdef
     flowVisRenderer = new NvFlowVisRenderer(NMESH, NMESH);