Changeset 4820

Timestamp:

Dec 6, 2014, 9:13:38 PM (10 years ago)

Author:

ldelgass

Message:

remove dead code

Location:

nanovis/branches/1.1

Files:

• Command.cpp (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• dxReader.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (4 diffs)
• nanovis.h (modified) (1 diff)

nanovis/branches/1.1/Command.cpp

@@ -47 +47 @@
 #include "CmdProc.h"
 #include "FlowCmd.h"
-#ifdef USE_POINTSET_RENDERER
-#include "PointSet.h"
-#endif
 #include "dxReader.h"
 #include "VtkReader.h"
@@ -1626 +1623 @@
                tf->name());
         (*iter)->transferFunction(tf);
-#ifdef USE_POINTSET_RENDERER
-        // TBD..
-        if ((*iter)->pointsetIndex != -1) {
-            NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
-        }
-#endif
     }
     return TCL_OK;

nanovis/branches/1.1/Makefile.in

@@ -1 @@
-TRACE           = #yes
+TRACE                   = #yes
+USE_POINTSET_RENDERER   = #yes
+USE_PARTICLE_SYSTEM     = #yes
 
 SHELL = /bin/sh
@@ -88 +90 @@
                 $(GL_INC_SPEC) \
                 $(RP_INC_SPEC)
-
-USE_POINTSET_RENDERER = #yes
 
 CC              = @CC@
@@ -173 +173 @@
                 $(srcdir)/shaders/zincblende_volume.cg
 
-ifdef NOTDEF
+ifdef USE_PARTICLE_SYSTEM
 OBJS +=         ParticleEmitter.o \
                 ParticleSystem.o \

nanovis/branches/1.1/dxReader.cpp

@@ -43 +43 @@
 #include "ZincBlendeVolume.h"
 #include "NvZincBlendeReconstructor.h"
-#ifdef USE_POINTSET_RENDERER
-#include "PointSet.h"
-#endif
 
 /**
@@ -488 +485 @@
     volume->updatePending = true;
 
-    // TBD..
-#if 0 && defined(USE_POINTSET_RENDERER)
-    PointSet *pset = new PointSet();
-    pset->initialize(volume, (float*)data);
-    pset->setVisible(true);
-    NanoVis::pointSet.push_back(pset);
-    updateColor(pset);
-    volume->pointsetIndex = NanoVis::pointSet.size() - 1;
-#endif
     delete [] data;
 

nanovis/branches/1.1/nanovis.cpp

@@ -68 +68 @@
 #include "NvZincBlendeReconstructor.h"
 #include "PlaneRenderer.h"
-#ifdef USE_POINTSET_RENDERER
-#include "PointSetRenderer.h"
-#include "PointSet.h"
-#endif
 #include "Switch.h"
 #include "Trace.h"
@@ -136 +132 @@
 NvLIC *NanoVis::licRenderer = NULL;
 PlaneRenderer *NanoVis::planeRenderer = NULL;
-#ifdef USE_POINTSET_RENDERER
-PointSetRenderer *NanoVis::pointSetRenderer = NULL;
-std::vector<PointSet *> NanoVis::pointSet;
-#endif
 
 Tcl_Interp *NanoVis::interp;
@@ -201 +193 @@
         screenBuffer = NULL;
     }
-#ifdef USE_POINTSET_RENDERER
-    if (pointSetRenderer != NULL) {
-        TRACE("Deleting pointSetRenderer");
-        delete pointSetRenderer;
-    }
-    for (std::vector<PointSet *>::iterator itr = pointSet.begin();
-         itr != pointSet.end(); ++itr) {
-        TRACE("Deleting pointSet: %p", *itr);
-        delete (*itr);
-    }
-#endif
     if (fonts != NULL) {
         TRACE("Deleting fonts");
@@ -871 +852 @@
     grid = new Grid();
     grid->setFont(fonts);
-
-#ifdef USE_POINTSET_RENDERER
-    pointSetRenderer = new PointSetRenderer();
-#endif
 }
 

nanovis/branches/1.1/nanovis.h

@@ -204 +204 @@
     static PlaneRenderer *planeRenderer;
 
-#ifdef USE_POINTSET_RENDERER
-    static PointSetRenderer *pointSetRenderer;
-    static std::vector<PointSet *> pointSet;
-#endif
-
     static Tcl_Interp *interp;