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

Timestamp:

09/16/08 16:03:01 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -8 +8 @@
 #include "Halton.h"
 #include "ShadowMapping.h"
+#include "Light.h"
 
 
@@ -91 +92 @@
 static CGparameter sNoiseTexShadowParam;
 static CGparameter sSamplesShadowParam; 
+
+static CGparameter sLightDirParam;
+static CGparameter sLightDirShadowParam;
 
 
@@ -245 +249 @@
         if (sCgAntiAliasingProgram) cgDestroyProgram(sCgAntiAliasingProgram);
 
-        //DEL_PTR(mNewFbo);
-        //DEL_PTR(mOldFbo);
         DEL_PTR(mFbo);
 
@@ -277 +279 @@
                 sColorsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "colors");  
                 sNormalsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "normals");
+                sLightDirParam = cgGetNamedParameter(sCgDeferredProgram, "lightDir");
         }
         else
@@ -427 +430 @@
                 sNoiseTexShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "noiseTexture");
                 sSamplesShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "samples");
+                sLightDirShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "lightDir");
 
                 PoissonDiscSampleGenerator2 poisson(16, 1.0f);
@@ -444 +448 @@
                                                           const Matrix4x4 &projViewMatrix,
                                                           float tempCohFactor,
+                                                          DirectionalLight *light,
                                                           ShadowMap *shadowMap)
 {
@@ -477 +482 @@
 
         if (shadowMap)
-                FirstPassShadow(fbo, shadowMap);
+                FirstPassShadow(fbo, light, shadowMap);
         else
-                FirstPass(fbo);
+                FirstPass(fbo, light);
 
         switch (mShadingMethod)
@@ -691 +696 @@
 
 
-void DeferredRenderer::FirstPass(FrameBufferObject *fbo)
+void DeferredRenderer::FirstPass(FrameBufferObject *fbo, DirectionalLight *light)
 {
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
@@ -717 +722 @@
         cgGLEnableTextureParameter(sNormalsTexDeferredParam);
         
+        Vector3 lightDir = -light->GetDirection();
+        cgGLSetParameter3f(sLightDirParam, lightDir.x, lightDir.y, lightDir.z);
+
         glColor3f(1.0f, 1.0f, 1.0f);
 
@@ -952 +960 @@
 
 
-void DeferredRenderer::FirstPassShadow(FrameBufferObject *fbo, ShadowMap *shadowMap)
+void DeferredRenderer::FirstPassShadow(FrameBufferObject *fbo, 
+                                                                           DirectionalLight *light, 
+                                                                           ShadowMap *shadowMap)
 {
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
@@ -995 +1005 @@
         cgGLEnableTextureParameter(sNoiseTexShadowParam);
 
+        Vector3 lightDir = -light->GetDirection();
+        cgGLSetParameter3f(sLightDirShadowParam, lightDir.x, lightDir.y, lightDir.z);
+
 
         glColor3f(1.0f, 1.0f, 1.0f);