Ignore:
Timestamp:
Aug 2, 2014, 2:06:20 PM (5 years ago)
Author:
ldelgass
Message:

merge r3597 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/nanovis.h

    r4611 r4612  
    5151class PointSetRenderer;
    5252class NvParticleRenderer;
    53 class NvFlowVisRenderer;
    5453class PlaneRenderer;
    5554class VelocityArrowsSlice;
     
    5857class Texture2D;
    5958class HeightMap;
    60 class NvVectorField;
    6159class Grid;
    6260class NvCamera;
    6361class TransferFunction;
    6462class Volume;
    65 class FlowCmd;
     63class Flow;
    6664
    6765class NanoVis
     
    8886    typedef std::tr1::unordered_map<TransferFunctionId, TransferFunction *> TransferFunctionHashmap;
    8987    typedef std::tr1::unordered_map<VolumeId, Volume *> VolumeHashmap;
    90     typedef std::tr1::unordered_map<FlowId, FlowCmd *> FlowHashmap;
     88    typedef std::tr1::unordered_map<FlowId, Flow *> FlowHashmap;
    9189    typedef std::tr1::unordered_map<HeightMapId, HeightMap *> HeightMapHashmap;
    9290
     
    134132
    135133    static Volume *loadVolume(const char *tag, int width, int height, int depth,
    136                               int n, float* data, double vmin, double vmax,
     134                              int numComponents, float *data, double vmin, double vmax,
    137135                              double nonZeroMin);
    138136
    139     static void removeVolume(Volume *volPtr);
     137    static void removeVolume(Volume *volume);
    140138
    141139    static void readScreen()
     
    149147    }
    150148
    151     static FlowCmd *getFlow(const char *name);
    152     static FlowCmd *createFlow(Tcl_Interp *interp, const char *name);
     149    static Flow *getFlow(const char *name);
     150    static Flow *createFlow(Tcl_Interp *interp, const char *name);
    153151    static void deleteFlow(const char *name);
    154152    static void deleteFlows(Tcl_Interp *interp);
     
    190188
    191189    static VolumeRenderer *volRenderer;
    192 #ifdef notdef
    193     static NvFlowVisRenderer *flowVisRenderer;
    194 #endif
    195190    static VelocityArrowsSlice *velocityArrowsSlice;
    196191    static NvLIC *licRenderer;
Note: See TracChangeset for help on using the changeset viewer.