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

Timestamp:

07/07/08 10:52:03 (16 years ago)

Author:

mattausch

Message:

worked on deferred shading

Location:

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

Files:

• FragmentSsao.cg (deleted)
• ambient_occlusion.fx (deleted)
• deferred.cg (modified) (7 diffs)
• mrt.cg (modified) (2 diffs)
• test.cg (deleted)
• test2.cg (deleted)

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

@@ -60 +60 @@
            uniform sampler2D positions,
            uniform sampler2D normals,
-           const uniform float4x4 ProjTrafo,
            uniform sampler2D noiseTexture                               
            )
 {
   // the current world position
-  float4 centerPositionW = tex2D(positions, IN.texCoord.xy);
-  float3 centerPosition = centerPositionW.xyz;
+  float4 centerPosition = tex2D(positions, IN.texCoord.xy);
+  // the w coordinate from the persp. projection
+  float w = centerPosition.w;
 
   // the normal on the current position
@@ -87 +87 @@
     //sample noisetex; r stores costheta, g stores sintheta
     float3 noise = tex2D(noiseTexture, IN.texCoord.xy).xyz * 2.0f - 1.0f;
-
-    //float2 offsetTransformed = offset;//reflect(offset, noise.xy);
+        
+    // rotation
+    //float2 offsetTransformed = offset;
     float2 offsetTransformed;
     offsetTransformed.x = noise.r * offset.x - noise.g * offset.y;
@@ -94 +95 @@
                 
     // weight with projected coordinate to reach similar kernel size for near and far
-    float2 texcoord = IN.texCoord.xy + offsetTransformed * areaSize * centerPositionW.w;
+    float2 texcoord = IN.texCoord.xy + offsetTransformed * areaSize * w;
     
     float3 sample_position = tex2D(positions, texcoord).xyz;
     
-    float3 vector_to_sample = sample_position - centerPosition;
+    float3 vector_to_sample = sample_position - centerPosition.xyz;
     float length_to_sample = length(vector_to_sample);
     float3 direction_to_sample = vector_to_sample / (length_to_sample + 1e-9f);
@@ -125 +126 @@
            uniform sampler2D positions,
            uniform sampler2D normals,
-           const uniform float4x4 ProjTrafo,
            uniform sampler2D noiseTexture)
 {
@@ -137 +137 @@
 
   // expand normal
-  normal = normal * 2.0f - 1.0f;
+  normal = normalize(normal * 2.0f - 1.0f);
 
   float4 position = tex2D(positions, IN.texCoord.xy);
@@ -146 +146 @@
   float3 light = normalize(lightDir.xyz);
   float3 light2 = normalize(lightDir2.xyz);
-
+ 
   float diffuseLight = max(dot(normal, light), 0.0f);
   float diffuseLight2 = max(dot(normal, light2), 0.0f);
@@ -152 +152 @@
   float diffuse = diffuseLight + diffuseLight2;
 
-  float ao = ssao(IN, positions, normals, ProjTrafo, noiseTexture);
+  float ao = ssao(IN, positions, normals, noiseTexture);
   //OUT.color = ao; 
   OUT.color = ao * (ambient + diffuse) * color;
-//OUT.color = (ambient + diffuse) * color;
-
-  //float4 currentPos = tex2D(normals, IN.texCoord.xy) * 0.5f + 0.5f;
-  //float4 currentPos = tex2D(normals, IN.texCoord.xy);
-  //OUT.color = currentPos;
+  //OUT.color = (ambient + diffuse) * color;
       
   return OUT;

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

@@ -41 +41 @@
 
 
-vtxout vtx(vtxin IN, uniform float4x4 ModelViewProj)
+vtxout vtx(vtxin IN, 
+           const uniform float4x4 ModelViewProj,
+           uniform float4x4 ModelMatrix)
 {
    vtxout OUT;
   
    // transform the vertex position into eye space
-   OUT.position = mul(ModelViewProj, IN.position);
-
    OUT.color = IN.color;
 
    OUT.texCoord = IN.texCoord;
+   OUT.worldPos = mul(ModelMatrix, IN.position);
+
+   // transform the vertex position into eye space
+   OUT.position = mul(ModelViewProj, OUT.worldPos);
+
    OUT.worldPos = IN.position;
-   // eye pos with linear depth
-   //OUT.worldPos = OUT.position;
+
    OUT.normal = IN.normal;
 
@@ -66 +70 @@
   pix.col = tex2D(tex, IN.texCoord.xy);
   pix.pos = IN.worldPos * maxDepth;
+  pix.norm = IN.normal;
   pix.pos.w = IN.projPos.w;
-  pix.norm = IN.normal;
 
   return pix;