Changeset 2892 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

09/01/08 18:33:14 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Files:

• deferred.cg (modified) (2 diffs)
• globillum.cg (modified) (2 diffs)
• ssao.cg (modified) (2 diffs)

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

@@ -49 +49 @@
                    uniform sampler2D colors,
                    uniform sampler2D positions,
-                   uniform sampler2D normals
+                   uniform sampler2D normals    
                    )
 {
@@ -72 +72 @@
         return OUT;
 }
+
+/** The mrt shader for standard rendering
+*/
+pixel main_shadow(fragment IN, 
+                                  uniform sampler2D colors,
+                                  uniform sampler2D positions,
+                                  uniform sampler2D normals,               
+                                  uniform sampler2D shadowMap,
+                                  uniform float4x4 shadowMatrix
+                                  )
+{
+        pixel OUT;
+
+        float4 norm = tex2D(normals, IN.texCoord.xy);
+        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
+        float4 position = tex2D(positions, IN.texCoord.xy);
+
+        float4 lightSpacePos = mul(shadowMatrix, position);
+
+        float shadowDepth = tex2D(shadowMap, IN.texCoord.xy);
+
+        // an ambient color term
+        float amb = norm.w;
+
+        float3 normal = normalize(norm.xyz);
+        float4 col = shade(IN, color, position, normal, amb);
+        
+        OUT.color = col;
+        
+        if (lightSpacePos.z / lightSpacePos.w < shadowDepth)
+        {
+                OUT.color *= 0.1f;
+        }
+        
+        //OUT.color = float4(lightSpacePos.z / lightSpacePos.w);
+        //OUT.color = float4(shadowDepth);
+        OUT.color.w = color.w;
+
+        return OUT;
+}

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

@@ -13 +13 @@
         float3 view: COLOR0;
 };
-
 
 
@@ -67 +66 @@
         for (int i = 0; i < NUM_SAMPLES; i ++) 
         {
-                //float2 offset = samples[i];
-                float3 offset = float3(samples[i], 0);
+                float2 offset = samples[i];
+                //float3 offset = float3(samples[i], 0);
 
                 //sample noisetex; r stores costheta, g stores sintheta
-                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
-                float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy, 0);
-
-                // rotation
-                float2 offsetTransformed = reflect(offset, mynoise);
+                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
+                //float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy, 0);
+
+                // reflect sampling using the noise texture
+                float2 offsetTransformed = myreflect(offset, mynoise);
 
                 // weight with projected coordinate to reach similar kernel size for near and far

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

@@ -56 +56 @@
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
-                //const float2 offset = samples[i];
-                const float3 offset = float3(samples[i], 0);
+                const float2 offset = samples[i];
+                //const float3 offset = float3(samples[i], 0);
 
                 ////////////////////
@@ -63 +63 @@
 
                 //const float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
-                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
-                float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy,0);
+                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
+                //float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy,0);
 
-                const float2 offsetTransformed = reflect(offset, mynoise);
+                const float2 offsetTransformed = myreflect(offset, mynoise);
 
                 // weight with projected coordinate to reach similar kernel size for near and far