Changeset 5703


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

merge r5702 from nanovis 1.2 branch to sync

Location:
nanovis/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk

  • nanovis/trunk/Flow.cpp

    r5586 r5703  
    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/trunk/Flow.h

    r5587 r5703  
    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/trunk/nanovis.cpp

    r5613 r5703  
    2020#include <cstdio>
    2121#include <cmath> // for fmod()
     22#include <cfloat>
    2223
    2324#include <GL/glew.h>
Note: See TracChangeset for help on using the changeset viewer.