- Timestamp:
- Dec 6, 2014, 9:13:38 PM (10 years ago)
- Location:
- nanovis/branches/1.1
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/branches/1.1/Command.cpp
r4819 r4820 47 47 #include "CmdProc.h" 48 48 #include "FlowCmd.h" 49 #ifdef USE_POINTSET_RENDERER50 #include "PointSet.h"51 #endif52 49 #include "dxReader.h" 53 50 #include "VtkReader.h" … … 1626 1623 tf->name()); 1627 1624 (*iter)->transferFunction(tf); 1628 #ifdef USE_POINTSET_RENDERER1629 // TBD..1630 if ((*iter)->pointsetIndex != -1) {1631 NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);1632 }1633 #endif1634 1625 } 1635 1626 return TCL_OK; -
nanovis/branches/1.1/Makefile.in
r4613 r4820 1 TRACE = #yes 1 TRACE = #yes 2 USE_POINTSET_RENDERER = #yes 3 USE_PARTICLE_SYSTEM = #yes 2 4 3 5 SHELL = /bin/sh … … 88 90 $(GL_INC_SPEC) \ 89 91 $(RP_INC_SPEC) 90 91 USE_POINTSET_RENDERER = #yes92 92 93 93 CC = @CC@ … … 173 173 $(srcdir)/shaders/zincblende_volume.cg 174 174 175 ifdef NOTDEF175 ifdef USE_PARTICLE_SYSTEM 176 176 OBJS += ParticleEmitter.o \ 177 177 ParticleSystem.o \ -
nanovis/branches/1.1/dxReader.cpp
r4612 r4820 43 43 #include "ZincBlendeVolume.h" 44 44 #include "NvZincBlendeReconstructor.h" 45 #ifdef USE_POINTSET_RENDERER46 #include "PointSet.h"47 #endif48 45 49 46 /** … … 488 485 volume->updatePending = true; 489 486 490 // TBD..491 #if 0 && defined(USE_POINTSET_RENDERER)492 PointSet *pset = new PointSet();493 pset->initialize(volume, (float*)data);494 pset->setVisible(true);495 NanoVis::pointSet.push_back(pset);496 updateColor(pset);497 volume->pointsetIndex = NanoVis::pointSet.size() - 1;498 #endif499 487 delete [] data; 500 488 -
nanovis/branches/1.1/nanovis.cpp
r4804 r4820 68 68 #include "NvZincBlendeReconstructor.h" 69 69 #include "PlaneRenderer.h" 70 #ifdef USE_POINTSET_RENDERER71 #include "PointSetRenderer.h"72 #include "PointSet.h"73 #endif74 70 #include "Switch.h" 75 71 #include "Trace.h" … … 136 132 NvLIC *NanoVis::licRenderer = NULL; 137 133 PlaneRenderer *NanoVis::planeRenderer = NULL; 138 #ifdef USE_POINTSET_RENDERER139 PointSetRenderer *NanoVis::pointSetRenderer = NULL;140 std::vector<PointSet *> NanoVis::pointSet;141 #endif142 134 143 135 Tcl_Interp *NanoVis::interp; … … 201 193 screenBuffer = NULL; 202 194 } 203 #ifdef USE_POINTSET_RENDERER204 if (pointSetRenderer != NULL) {205 TRACE("Deleting pointSetRenderer");206 delete pointSetRenderer;207 }208 for (std::vector<PointSet *>::iterator itr = pointSet.begin();209 itr != pointSet.end(); ++itr) {210 TRACE("Deleting pointSet: %p", *itr);211 delete (*itr);212 }213 #endif214 195 if (fonts != NULL) { 215 196 TRACE("Deleting fonts"); … … 871 852 grid = new Grid(); 872 853 grid->setFont(fonts); 873 874 #ifdef USE_POINTSET_RENDERER875 pointSetRenderer = new PointSetRenderer();876 #endif877 854 } 878 855 -
nanovis/branches/1.1/nanovis.h
r4810 r4820 204 204 static PlaneRenderer *planeRenderer; 205 205 206 #ifdef USE_POINTSET_RENDERER207 static PointSetRenderer *pointSetRenderer;208 static std::vector<PointSet *> pointSet;209 #endif210 211 206 static Tcl_Interp *interp; 212 207
Note: See TracChangeset
for help on using the changeset viewer.