Changeset 4897 for nanovis/trunk

Timestamp:

Dec 21, 2014 5:12:14 PM (6 years ago)

Author:

ldelgass

Message:

add header deps

Location:

nanovis/trunk

Files:

• Makefile.in (modified) (2 diffs)
• ReaderCommon.cpp (modified) (1 diff)
• Volume.h (modified) (2 diffs)
• dxReader.cpp (modified) (1 diff)
• nanovis.h (modified) (1 diff)

nanovis/trunk/Makefile.in

@@ -352 +352 @@
 Grid.o: Grid.cpp Grid.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h $(VRMATH_DIR)/include/vrmath/Color4f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
 HeightMap.o: HeightMap.cpp HeightMap.h Shader.h
-LIC.o: LIC.cpp LIC.h Shader.h
+LIC.o: LIC.cpp LIC.h FlowTypes.h Shader.h define.h
 OrientationIndicator.o: OrientationIndicator.cpp OrientationIndicator.h
 ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
 ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
-ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h
+ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h FlowTypes.h define.h
 ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h
 ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h
@@ -381 +381 @@
 TransferFunction.o: TransferFunction.cpp
 Unirect.o: Unirect.cpp Unirect.h Command.h Trace.h
-VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h nanovis.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/ReaderCommon.cpp

@@ -66 +66 @@
  * \brief Normalize data to [0,1] based on vmin,vmax range
  * 
- * Data outside of given range is clamped, and NaNs are set to
- * -1 in the output
- *
  * \param data Float array of unnormalized data, will be normalized on return
  * \param count Number of elts in array
- * \param stride Stride between values in data array
  * \param vmin Minimum value in data array
  * \param vmax Maximum value in data array

nanovis/trunk/Volume.h

@@ -286 +286 @@
 
     void getOutlineColor(float *rgb);
-    
+
     void setPosition(const vrmath::Vector3f& pos)
-    { 
+    {
         _position = pos;
     }
@@ -298 +298 @@
 
     void setScale(const vrmath::Vector3f& scale)
-    { 
+    {
         _scale = scale;
     }

nanovis/trunk/dxReader.cpp

@@ -29 +29 @@
 #include <string>
 
-#include <RpField1D.h>
+#include <RpMesh1D.h>
 #include <RpFieldRect3D.h>
 #include <RpFieldPrism3D.h>

nanovis/trunk/nanovis.h

@@ -30 +30 @@
 #include "config.h"
 #include "Camera.h"
-#include "FlowTypes.h"
 
 //defines for the image based flow visualization