Changeset 2896 for GTP/trunk/App

Timestamp:

09/02/08 15:48:44 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (2 diffs)
• src/DeferredRenderer.cpp (modified) (17 diffs)
• src/DeferredRenderer.h (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.h) (7 diffs)
• src/chcdemo.cpp (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -531 +531 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\DeferredRenderer.cpp"
+                                        RelativePath=".\src\DeferredRenderer.h"
                                         >
                                 </File>
@@ -638 +638 @@
                                 <File
                                         RelativePath=".\src\chcdemo.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath=".\src\DeferredRenderer.cpp"
                                         >
                                 </File>

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

@@ -1 @@
-#include "SsaoShader.h"
+#include "DeferredRenderer.h"
 #include "FrameBufferObject.h"
 #include "RenderState.h"
@@ -123 +123 @@
         switch (sampling)
         {
-        case SsaoShader::POISSON:
+        case DeferredRenderer::POISSON:
                 {
                         static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
@@ -129 +129 @@
                 }
                 break;
-        case SsaoShader::GAUSS:
+        case DeferredRenderer::GAUSS:
                 {
                         const float radius = 1.0f;
@@ -202 +202 @@
 
 
-SsaoShader::SsaoShader(int w, int h, Camera *cam, float scaleFactor):
+DeferredRenderer::DeferredRenderer(int w, int h, Camera *cam, float scaleFactor):
 mWidth(w), mHeight(h), 
 mCamera(cam),
@@ -240 +240 @@
 
 
-SsaoShader::~SsaoShader() 
+DeferredRenderer::~DeferredRenderer() 
 {
         if (sCgSsaoProgram)     cgDestroyProgram(sCgSsaoProgram);
@@ -256 +256 @@
 
 
-void SsaoShader::SetUseTemporalCoherence(bool temporal)
+void DeferredRenderer::SetUseTemporalCoherence(bool temporal)
 {
         mUseTemporalCoherence = temporal;
@@ -262 +262 @@
 
 
-void SsaoShader::Init(CGcontext context)
+void DeferredRenderer::Init(CGcontext context)
 {       
         sCgDeferredProgram = 
@@ -436 +436 @@
 
 
-void SsaoShader::Render(FrameBufferObject *fbo, 
+void DeferredRenderer::Render(FrameBufferObject *fbo, 
                                                 const Matrix4x4 &oldProjViewMatrix,
                                                 float expFactor,
@@ -507 +507 @@
 
 
-void SsaoShader::ComputeSsao(FrameBufferObject *fbo, 
+void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, 
                                                          float expFactor,
                                                          const Matrix4x4 &oldProjViewMatrix
@@ -601 +601 @@
 
 
-void SsaoShader::ComputeViewVectors(Vector3 &tl, Vector3 &tr, Vector3 &bl, Vector3 &br)
+void DeferredRenderer::ComputeViewVectors(Vector3 &tl, Vector3 &tr, Vector3 &bl, Vector3 &br)
 {
         Vector3 ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr;
@@ -630 +630 @@
 
 
-void SsaoShader::AntiAliasing(FrameBufferObject *fbo)
+void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo)
 {
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
@@ -670 +670 @@
 
 
-void SsaoShader::FirstPass(FrameBufferObject *fbo)
+void DeferredRenderer::FirstPass(FrameBufferObject *fbo)
 {
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
@@ -721 +721 @@
 
 
-void SsaoShader::ComputeGlobIllum(FrameBufferObject *fbo, 
+void DeferredRenderer::ComputeGlobIllum(FrameBufferObject *fbo, 
                                                                   float expFactor,
                                                                   const Matrix4x4 &oldProjViewMatrix
@@ -827 +827 @@
 
 
-void SsaoShader::CombineIllum(FrameBufferObject *fbo)
+void DeferredRenderer::CombineIllum(FrameBufferObject *fbo)
 {
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
@@ -884 +884 @@
 
 
-void SsaoShader::CombineSsao(FrameBufferObject *fbo)
+void DeferredRenderer::CombineSsao(FrameBufferObject *fbo)
 {
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
@@ -933 +933 @@
 
 
-void SsaoShader::FirstPassShadow(FrameBufferObject *fbo, ShadowMap *shadowMap)
+void DeferredRenderer::FirstPassShadow(FrameBufferObject *fbo, ShadowMap *shadowMap)
 {
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
@@ -995 +995 @@
 
 
-void SsaoShader::SetSamplingMethod(SAMPLING_METHOD s) 
+void DeferredRenderer::SetSamplingMethod(SAMPLING_METHOD s) 
 { 
         if (s != mSamplingMethod)

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

@@ -1 @@
-#ifndef _SsaoShader_H__
-#define _SsaoShader_H__
+#ifndef _DeferredRenderer_H__
+#define _DeferredRenderer_H__
 
 #include "common.h"
 #include "glInterface.h"
+
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
@@ -15 +16 @@
 class Camera;
 class Matrix4x4;
+class ShadowMap;
+
 
 /** This class implements a deferred shading algorithm that takes
         a frame buffer object as input and outputs an image in the given size
 */
-class SsaoShader
+class DeferredRenderer
 {
 public:
@@ -29 +32 @@
                 exact scene size that was scaled in order to improve floating point precision.
         */
-        SsaoShader(int w, int h, Camera *cam, float scaleFactor);
+        DeferredRenderer(int w, int h, Camera *cam, float scaleFactor);
         /** The algorithm renders the scene given an fbo consists of 1 color buffer, 
                 1 position buffer, and 1 normal buffer.
@@ -35 +38 @@
                 a smoothing factor for temporal coherence
         */
-        void Render(FrameBufferObject *fbo, const Matrix4x4 &oldProjViewMatrix, float expFactor);
+        void Render(FrameBufferObject *fbo, const Matrix4x4 &oldProjViewMatrix, float expFactor, ShadowMap *shadowMap = NULL);
 
         /** Initialises the deferred shader and loads the required shaders:
@@ -42 +45 @@
         static void Init(CGcontext context);
 
-        ~SsaoShader();
+        ~DeferredRenderer();
 
-        void SetUseGlobIllum(bool useGlobIllum);
         void SetUseTemporalCoherence(bool temporal);
 
         enum SAMPLING_METHOD {POISSON, GAUSS};
+        enum SHADING_METHOD {DEFAULT, SSAO, GI};
 
-        void SetSamplingMethod(int s) { mSampling = s;}
+        void SetSamplingMethod(SAMPLING_METHOD s);
 
+        void SetShadingMethod(SHADING_METHOD s) { mShadingMethod = s; }
 
 protected:
@@ -59 +63 @@
 
         void FirstPass(FrameBufferObject *fbo);
+
+        void FirstPassShadow(FrameBufferObject *fbo, ShadowMap *shadowMap);
 
         void CombineSsao(FrameBufferObject *fbo);
@@ -84 +90 @@
         FrameBufferObject *mFbo;
 
-        bool mUseGlobIllum;
         bool mUseTemporalCoherence;
 
-        int mSampling;
+        int mSamplingMethod;
         int mFboIndex;
+
+        int mShadingMethod;
+
+        bool mRegenerateSamples;
 };
 

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

@@ -33 +33 @@
 #include "SampleGenerator.h"
 #include "FrameBufferObject.h"
-#include "SsaoShader.h"
+#include "DeferredRenderer.h"
 #include "ShadowMapping.h"
 #include "Light.h"
@@ -168 +168 @@
 bool useLODs = true;
 
-SsaoShader::SAMPLING_METHOD samplingMethod = SsaoShader::POISSON;
-SsaoShader::SHADING_METHOD shadingMethod = SsaoShader::DEFAULT;
+DeferredRenderer::SAMPLING_METHOD samplingMethod = DeferredRenderer::POISSON;
+DeferredRenderer::SHADING_METHOD shadingMethod = DeferredRenderer::DEFAULT;
 
 bool showShadowMap = false;
@@ -225 +225 @@
 void InitFBO();
 
-SsaoShader *ssaoShader = NULL;
+DeferredRenderer *ssaoShader = NULL;
 
 static GLenum mrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT};
@@ -431 +431 @@
         InitCg();
 
-        SsaoShader::Init(sCgContext);
+        DeferredRenderer::Init(sCgContext);
 
 
@@ -1014 +1014 @@
                 cgGLDisableProfile(RenderState::sCgFragmentProfile);
 
-                if (!ssaoShader) ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
+                if (!ssaoShader) ssaoShader = new DeferredRenderer(texWidth, texHeight, camera, myfar / 10.0f);
                 
                 ssaoShader->SetShadingMethod(shadingMethod);
@@ -1134 +1134 @@
         case 'P':
         case 'p':
-                if (samplingMethod == SsaoShader::GAUSS)
-                        samplingMethod = SsaoShader::POISSON;
+                if (samplingMethod == DeferredRenderer::GAUSS)
+                        samplingMethod = DeferredRenderer::POISSON;
                 else
-                        samplingMethod = SsaoShader::GAUSS;
+                        samplingMethod = DeferredRenderer::GAUSS;
 
                 break;
@@ -1280 +1280 @@
                 break;
         case GLUT_KEY_F8:
-                shadingMethod = (SsaoShader::SHADING_METHOD)((shadingMethod + 1) % 3);
+                shadingMethod = (DeferredRenderer::SHADING_METHOD)((shadingMethod + 1) % 3);
                 
                 break;