Changeset 5397 for nanovis/branches

Timestamp:

May 2, 2015 3:19:17 AM (9 years ago)

Author:

ldelgass

Message:

Hand merge fix for flow reset

Location:

nanovis/branches/1.2

Files:

• ParticleAdvectionShader.cpp (modified) (2 diffs)
• ParticleAdvectionShader.h (modified) (1 diff)
• ParticleRenderer.cpp (modified) (1 diff)
• shaders/update_pos.cg (modified) (1 diff)

nanovis/branches/1.2/ParticleAdvectionShader.cpp

@@ -27 +27 @@
 
 void 
-ParticleAdvectionShader::bind(unsigned int texID, unsigned int initPosTexID)
+ParticleAdvectionShader::bind(unsigned int texID, unsigned int initPosTexID, bool init)
 {
     setFPTextureParameter("pos_tex", texID);
@@ -34 +34 @@
 
     setFPParameter1f("timestep", _timeStep);
-    setFPParameter1f("max", _max);
+    setFPParameter1f("max", init ? 0 : _max);
     setFPParameter3f("scale", _scale.x, _scale.y, _scale.z);
 

nanovis/branches/1.2/ParticleAdvectionShader.h

@@ -20 +20 @@
     virtual ~ParticleAdvectionShader();
 
-    virtual void bind(unsigned int texID, unsigned int initPosTexID);
+    virtual void bind(unsigned int texID, unsigned int initPosTexID, bool init);
 
     virtual void unbind();

nanovis/branches/1.2/ParticleRenderer.cpp

@@ -261 +261 @@
     glLoadIdentity();
 
-    _advectionShader->bind(_psysTex[tex], _initPosTex);
+    _advectionShader->bind(_psysTex[tex], _initPosTex, _psysFrame == 0);
 
     draw_quad(_psysWidth, _psysHeight, _psysWidth, _psysHeight);

nanovis/branches/1.2/shaders/update_pos.cg

@@ -24 +24 @@
     float time = pos.w;
 
+    if (max > 0) {
 #ifdef EXPIRE
-    time -= timestep;
+        time -= timestep;
 
-    // Lifetime ended?
-    if (time < 0) {
-        return texRECT(init_pos_tex, uv);
+        // Lifetime ended?
+        if (time < 0) {
+            return texRECT(init_pos_tex, uv);
+        }
+#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;
+        //vel *= float4(scale, 1);
+        ret = pos + (vel * timestep);
+    } else {
+        ret = pos;
     }
-#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.0f);
-    vel = vel * max;
-    //vel *= float4(scale, 1);
-    ret = pos + (vel * timestep);
 
     //not drawing if the particle is out of bound