Changeset 3195 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/normalMapping.cg

Timestamp:

11/29/08 18:24:53 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/normalMapping.cg (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/normalMapping.cg

@@ -125 +125 @@
         float3x3 tangToWorldTrafo = transpose(float3x3(tangent, bitangent, normal));
         
-        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz * 2.0f - float3(1.0f);
+        //const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz * 2.0f - float3(1.0f);
+        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz;
+        pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
+        //pix.normal = tangentSpaceNorm;
         
-        pix.normal = normalize(mul(tangToWorldTrafo, tangentSpaceNorm));
-                
         return pix;
 }
@@ -171 +172 @@
         float3x3 tangToWorldTrafo = transpose(float3x3(IN.tangent.xyz, IN.bitangent.xyz, IN.normal.xyz));
         const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz;
-        pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
+        //pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
+        pix.normal = tangentSpaceNorm;
 
         return pix;