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

Timestamp:

12/08/08 18:48:21 (16 years ago)

Author:

mattausch

Message:

worked on lense flare

File:

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

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

@@ -79 +79 @@
 static float ssaoFilterWeights[NUM_SSAO_FILTER_SAMPLES];
 
-static Texture *sHaloTex[4];
+static Texture *sHaloTex[5];
 
 int DeferredRenderer::colorBufferIdx = 0;
@@ -300 +300 @@
 static void PrepareLenseFlare()
 {
-        string textures[] = {"lens1.jpg", "lens2.jpg", "lens3.jpg", "lens4.jpg"};
-
-        for (int i = 0; i < 4; ++ i)
+        string textures[] = {"flare4.tga", "lens2.jpg", "lens3.jpg", "lens4.jpg", "lens1.jpg"};
+
+        for (int i = 0; i < 5; ++ i)
         {
                 sHaloTex[i] = new Texture(model_path + textures[i]);
 
-                sHaloTex[i]->SetBoundaryModeS(Texture::CLAMP);
-                sHaloTex[i]->SetBoundaryModeT(Texture::CLAMP);
+                sHaloTex[i]->SetBoundaryModeS(Texture::BORDER);
+                sHaloTex[i]->SetBoundaryModeT(Texture::BORDER);
 
                 sHaloTex[i]->Create();
@@ -501 +501 @@
         string lenseFlareParams[] = 
                 {"colorsTex", "flareTex1", "flareTex2", "flareTex3", "flareTex4", 
-                 "vectorToLight", "distanceToLight"};
-
-        sCgLenseFlareProgram->AddParameters(lenseFlareParams, 0, 7);
+                 "flareTex5", "vectorToLight", "distanceToLight"};
+
+        sCgLenseFlareProgram->AddParameters(lenseFlareParams, 0, 8);
 
 
@@ -555 +555 @@
                                                           bool useToneMapping,
                                                           bool useAntiAliasing,
+                                                          bool lightSourceVisible,
                                                           ShadowMap *shadowMap
                                                           )
@@ -567 +568 @@
         if (mShadingMethod != 0)
         {
-                // downsample fbo buffers
-                PrepareSsao(fbo);
+                PrepareSsao(fbo); // downsample fbo buffers
         }
 
@@ -584 +584 @@
                 CombineIllum(fbo);
                 break;
-        default: // DEFAULT
+        default:
                 // do nothing: standard deferred shading
                 break;
@@ -598 +598 @@
 
 
-        LenseFlare(fbo, light);
+        if (lightSourceVisible)
+                LenseFlare(fbo, light);
 
         // multisampling is difficult / costly with deferred shading
@@ -1277 +1278 @@
         // the sun is a large distance in the reverse light direction
         // => extrapolate light pos
-        
         const Vector3 lightPos = light->GetDirection() * -1e3f;
 
-        Vector3 projLightPos = mProjViewMatrix * lightPos * 0.5f + Vector3(0.5f);
-        cout << "lightPos " << projLightPos << endl;
-
-        // check if light is visible in the image
-        if ((projLightPos.x < -0.2f) || (projLightPos.y < -0.2f) ||
-                (projLightPos.x >= 1.2f) || (projLightPos.y >= 1.2f))
+        float w;
+        Vector3 projLightPos = mProjViewMatrix.Transform(w, lightPos, 1.0f);
+        projLightPos /= w;
+        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);
@@ -1295 +1300 @@
         vectorToLight /= distanceToLight;
 
-        cout << "dist " << distanceToLight << " v " << vectorToLight << endl;
+        //cout << "dist " << distanceToLight << " v " << vectorToLight << endl;
 
 
@@ -1310 +1315 @@
         sCgLenseFlareProgram->SetTexture(i ++, sHaloTex[2]->GetId());
         sCgLenseFlareProgram->SetTexture(i ++, sHaloTex[3]->GetId());
+        sCgLenseFlareProgram->SetTexture(i ++, sHaloTex[4]->GetId());
         sCgLenseFlareProgram->SetValue2f(i ++, vectorToLight.x, vectorToLight.y);
         sCgLenseFlareProgram->SetValue1f(i ++, distanceToLight);