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

Timestamp:

11/20/08 10:12:28 (16 years ago)

Author:

mattausch

Message:

normal mapping hack not working yet. found problems with ssao if the geometry is not tesselated enough (especially with smoothed
normals: one can see the underlying tesselation!

File:

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

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

@@ -86 +86 @@
 
 
-/**************************************************************/
-/* Shader computing the MRT output for normal mapped geoemtry */
-/**************************************************************/
+/******************************************************************/
+/*   Shader computing the MRT output for normal mapped geometry   */
+/******************************************************************/
 
 
@@ -126 +126 @@
         // compute tangent space - world space transform which is the transpose,
         // as it is the inverse of a rotation matrix 
-        float3x3 tangToWorldTrafo = transpose(float3x3(IN.tangent, IN.bitangent, IN.normal));
+        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);
@@ -136 +136 @@
 pixel frag(fragin IN,
                    uniform float4x4 viewMatrix,
-                   uniform sampler2D normalMap: TEXUNIT1)
+                   uniform sampler2D normalMap: TEXUNIT0)
 {
         pixel pix;
         // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
         pix.color = glstate.material.diffuse + glstate.material.emission;
-        // save world space normal in rt => transform back into world space by
-        // multiplying with inverse view. since transforming normal with T means to 
-        // multiply with the inverse transpose of T, we multiple with Transp(Inv(Inv(view))) = Transp(view)
-        pix.normal = mul(transpose(viewMatrix), IN.normal).xyz;
+        
         // eye space depth
         pix.color.w = length(IN.eyePos.xyz);
@@ -165 +162 @@
         const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz;
         pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
-
+        pix.normal = tangentSpaceNorm;
         return pix;
 }