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

Timestamp:

09/23/08 12:11:29 (16 years ago)

Author:

mattausch

Message:

removed dirttexture stuff. started tonemapping stuff

Location:

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

Files:

• deferred.cg (modified) (1 diff)
• mrt.cg (modified) (1 diff)

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

@@ -186 +186 @@
         return OUT;
 }
+
+
+/*float4 FinalPass( SkyboxVS_Output Input ) : COLOR
+{
+        float4 vColor = tex2D( s0, Input.Tex );
+        float3 vBloom = tex2D( s1, Input.Tex );
+
+        float vLum = g_fImageKey;
+        vColor.rgb = vColor; 
+         
+    // Tone mapping
+    vColor.rgb *= g_fMiddleGray /(vLum + 0.001f);
+    vColor.rgb *= (1.0f + vColor/LUM_WHITE);
+        vColor.rgb /= (1.0f + vColor);
+        
+        vColor.rgb += 0.6f * vBloom;
+        vColor.a = 1.0f;
+        
+        return vColor;
+}*/

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

@@ -72 +72 @@
         pixel pix;
 
-        //float4 dirtTexColor = tex2D(dirtTex, IN.texCoord.xy);
         float4 texColor = tex2D(tex, IN.texCoord.xy);
 
         // save color in first render target
         // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
-        //pix.col = (glstate.material.emission + glstate.material.diffuse) * texColor * dirtTexColor; 
         pix.col = (glstate.material.emission + glstate.material.diffuse) * texColor;