Changeset 3630 for trunk/packages/vizservers/nanovis/shaders/vertex_std.cg

Timestamp:

Apr 16, 2013, 12:52:20 AM (12 years ago)

Author:

ldelgass

Message:

Nanovis refactoring to fix problems with scaling and multiple results.
Do rendering in world space to properly place and scale multiple data sets.
Also fix flows to reduce resets of animations. More work toward removing
Cg dependency. Fix panning to convert viewport coords to world coords.

File:

• trunk/packages/vizservers/nanovis/shaders/vertex_std.cg (modified) (3 diffs)

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

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * ======================================================================
- *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
- *           Purdue Rendering and Perceptualization Lab (PURPL)
+ * Copyright (c) 2004-2013  HUBzero Foundation, LLC
  *
- *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
- *
- *  See the file "license.terms" for information on usage and
- *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- * ======================================================================
+ * Authors:
+ *   Wei Qiao <qiaow@purdue.edu>
  */
 
@@ -16 +11 @@
 v2f main(a2v IN,
          uniform float4x4 modelViewProjMatrix,
-         uniform float4x4 modelViewInv)
+         uniform float4x4 modelViewInv,
+         uniform float4 light0Position,
+         uniform float4 objPlaneS,
+         uniform float4 objPlaneT,
+         uniform float4 objPlaneR)
 {
     v2f OUT;
@@ -24 +23 @@
     float4 eyePosObjSpace = mul(modelViewInv, float4(0,0,0,1));
 
-    //clip space vertex position
-    //OUT.HPosition = mul(modelViewProjMatrix, mul(modelViewInv, IN.Position));
+    // Clip space vertex position
     OUT.HPosition = mul(modelViewProjMatrix, objPos);
 
-    //eye space texture coordinates
-    OUT.TexCoord = IN.TexCoord;
+    // Generate world space texture coordinates
+    OUT.TexCoord.x = dot(objPos, objPlaneS);
+    OUT.TexCoord.y = dot(objPos, objPlaneT);
+    OUT.TexCoord.z = dot(objPos, objPlaneR);
 
-    //world space eye position
-    //OUT.EyeVector = normalize(-IN.Position.xyz);
+    // World space eye position
     OUT.EyeVector = normalize(eyePosObjSpace - objPos);
 
-    //world space light postion
-    //OUT.Light = normalize(float3(1,1,1)-IN.Position.xyz);
-    OUT.Light = normalize(mul(modelViewInv, float4(1,1,1,1))-objPos);
+    // World space light postion (light0Position is in eye coords)
+    OUT.Light = normalize(mul(modelViewInv, light0Position)-objPos);
 
     return OUT;