Changeset 5587 for nanovis/trunk

Timestamp:

May 21, 2015, 2:30:27 AM (9 years ago)

Author:

ldelgass

Message:

Some fixes from release branch

Location:

nanovis/trunk

Files:

• Flow.h (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• ParticleRenderer.cpp (modified) (1 diff)
• ParticleRenderer.h (modified) (1 diff)
• VelocityArrowsSlice.cpp (modified) (1 diff)
• dxReader.cpp (modified) (1 diff)
• shaders/update_pos.cg (modified) (2 diffs)

nanovis/trunk/Flow.h

@@ -121 +121 @@
     }
 
-    FlowSliceAxis getAxis()
+    FlowSliceAxis getSliceAxis()
     {
         return _sv.slicePos.axis;

nanovis/trunk/Makefile.in

@@ -355 +355 @@
 ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
 ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
-ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h FlowTypes.h define.h
+ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h ParticleAdvectionShader.h FlowTypes.h define.h
 ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h
 ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h

nanovis/trunk/ParticleRenderer.cpp

@@ -17 +17 @@
 
 #include "ParticleRenderer.h"
+#include "ParticleAdvectionShader.h"
 #include "Volume.h"
 #include "define.h"

nanovis/trunk/ParticleRenderer.h

@@ -118 +118 @@
     bool _flip;
 
-    float _maxLife;
+    unsigned int _maxLife;
 
     /// Size of the particle: default is 1.2

nanovis/trunk/VelocityArrowsSlice.cpp

@@ -469 +469 @@
     Vector3f bmin, bmax;
     volume->getBounds(bmin, bmax);
-    _origin.set(bmin.x, bmin.y, bmin.z);
+    _origin = bmin;
     _scale.set(bmax.x-bmin.x, bmax.y-bmin.y, bmax.z-bmin.z);
 

nanovis/trunk/dxReader.cpp

@@ -59 +59 @@
 nv::load_dx_volume_stream(const char *tag, std::iostream& fin)
 {
-    TRACE("Enter tag:%s", tag);
+    TRACE("Enter tag: %s", tag);
 
     Rappture::MeshTri2D xymesh;

nanovis/trunk/shaders/update_pos.cg

@@ -24 +24 @@
     float time = pos.w;
 
-    //reconstruct negative value
     if (max > 0) {
 #ifdef EXPIRE
@@ -34 +33 @@
         }
 #endif
+        //reconstruct negative value
         float4 vel = float4(tex3D(vel_tex, pos.xyz).yzw, 0.0) * 2.0 - float4(1.0, 1.0, 1.0, 0.0);
         vel = vel * max;