Changeset 2900 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

09/03/08 22:40:35 (16 years ago)

Author:

mattausch

Message:

changed to real 3d samples which are then projected to texture space

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (15 diffs)

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

@@ -42 +42 @@
 
 static CGparameter sOldModelViewProjMatrixParam;
+static CGparameter sModelViewProjMatrixParam;
 static CGparameter sMaxDepthParam;
 static CGparameter sSamplesParam; 
@@ -96 +97 @@
 
 // ssao random spherical samples
-static Sample2 samples[NUM_SAMPLES];
+static Sample2 samples2[NUM_SAMPLES];
+static Sample2 samples3[NUM_SAMPLES];
 
 static int colorBufferIdx = 0;
@@ -117 +119 @@
 static void GenerateSamples(int sampling)
 {
+        static SphericalSampleGenerator gauss(NUM_SAMPLES, 0.5f);
+        gauss.Generate((float *)samples3);
+/*
         switch (sampling)
         {
@@ -122 +127 @@
                 {
                         static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
-                        poisson.Generate((Sample2 *)samples);
+                        poisson.Generate((float *)samples2);
                 }
                 break;
@@ -128 +133 @@
                 {
                         //static GaussianSampleGenerator gauss(NUM_SAMPLES, 0.5f);
-                        //gauss.Generate((Sample2 *)samples);
+                        //gauss.Generate((float *)samples2);
 
                         static SphericalSampleGenerator gauss(NUM_SAMPLES, 0.5f);
-                        gauss.Generate((Sample2 *)samples);
+                        gauss.Generate((float *)samples3);
                 }
                 break;
         default:
                 break;
-        }
+        }*/
 }
 
@@ -145 +150 @@
         float *randomNormals = new float[w * h * 3];
 
+        static HaltonSequence halton;
+        float r[2];
+
         for (int i = 0; i < w * h * 3; i += 3)
         {
                 // create random samples on a circle
-                const float rx = RandomValue(0, 1);
+                halton.GetNext(2, r);
+
+                /*
                 const float theta = 2.0f * acos(sqrt(1.0f - rx));
 
-                //randomNormals[i + 0] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
-                //randomNormals[i + 1] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
                 randomNormals[i + 0] = cos(theta);
                 randomNormals[i + 1] = sin(theta);
-                randomNormals[i + 2] = 0;
+                randomNormals[i + 2] = 0;*/
+
+                const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
+                const float phi = 2.0f * M_PI * r[1];
+
+                randomNormals[i + 0] = sin(theta) * cos(phi);
+                randomNormals[i + 1] = sin(theta) * sin(phi);
+                randomNormals[i + 2] = cos(theta);
         }
 
@@ -197 +212 @@
         //-- the flip-flop fbos
 
-        /*mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        
-        mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        
-
-        ///////////////////////
-
-        mOldFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        
-        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);*/
-        
         mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
 
@@ -269 +271 @@
                 cgCreateProgramFromFile(context, 
                                                                 CG_SOURCE,
-                                                                "src/shaders/ssao.cg", 
+                                                                //"src/shaders/ssao.cg", 
+                                                                "src/shaders/ssao2.cg", 
                                                                 RenderState::sCgFragmentProfile,
                                                                 "main",
@@ -285 +288 @@
                 
                 sOldModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "oldModelViewProj");
+                sModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "mymodelViewProj");
                 sMaxDepthParam = cgGetNamedParameter(sCgSsaoProgram, "maxDepth");
                 sTemporalCoherenceParam = cgGetNamedParameter(sCgSsaoProgram, "temporalCoherence");
@@ -416 +420 @@
 void DeferredRenderer::Render(FrameBufferObject *fbo, 
                                                           const Matrix4x4 &oldProjViewMatrix,
+                                                          const Matrix4x4 &projViewMatrix,
                                                           float expFactor,
                                                           ShadowMap *shadowMap)
@@ -457 +462 @@
         {
         case SSAO:
-                ComputeSsao(fbo, expFactor, oldProjViewMatrix);
+                ComputeSsao(fbo, expFactor, oldProjViewMatrix, projViewMatrix);
                 CombineSsao(fbo);
                 break;
@@ -487 +492 @@
 
 void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, 
-                                                         float expFactor,
-                                                         const Matrix4x4 &oldProjViewMatrix
-                                                         )
-{
+                                                                   float expFactor,
+                                                                   const Matrix4x4 &oldProjViewMatrix,
+                                                                   const Matrix4x4 &projViewMatrix
+                                                                   )
+{
+        static Matrix4x4 biasMatrix(0.5f, 0.0f, 0.0f, 0.5f,
+                                                                0.0f, 0.5f, 0.0f, 0.5f,
+                                                                0.0f, 0.0f, 0.5f, 0.5f,
+                                                                0.0f, 0.0f, 0.0f, 1.0f); //bias from [-1, 1] to [0, 1]
+
+        Matrix4x4 m = projViewMatrix * biasMatrix; 
+
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
+        cgGLSetMatrixParameterfc(sModelViewProjMatrixParam, (const float *)m.x);
 
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
@@ -547 +561 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod); 
-                cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples);
+
+                //cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples2);
+                cgGLSetParameterArray3f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples3);
         }
 
@@ -772 +788 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod); 
-                cgGLSetParameterArray2f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples);
+                cgGLSetParameterArray2f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples2);
         }
 
@@ -865 +881 @@
 {
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
-        //GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
         GLuint ssaoTex = mFbo->GetColorBuffer(mFboIndex)->GetTexture();