Changeset 3350 for GTP/trunk

Timestamp:

04/14/09 08:59:19 (16 years ago)

Author:

mattausch

Message:

implemented ssao for diffuse illumination

Location:

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

Files:

• DeferredRenderer.cpp (modified) (7 diffs)
• shaders/deferred.cg (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -447 +447 @@
 
         mTempFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        mTempFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         FrameBufferObject::InitBuffer(mTempFbo, 0);
+        FrameBufferObject::InitBuffer(mTempFbo, 1);
         
 
@@ -561 +563 @@
         //////////////
 
-        string deferredParams[] = {"colors", "normals", "lightDir"};
-        sCgDeferredProgram->AddParameters(deferredParams, 0, 3);
+        string deferredParams[] = {"colors", "normals", "lightDir", "aoTex"};
+        sCgDeferredProgram->AddParameters(deferredParams, 0, 4);
 
         ///////////////////
@@ -652 +654 @@
         InitFrame();
 
-        if (shadowMap)
+        /*if (shadowMap)
                 FirstPassShadow(fbo, light, shadowMap);
         else
                 FirstPass(fbo, light);
+        */
 
         if (mShadingMethod != 0)
@@ -681 +684 @@
         }
 
+        if (shadowMap)
+                FirstPassShadow(fbo, light, shadowMap);
+        else
+                FirstPass(fbo, light);
+
         /// depth of field
         if (mUseDepthOfField)
@@ -958 +966 @@
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+        GLuint aoTex = mTempFbo->GetColorBuffer(1)->GetTexture();
 
         FlipFbos(fbo);
@@ -966 +975 @@
         sCgDeferredProgram->SetTexture(1, normalsTex);
         sCgDeferredProgram->SetValue3f(2, lightDir.x, lightDir.y, lightDir.z);
-        
+        sCgDeferredProgram->SetTexture(3, aoTex);
+
         DrawQuad(sCgDeferredProgram);
 
@@ -1093 +1103 @@
         GLuint ssaoTex = mTempFbo->GetColorBuffer(0)->GetTexture();
         
-        FlipFbos(fbo);
+        mTempFbo->Bind();
+        glDrawBuffers(1, mrt + 1);
+        //FlipFbos(fbo);
 
         int i = 0;

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

@@ -24 +24 @@
                          uniform float4 color,
                          uniform float3 normal,
-                         float3 lightDir)
+                         float3 lightDir,
+                         float4 ao)
 {
         // diffuse intensity
@@ -44 +45 @@
         else 
         {
-                outColor = (ambient + diffuse) * color;
+                outColor = (ambient * ao + diffuse) * color;
+                //outColor = ambient + diffuse * color;
         }
 
@@ -57 +59 @@
                    uniform sampler2D colors,
                    uniform sampler2D normals,
-                   uniform float3 lightDir
+                   uniform float3 lightDir,
+                   uniform sampler2D aoTex
                    )
 {
@@ -64 +67 @@
         float4 norm = tex2D(normals, IN.texCoord);
         float4 color = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
+        float4 ao = tex2Dlod(aoTex, float4(IN.texCoord, 0, 0));
         
         float3 normal = normalize(norm.xyz);
-        float4 col = shade(IN, color, normal, lightDir);
+        float4 col = shade(IN, color, normal, lightDir, ao);
         
         OUT.color = col;
-        // store scaled view vector so wie don't have to normalize for e.g., ssao
+        // store scaled view vector so wie don't have to normalize for later
         //OUT.color.w = color.w / length(IN.view);
         OUT.color.w = color.w;
@@ -172 +176 @@
 
                 float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, 
-                                                      lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTex);
+                                                      lightSpacePos.xy, lightSpacePos.z, samples, 
+                                                                                  weights, noiseTex);
                 diffuse *= shadowTerm;
         }