Changeset 3215

Timestamp:

12/08/08 23:13:38 (15 years ago)

Author:

mattausch

Message:

worked on lense flare, cleaned up code a little bit

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (5 diffs)
• src/DeferredRenderer.cpp (modified) (10 diffs)
• src/DeferredRenderer.h (modified) (6 diffs)
• src/ResourceManager.cpp (modified) (1 diff)
• src/ResourceManager.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (13 diffs)
• src/shaders/lenseFlare.cg (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -12 +12 @@
 # triangles per bvh leaf (influences hierarchy depth vs. occlusion power)
 trianglesPerVirtualLeaf=300
-
+# max depth for searching for nodes for tight bounds
 maxDepthForTestingChildren=3
 
@@ -34 +34 @@
 #camDirection=1 0 0
 
-#camPosition=468.025 267.591 182.478
-#camDirection=0.937282 0.348573 -0
-
-# bad view point (culling bug!)
-camPosition=469.381 267.293 184.778
-camDirection=0.142006 0.645885 -0.750111
-
-#camPosition=458.412 255.767 182.632
-#camDirection=0.891691 0.42723 0.149535
-
-#camPosition=740.137 487.855 188.506
-#camDirection=0.669256 0.727829 0.149535
-
-#camPosition=492.678 249.827 187.232
-#camDirection=-0.651041 -0.693292 -0.309017
+camPosition=468.025 267.591 182.478
+camDirection=0.937282 0.348573 -0
 
 #lightDirection=-0.8f 1.0f -0.7f
@@ -57 +44 @@
 # window options
 
-//winWidth=800
-//winHeight=600
+#winWidth=800
+#winHeight=600
 
 winWidth=1024
@@ -83 +70 @@
 useAA=1
 
+# show lense flare
+useLenseFlare=1
+
 # use ssao / color bleeding
 useAdvancedShading=1
@@ -89 +79 @@
 turbitity=3.0f
 
-#second bad view point
-//camPosition=465.626 248.788 184.978
-//camDirection=0.0592959 0.998021 0.0209425
-
 ssaoKernelRadius=8e-1f
 

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

@@ -328 +328 @@
 mSortSamples(true),
 mKernelRadius(1e-8f),
-mSampleIntensity(0.2f)
+mSampleIntensity(0.2f),
+mSunVisiblePixels(0)
 {
         ///////////
@@ -393 +394 @@
         glDeleteTextures(1, &noiseTex1D);
 }
-
-
-void DeferredRenderer::SetUseTemporalCoherence(bool temporal)
-{
-        mUseTemporalCoherence = temporal;
-}
-
 
 
@@ -501 +495 @@
         string lenseFlareParams[] = 
                 {"colorsTex", "flareTex1", "flareTex2", "flareTex3", "flareTex4", 
-                 "flareTex5", "vectorToLight", "distanceToLight"};
-
-        sCgLenseFlareProgram->AddParameters(lenseFlareParams, 0, 8);
+                 "flareTex5", "vectorToLight", "distanceToLight", "sunVisiblePixels"};
+
+        sCgLenseFlareProgram->AddParameters(lenseFlareParams, 0, 9);
 
 
@@ -555 +549 @@
                                                           bool useToneMapping,
                                                           bool useAntiAliasing,
-                                                          bool lightSourceVisible,
                                                           ShadowMap *shadowMap
                                                           )
@@ -597 +590 @@
         }
 
-
-        if (lightSourceVisible)
-                LenseFlare(fbo, light);
+        /// compute lense flare
+        LenseFlare(fbo, light);
 
         // multisampling is difficult / costly with deferred shading
@@ -989 +981 @@
 
 
-void DeferredRenderer::SetSamplingMethod(SAMPLING_METHOD s) 
-{ 
-        if (s != mSamplingMethod)
-        {
-                mSamplingMethod = s; 
-                mRegenerateSamples = true;
-        }
-}
-
-
-void DeferredRenderer::SetShadingMethod(SHADING_METHOD s)
-{
-        if (s != mShadingMethod)
-        {
-                mShadingMethod = s; 
-                mRegenerateSamples = true;
-        }
-}
-
-
-#if TODO
-
-void DeferredRenderer::SetNumSamples(int numSamples)
-{
-        mNumSamples = numSamples;
-}
-
-#endif
-
-
-void DeferredRenderer::SetSampleIntensity(float sampleIntensity)
-{
-        mSampleIntensity = sampleIntensity;
-}
-
-
-void DeferredRenderer::SetKernelRadius(float kernelRadius)
-{
-        mKernelRadius = kernelRadius;
-}
-
-
 void DeferredRenderer::ComputeToneParameters(FrameBufferObject *fbo, 
                                                                                          DirectionalLight *light,
@@ -1273 +1223 @@
 
 void DeferredRenderer::LenseFlare(FrameBufferObject *fbo,
-                                                                  DirectionalLight *light
+                                                                  DirectionalLight *light                                                       
                                                                   )
 {
+        // light source not visible
+        if (!mSunVisiblePixels) return;
+
         // the sun is a large distance in the reverse light direction
         // => extrapolate light pos
@@ -1285 +1238 @@
         projLightPos = projLightPos * 0.5f + Vector3(0.5f);
 
-        //Vector3 dummy = mProjViewMatrix * lightPos;
-
-        // check if light out of image range
-        /*if ((projLightPos.x < -0.2f) || (projLightPos.y < -0.2f) ||
-                (projLightPos.x >= 1.2f) || (projLightPos.y >= 1.2f) || 
-                (w < .0f))
-                return;
-*/
         // vector to light from screen center in texture space
         Vector3 vectorToLight = projLightPos - Vector3(0.5f);
@@ -1318 +1263 @@
         sCgLenseFlareProgram->SetValue2f(i ++, vectorToLight.x, vectorToLight.y);
         sCgLenseFlareProgram->SetValue1f(i ++, distanceToLight);
+        sCgLenseFlareProgram->SetValue1f(i ++, (float)mSunVisiblePixels);
 
         DrawQuad(sCgLenseFlareProgram);
@@ -1325 +1271 @@
 
 
+
+void DeferredRenderer::SetUseTemporalCoherence(bool temporal)
+{
+        mUseTemporalCoherence = temporal;
+}
+
+
+void DeferredRenderer::SetSamplingMethod(SAMPLING_METHOD s) 
+{ 
+        if (s != mSamplingMethod)
+        {
+                mSamplingMethod = s; 
+                mRegenerateSamples = true;
+        }
+}
+
+
+void DeferredRenderer::SetShadingMethod(SHADING_METHOD s)
+{
+        if (s != mShadingMethod)
+        {
+                mShadingMethod = s; 
+                mRegenerateSamples = true;
+        }
+}
+
+
+#if TODO
+
+void DeferredRenderer::SetNumSamples(int numSamples)
+{
+        mNumSamples = numSamples;
+}
+
+#endif
+
+
+void DeferredRenderer::SetSampleIntensity(float sampleIntensity)
+{
+        mSampleIntensity = sampleIntensity;
+}
+
+
+void DeferredRenderer::SetKernelRadius(float kernelRadius)
+{
+        mKernelRadius = kernelRadius;
+}
+
+
+void DeferredRenderer::SetSortSamples(bool sortSamples) 
+{
+        mSortSamples = sortSamples; 
+}
+
+
+void DeferredRenderer::SetSunVisiblePixels(int pixels) 
+{
+        mSunVisiblePixels = pixels;
+}
+
+
+
 } // namespace

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

@@ -42 +42 @@
                                 bool useToneMapping,
                                 bool useAntiAliasing,
-                                bool isLightSourceVisible,
                                 ShadowMap *shadowMap = NULL
                                 );
@@ -50 +49 @@
 
         enum SAMPLING_METHOD {SAMPLING_POISSON, SAMPLING_QUADRATIC, SAMPLING_DEFAULT};
+        
         enum SHADING_METHOD {DEFAULT, SSAO, GI};
+
         /** Set the samplig method for the indirect illumination
         */
@@ -58 +59 @@
         void SetShadingMethod(SHADING_METHOD s);
 
-        void SetSortSamples(bool sortSamples) { mSortSamples = sortSamples; }
+        void SetSortSamples(bool sortSamples);
 
         void SetSampleIntensity(float sampleIntensity);
 
         void SetKernelRadius(float kernelRadius);
+        /** Sets the number of visible pixels of the sun
+        */
+        void SetSunVisiblePixels(int visiblePixels);
 
 
@@ -125 +129 @@
         ////////////
 
+        /// deferred shading output image width
         int mWidth;
+        /// deferred shading output image height
         int mHeight;
 
@@ -139 +145 @@
 
         int mIllumFboIndex;
-        // the fbo for indirect illumination (ssao + color bleeding)
+        /// the fbo for indirect illumination (ssao + color bleeding)
         FrameBufferObject *mIllumFbo;
 
@@ -161 +167 @@
         float mKernelRadius;
         float mSampleIntensity;
+
+        int mSunVisiblePixels;
 };
 

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

@@ -449 +449 @@
 }
 
-}
+
+
+Material *ResourceManager::CreateMaterial()
+{
+        Material *mat = new Material();
+        mMaterials.push_back(mat);
+
+        return mat;
+}
+
+}

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.h

@@ -50 +50 @@
         */
         static void DelSingleton();
-        /** Adds a scene entity to be handled by the resource mananger.
+        /** Adds a scene entity to the resource mananger, which from now on is handled by the manager.
         */
         void AddSceneEntity(SceneEntity *ent);
-        /** Adds a scene entity to be handled by the resource mananger.
+        /** Creates a new transform.
         */
         Transform3 *CreateTransform(const Matrix4x4 &m);
+        /** Creates a new default material that is handled by the manager.
+        */
+        Material *CreateMaterial();
 
-
+        /// giant hack: set this to true if the geometry to load has tangent data for normal mapping
         bool mUseNormalMapping;
 

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

@@ -217 +217 @@
 bool useHDR = true;
 bool useAntiAliasing = true;
+bool useLenseFlare = true;
 
 PerfTimer frameTimer, algTimer;
@@ -276 +277 @@
 void RenderVisibleObjects();
 
-bool TestSunVisible();
+int TestSunVisible();
 
 void Begin2D();
@@ -391 +392 @@
                 env.GetBoolParam(string("useHDR"), useHDR);
                 env.GetBoolParam(string("useAA"), useAntiAliasing);
+                env.GetBoolParam(string("useLenseFlare"), useLenseFlare);
                 env.GetBoolParam(string("useAdvancedShading"), useAdvancedShading);
 
@@ -418 +420 @@
                 cout << "render method: " << renderMethod << endl;
                 cout << "use antialiasing: " << useAntiAliasing << endl;
+                cout << "use lense flare: " << useLenseFlare << endl;
                 cout << "use advanced shading: " << useAdvancedShading << endl;
                 cout << "turbitity: " << turbitity << endl;
@@ -584 +587 @@
 
         // toto clean up material
-        Material *mat = new Material();
+        Material *mat = resourceManager->CreateMaterial();
 
         mat->GetTechnique(0)->SetDepthWriteEnabled(false);
@@ -591 +594 @@
         sunBox = conv.ConvertBox(sbox, mat, trafo);
         
+        resourceManager->AddSceneEntity(sunBox);
+
+        /// create single occlusion query that handles sun visibility
         glGenQueriesARB(1, &sunQuery);
 
@@ -1158 +1164 @@
                 RenderVisibleObjects();
         }
-        
-
-        bool sunVisible = TestSunVisible();
+
+        const bool useDeferred = 
+                ((renderMethod == RENDER_DEFERRED) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED));
+
+        // if no lense flare => just set sun to invisible
+        int sunVisiblePixels = useLenseFlare  &&  useDeferred ? TestSunVisible() : 0;
 
 
@@ -1172 +1181 @@
 
 
-        if ((renderMethod == RENDER_DEFERRED) ||
-                (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
+        if (useDeferred)
         {
                 FrameBufferObject::Release();
@@ -1192 +1200 @@
                         shadingMethod = DeferredRenderer::DEFAULT;
 
+                deferredShader->SetSunVisiblePixels(sunVisiblePixels);
                 deferredShader->SetShadingMethod(shadingMethod);
                 deferredShader->SetSamplingMethod(samplingMethod);
@@ -1200 +1209 @@
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
-                deferredShader->Render(fbo, ssaoTempCohFactor, light, useHDR, useAntiAliasing, sunVisible, sm);
+                deferredShader->Render(fbo, ssaoTempCohFactor, light, useHDR, useAntiAliasing, sm);
         }
 
@@ -1400 +1409 @@
                 useAntiAliasing = !useAntiAliasing;
                 break;
-        /*case '?':
-                sortSamples = !sortSamples;
-                break;
-        */
+        case 'c':
+        case 'C':
+                useLenseFlare = !useLenseFlare;
+                break;
         default:
                 return;
@@ -2248 +2257 @@
 }
 
-
-bool TestSunVisible()
+/** This function returns the number of visible pixels of a
+        bounding box representing the sun.
+*/
+int TestSunVisible()
 {
         // assume sun is at a far away point along the light vector
@@ -2267 +2278 @@
         glGetQueryObjectuivARB(sunQuery, GL_QUERY_RESULT_ARB, &sampleCount);
 
-        return (sampleCount > 0);
-}
+        return sampleCount;
+}

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

@@ -34 +34 @@
                                   uniform sampler2D flareTex5,
                                   uniform float2 vectorToLight, // vector to current light position
-                                  uniform float distanceToLight // distance to current light position
+                                  uniform float distanceToLight, // distance to current light position
+                                  uniform float sunVisiblePixels
                                   ): COLOR
 {
@@ -58 +59 @@
 
         //result.xyz = float3(0);
+        sunVisiblePixels = clamp(sunVisiblePixels, .0f, 100.0f) * 0.01f;
+
         for (int i = 0; i < 8; ++ i)
-                result.xyz += flare[i].xyz;
+                result.xyz += flare[i].xyz * sunVisiblePixels;
 
         return result;