Changeset 3002

Timestamp:

10/03/08 17:16:48 (16 years ago)

Author:

mattausch

Message:

started using downsampling

Location:

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

Files:

• DeferredRenderer.cpp (modified) (7 diffs)
• chcdemo.cpp (modified) (1 diff)
• shaders/tonemap.cg (modified) (1 diff)

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

@@ -36 +36 @@
 static CGparameter sColorsTexLogLumParam;
 
+static CGparameter sDownSampleOffsetParam;
 
 
@@ -276 +277 @@
         mFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         mFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
-}
+
+        mDownSampleFbo = new FrameBufferObject(w / 2, h / 2, FrameBufferObject::DEPTH_NONE);
+        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+}
+
 
 
@@ -535 +543 @@
                                                                 "src/shaders/tonemap.cg", 
                                                                 RenderState::sCgFragmentProfile,
-                                                                "GreyScaleDownSample",
+                                                                "DownSample",
                                                                 NULL);
 
@@ -543 +551 @@
 
                 // we need size of texture for scaling
-                sColorsTexDownSampleParam = cgGetNamedParameter(sCgDownSampleProgram, "colors");  
+                sColorsTexDownSampleParam = cgGetNamedParameter(sCgDownSampleProgram, "colors"); 
+                sDownSampleOffsetParam = cgGetNamedParameter(sCgDownSampleProgram, "downSampleOffs");
+                
+                float downSampleOffsets[8];
+
+                float w = 1028;
+                float h = 768;
+
+                float xoffs = 1 / w;
+                float yoffs = 1 / h;
+
+                downSampleOffsets[0] =  xoffs; downSampleOffsets[1] =  yoffs;
+                downSampleOffsets[2] =  xoffs; downSampleOffsets[3] = -yoffs;
+                downSampleOffsets[4] = -xoffs; downSampleOffsets[5] = -yoffs;
+                downSampleOffsets[6] = -xoffs; downSampleOffsets[7] =  yoffs;
+
+                cgGLSetParameterArray2f(sDownSampleOffsetParam, 0, 4, (const float *)downSampleOffsets);
         }
         else
@@ -602 +626 @@
                 break;
         case GI:
+                DownSample(fbo);
                 ComputeGlobIllum(fbo, tempCohFactor, oldProjViewMatrix);
                 CombineIllum(fbo);
@@ -1244 +1269 @@
 void DeferredRenderer::DownSample(FrameBufferObject *fbo)
 {
+        glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, mWidth, mHeight);
+
         ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
         GLuint colorsTex = colorBuffer->GetTexture();
@@ -1277 +1305 @@
         FrameBufferObject::Release();
 
-        PrintGLerror("ToneMapParams");
+        glPopAttrib();
+        PrintGLerror("downsample");
 }
 

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

@@ -668 +668 @@
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
         // the positions buffer
-        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
         //fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
         // the normals buffer
-        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
         // another color buffer
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);

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

@@ -22 +22 @@
 float4 DownSample(frag IN,
                                   uniform sampler2D colors,
-                                  float2 downSampleOffs[16]) : COLOR
+                                  float2 downSampleOffs[4]) : COLOR
 {    
     float4 average = .0f;
 
-    for(int i = 0; i < 16; ++ i)
+    for(int i = 0; i < 4; ++ i)
     {
         average += tex2D(colors, IN.texCoord + downSampleOffs[i]);
     }
         
-    average *= 1.0f / 16.0f;
+    average *= 1.0f / 4.0f;
 
     return average;