Changeset 4820 for nanovis


Ignore:
Timestamp:
Dec 7, 2014, 12:13:38 AM (5 years ago)
Author:
ldelgass
Message:

remove dead code

Location:
nanovis/branches/1.1
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/Command.cpp

    r4819 r4820  
    4747#include "CmdProc.h"
    4848#include "FlowCmd.h"
    49 #ifdef USE_POINTSET_RENDERER
    50 #include "PointSet.h"
    51 #endif
    5249#include "dxReader.h"
    5350#include "VtkReader.h"
     
    16261623               tf->name());
    16271624        (*iter)->transferFunction(tf);
    1628 #ifdef USE_POINTSET_RENDERER
    1629         // TBD..
    1630         if ((*iter)->pointsetIndex != -1) {
    1631             NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
    1632         }
    1633 #endif
    16341625    }
    16351626    return TCL_OK;
  • nanovis/branches/1.1/Makefile.in

    r4613 r4820  
    1 TRACE           = #yes
     1TRACE                   = #yes
     2USE_POINTSET_RENDERER   = #yes
     3USE_PARTICLE_SYSTEM     = #yes
    24
    35SHELL = /bin/sh
     
    8890                $(GL_INC_SPEC) \
    8991                $(RP_INC_SPEC)
    90 
    91 USE_POINTSET_RENDERER = #yes
    9292
    9393CC              = @CC@
     
    173173                $(srcdir)/shaders/zincblende_volume.cg
    174174
    175 ifdef NOTDEF
     175ifdef USE_PARTICLE_SYSTEM
    176176OBJS +=         ParticleEmitter.o \
    177177                ParticleSystem.o \
  • nanovis/branches/1.1/dxReader.cpp

    r4612 r4820  
    4343#include "ZincBlendeVolume.h"
    4444#include "NvZincBlendeReconstructor.h"
    45 #ifdef USE_POINTSET_RENDERER
    46 #include "PointSet.h"
    47 #endif
    4845
    4946/**
     
    488485    volume->updatePending = true;
    489486
    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 #endif
    499487    delete [] data;
    500488
  • nanovis/branches/1.1/nanovis.cpp

    r4804 r4820  
    6868#include "NvZincBlendeReconstructor.h"
    6969#include "PlaneRenderer.h"
    70 #ifdef USE_POINTSET_RENDERER
    71 #include "PointSetRenderer.h"
    72 #include "PointSet.h"
    73 #endif
    7470#include "Switch.h"
    7571#include "Trace.h"
     
    136132NvLIC *NanoVis::licRenderer = NULL;
    137133PlaneRenderer *NanoVis::planeRenderer = NULL;
    138 #ifdef USE_POINTSET_RENDERER
    139 PointSetRenderer *NanoVis::pointSetRenderer = NULL;
    140 std::vector<PointSet *> NanoVis::pointSet;
    141 #endif
    142134
    143135Tcl_Interp *NanoVis::interp;
     
    201193        screenBuffer = NULL;
    202194    }
    203 #ifdef USE_POINTSET_RENDERER
    204     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 #endif
    214195    if (fonts != NULL) {
    215196        TRACE("Deleting fonts");
     
    871852    grid = new Grid();
    872853    grid->setFont(fonts);
    873 
    874 #ifdef USE_POINTSET_RENDERER
    875     pointSetRenderer = new PointSetRenderer();
    876 #endif
    877854}
    878855
  • nanovis/branches/1.1/nanovis.h

    r4810 r4820  
    204204    static PlaneRenderer *planeRenderer;
    205205
    206 #ifdef USE_POINTSET_RENDERER
    207     static PointSetRenderer *pointSetRenderer;
    208     static std::vector<PointSet *> pointSet;
    209 #endif
    210 
    211206    static Tcl_Interp *interp;
    212207
Note: See TracChangeset for help on using the changeset viewer.