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

Timestamp:

Mar 23, 2012 1:31:05 AM (12 years ago)

Author:

ldelgass

Message:

Some minor refactoring, also add some more fine grained config.h defines
(e.g. replace NV40 define with feature defines). Add tests for some required
OpenGL extensions (should always check for extensions or base version before
calling entry points from the extension). Also, clamp diffuse and specular
values on input and warn when they are out of range.

File:

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

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

@@ -20 +20 @@
     v2f OUT;
 
+    // IN.Position is in eye coords
+    float4 objPos = mul(modelViewInv, IN.Position);
+    float4 eyePosObjSpace = mul(modelViewInv, float4(0,0,0,1));
+
     //clip space vertex position
-    OUT.HPosition = mul(modelViewProjMatrix, mul(modelViewInv, IN.Position));
+    //OUT.HPosition = mul(modelViewProjMatrix, mul(modelViewInv, IN.Position));
+    OUT.HPosition = mul(modelViewProjMatrix, objPos);
 
     //eye space texture coordinates
@@ -27 +32 @@
 
     //world space eye position
-    OUT.EyeVector = normalize(-IN.Position.xyz);
+    //OUT.EyeVector = normalize(-IN.Position.xyz);
+    OUT.EyeVector = normalize(eyePosObjSpace - objPos);
 
     //world space light postion
-    OUT.Light = normalize(float3(1,1,1)-IN.Position.xyz);
+    //OUT.Light = normalize(float3(1,1,1)-IN.Position.xyz);
+    OUT.Light = normalize(mul(modelViewInv, float4(1,1,1,1))-objPos);
 
     return OUT;