Changeset 5702 for nanovis


Ignore:
Timestamp:
Jun 16, 2015, 4:33:25 PM (4 years ago)
Author:
ldelgass
Message:

Merge r5613 from nanovis trunk

Location:
nanovis/branches/1.2
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/Flow.cpp

    r5701 r5702  
    333333        }
    334334    }
     335}
     336
     337void
     338Flow::data(Unirect3d *unirect)
     339{
     340    float *vdata = getScaledVector(unirect);
     341    _volume = makeVolume(unirect, vdata);
     342    delete [] vdata;
     343    delete unirect;
     344    initVolume();
     345    scaleVectorField();
     346}
     347
     348void
     349Flow::data(Volume *volume)
     350{
     351    _volume = volume;
     352    initVolume();
     353    scaleVectorField();
    335354}
    336355
  • nanovis/branches/1.2/Flow.h

    r5588 r5702  
    2626#include "LIC.h"
    2727#include "VelocityArrowsSlice.h"
    28 #include "Unirect.h"
    2928#include "Volume.h"
    3029#include "TransferFunction.h"
    3130
    3231namespace nv {
     32
     33class Unirect3d;
    3334
    3435struct FlowValues {
     
    104105    }
    105106
    106     void data(Unirect3d *unirect)
    107     {
    108         float *vdata = getScaledVector(unirect);
    109         _volume = makeVolume(unirect, vdata);
    110         delete [] vdata;
    111         delete unirect;
    112         initVolume();
    113         scaleVectorField();
    114     }
    115 
    116     void data(Volume *volume)
    117     {
    118         _volume = volume;
    119         initVolume();
    120         scaleVectorField();
    121     }
     107    void data(Unirect3d *unirect);
     108
     109    void data(Volume *volume);
    122110
    123111    FlowSliceAxis getSliceAxis()
  • nanovis/branches/1.2/Makefile.in

    r5588 r5702  
    389389ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h
    390390ZincBlendeVolumeShader.o: ZincBlendeVolumeShader.cpp ZincBlendeVolumeShader.h VolumeShader.h Shader.h
    391 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h ZincBlendeReconstructor.h
     391dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h ZincBlendeVolume.h ZincBlendeReconstructor.h
    392392md5.o: md5.h
    393 nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h $(UTIL_DIR)/Fonts.h
     393nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h $(UTIL_DIR)/Fonts.h
    394394nanovisServer.o: nanovisServer.cpp nanovisServer.h config.h nanovis.h define.h Command.h PPMWriter.h ReadBuffer.h Shader.h ResponseQueue.h Trace.h
  • nanovis/branches/1.2/dxReader.cpp

    r5588 r5702  
    3939#include "nanovis.h"
    4040#include "dxReader.h"
    41 #include "Unirect.h"
    4241#include "Volume.h"
    4342
  • nanovis/branches/1.2/nanovis.cpp

    r5701 r5702  
    2020#include <cstdio>
    2121#include <cmath> // for fmod()
     22#include <cfloat>
    2223
    2324#include <GL/glew.h>
     
    5152#include "Trace.h"
    5253#include "TransferFunction.h"
    53 #include "Unirect.h"
    5454#include "VelocityArrowsSlice.h"
    5555#include "Volume.h"
Note: See TracChangeset for help on using the changeset viewer.