Changeset 4899

Timestamp:

Dec 21, 2014, 11:55:58 PM (10 years ago)

Author:

ldelgass

Message:

Sync with release branch

Location:

nanovis/trunk

Files:

• Camera.h (modified) (1 diff)
• Command.cpp (modified) (1 diff)
• Flow.h (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• Volume.cpp (modified) (1 diff)

nanovis/trunk/Camera.h

@@ -35 +35 @@
     void setUpdir(AxisDirection dir)
     {
-         setUpDirMatrix(dir);
+        setUpDirMatrix(dir);
         _mvDirty = true;
     }

nanovis/trunk/Command.cpp

@@ -613 +613 @@
         return TCL_ERROR;
     }
-
     NanoVis::setCameraPosition(pos);
     return TCL_OK;

nanovis/trunk/Flow.h

@@ -131 +131 @@
     }
 #if 0
-    void setAxis(FlowSliceAxis axis)
+    void setSliceAxis(FlowSliceAxis axis)
     {
         _sv.slicePos.axis = axis;

nanovis/trunk/Makefile.in

@@ -381 +381 @@
 TransferFunction.o: TransferFunction.cpp
 Unirect.o: Unirect.cpp Unirect.h Command.h Trace.h
-VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h nanovis.h FlowTypes.h Camera.h Volume.h Shader.h 
+VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h nanovis.h FlowTypes.h Camera.h Volume.h Shader.h
 Volume.o: Volume.cpp Volume.h config.h define.h
 VolumeInterpolator.o: VolumeInterpolator.cpp VolumeInterpolator.h Volume.h

nanovis/trunk/Volume.cpp

@@ -50 +50 @@
     _cutplanesVisible(true),
     _tex(NULL),
-    _position(0,0,0),
-    _scale(1,1,1),
+    _position(0, 0, 0),
+    _scale(1, 1, 1),
     _numSlices(512),
     _enabled(true),