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

Timestamp:

09/23/08 15:41:14 (16 years ago)

Author:

mattausch

Message:

started reinhard tonemapping implementation but slow

File:

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

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

@@ -9 +9 @@
 #include "ShadowMapping.h"
 #include "Light.h"
+#include "ToneMapper.h"
 
 
@@ -96 +97 @@
 static CGparameter sLightDirShadowParam;
 
+static CGparameter sImageKeyParam;
+static CGparameter sImageKeyShadowParam;
 
 //#define USE_3D_SSAO
@@ -108 +111 @@
 static Sample2 samples2[NUM_SAMPLES];
 #endif
-Sample2 pcfSamples[16];
+
+// number of pcf tabs
+Sample2 pcfSamples[NUM_PCF_TABS];
 
 static int colorBufferIdx = 0;
@@ -281 +286 @@
                 sNormalsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "normals");
                 sLightDirParam = cgGetNamedParameter(sCgDeferredProgram, "lightDir");
+
+                sImageKeyParam = cgGetNamedParameter(sCgDeferredProgram, "imageKey");
         }
         else
@@ -433 +440 @@
                 sLightDirShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "lightDir");
 
-                PoissonDiscSampleGenerator2 poisson(16, 1.0f);
+                sImageKeyShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "imageKey");
+
+                PoissonDiscSampleGenerator2 poisson(NUM_PCF_TABS, 1.0f);
                 poisson.Generate((float *)pcfSamples);
 
-                cgGLSetParameterArray2f(sSamplesShadowParam, 0, 16, (const float *)pcfSamples);
+                cgGLSetParameterArray2f(sSamplesShadowParam, 0, NUM_PCF_TABS, (const float *)pcfSamples);
         }
         else
@@ -699 +708 @@
 void DeferredRenderer::FirstPass(FrameBufferObject *fbo, DirectionalLight *light)
 {
+        const float imageKey = ToneMapper().CalcImageKey(fbo->GetColorBuffer(0));
+
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
@@ -725 +736 @@
         Vector3 lightDir = -light->GetDirection();
         cgGLSetParameter3f(sLightDirParam, lightDir.x, lightDir.y, lightDir.z);
+
+        cgGLSetParameter1f(sImageKeyParam, imageKey);
 
         glColor3f(1.0f, 1.0f, 1.0f);
@@ -965 +978 @@
                                                                            ShadowMap *shadowMap)
 {
+        const float imageKey = ToneMapper().CalcImageKey(fbo->GetColorBuffer(0));
+
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
 
@@ -1009 +1024 @@
         cgGLSetParameter3f(sLightDirShadowParam, lightDir.x, lightDir.y, lightDir.z);
 
+        // the average log luminance for tone mapping
+        cgGLSetParameter1f(sImageKeyShadowParam, imageKey);
 
         glColor3f(1.0f, 1.0f, 1.0f);