Changeset 5702

Timestamp:

Jun 16, 2015 1:33:25 PM (9 years ago)

Author:

ldelgass

Message:

Merge r5613 from nanovis trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Flow.cpp (modified) (1 diff)
• Flow.h (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• dxReader.cpp (modified) (1 diff)
• nanovis.cpp (modified) (2 diffs)

nanovis/branches/1.2/Flow.cpp

@@ -333 +333 @@
         }
     }
+}
+
+void
+Flow::data(Unirect3d *unirect)
+{
+    float *vdata = getScaledVector(unirect);
+    _volume = makeVolume(unirect, vdata);
+    delete [] vdata;
+    delete unirect;
+    initVolume();
+    scaleVectorField();
+}
+
+void
+Flow::data(Volume *volume)
+{
+    _volume = volume;
+    initVolume();
+    scaleVectorField();
 }
 

nanovis/branches/1.2/Flow.h

@@ -26 +26 @@
 #include "LIC.h"
 #include "VelocityArrowsSlice.h"
-#include "Unirect.h"
 #include "Volume.h"
 #include "TransferFunction.h"
 
 namespace nv {
+
+class Unirect3d;
 
 struct FlowValues {
@@ -104 +105 @@
     }
 
-    void data(Unirect3d *unirect)
-    {
-        float *vdata = getScaledVector(unirect);
-        _volume = makeVolume(unirect, vdata);
-        delete [] vdata;
-        delete unirect;
-        initVolume();
-        scaleVectorField();
-    }
-
-    void data(Volume *volume)
-    {
-        _volume = volume;
-        initVolume();
-        scaleVectorField();
-    }
+    void data(Unirect3d *unirect);
+
+    void data(Volume *volume);
 
     FlowSliceAxis getSliceAxis()

nanovis/branches/1.2/Makefile.in

@@ -389 +389 @@
 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h
 ZincBlendeVolumeShader.o: ZincBlendeVolumeShader.cpp ZincBlendeVolumeShader.h VolumeShader.h Shader.h
-dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h ZincBlendeReconstructor.h
+dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h ZincBlendeVolume.h ZincBlendeReconstructor.h
 md5.o: md5.h
-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
+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 VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h $(UTIL_DIR)/Fonts.h
 nanovisServer.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

@@ -39 +39 @@
 #include "nanovis.h"
 #include "dxReader.h"
-#include "Unirect.h"
 #include "Volume.h"
 

nanovis/branches/1.2/nanovis.cpp

@@ -20 +20 @@
 #include <cstdio>
 #include <cmath> // for fmod()
+#include <cfloat>
 
 #include <GL/glew.h>
@@ -51 +52 @@
 #include "Trace.h"
 #include "TransferFunction.h"
-#include "Unirect.h"
 #include "VelocityArrowsSlice.h"
 #include "Volume.h"