Changeset 2967 for trunk/packages/vizservers/nanovis/shaders

Timestamp:

Apr 13, 2012 2:37:25 PM (12 years ago)

Author:

ldelgass

Message:

Convert NvLIC to use new NvShader? parameter API. Also fixes for LIC when plane
is not XY plane. Remove unused/incomplete Renderable base class (source files
remain for now, but it is not part of default build).

File:

• trunk/packages/vizservers/nanovis/shaders/render_vel.cg (modified) (2 diffs)

trunk/packages/vizservers/nanovis/shaders/render_vel.cg

@@ -12 +12 @@
  */
 
-// update positions based on velocity
+// Project and sample 3D vector field on a 2D plane
 
 #include "common.cg"
@@ -18 +18 @@
 float4 main(in float3 uvw : TEXCOORD0,
             uniform sampler3D vel_tex,
-            uniform float4 plane_normal,
+            uniform float3 projection_vector,
+            uniform float timestep,
             uniform float vmax) : COLOR
 {
-    //float4 vel = float4(tex3D(vel_tex, uvw).xyz, 0) - float4(0.5, 0.5, 0.5, 0.0);
-    float4 vel = float4(tex3D(vel_tex, uvw).yzw, 0) - float4(0.5, 0.5, 0.5, 0.0);
-    vel = vel * (vmax * 2);
-    float4 ret = plane_normal * vel * 0.0005;
-
-    return float4(ret.xyz, 1);
+    float3 velocity = tex3D(vel_tex, uvw).yzw * 2.0 - float3(1.0, 1.0, 1.0);
+    velocity = velocity * projection_vector * vmax * timestep;
+    return float4(velocity, 1);
 }
-