Changeset 4899 for nanovis


Ignore:
Timestamp:
Dec 22, 2014, 2:55:58 AM (4 years ago)
Author:
ldelgass
Message:

Sync with release branch

Location:
nanovis/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Camera.h

    r3936 r4899  
    3535    void setUpdir(AxisDirection dir)
    3636    {
    37          setUpDirMatrix(dir);
     37        setUpDirMatrix(dir);
    3838        _mvDirty = true;
    3939    }
  • nanovis/trunk/Command.cpp

    r4895 r4899  
    613613        return TCL_ERROR;
    614614    }
    615 
    616615    NanoVis::setCameraPosition(pos);
    617616    return TCL_OK;
  • nanovis/trunk/Flow.h

    r4056 r4899  
    131131    }
    132132#if 0
    133     void setAxis(FlowSliceAxis axis)
     133    void setSliceAxis(FlowSliceAxis axis)
    134134    {
    135135        _sv.slicePos.axis = axis;
  • nanovis/trunk/Makefile.in

    r4898 r4899  
    381381TransferFunction.o: TransferFunction.cpp
    382382Unirect.o: Unirect.cpp Unirect.h Command.h Trace.h
    383 VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h nanovis.h FlowTypes.h Camera.h Volume.h Shader.h 
     383VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h nanovis.h FlowTypes.h Camera.h Volume.h Shader.h
    384384Volume.o: Volume.cpp Volume.h config.h define.h
    385385VolumeInterpolator.o: VolumeInterpolator.cpp VolumeInterpolator.h Volume.h
  • nanovis/trunk/Volume.cpp

    r3935 r4899  
    5050    _cutplanesVisible(true),
    5151    _tex(NULL),
    52     _position(0,0,0),
    53     _scale(1,1,1),
     52    _position(0, 0, 0),
     53    _scale(1, 1, 1),
    5454    _numSlices(512),
    5555    _enabled(true),
Note: See TracChangeset for help on using the changeset viewer.