Changeset 2899

Timestamp:

09/03/08 13:02:39 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• DeferredRenderer.cpp (modified) (9 diffs)
• FrameBufferObject.cpp (modified) (3 diffs)
• FrameBufferObject.h (modified) (1 diff)
• SampleGenerator.cpp (modified) (1 diff)
• SampleGenerator.h (modified) (1 diff)
• SceneQuery.cpp (modified) (1 diff)
• ShadowMapping.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (1 diff)
• glInterface.h (modified) (1 diff)
• shaderenv.h (modified) (1 diff)

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

@@ -6 +6 @@
 #include "Camera.h"
 #include "shaderenv.h"
-#include "RndGauss.h"
 #include "Halton.h"
 #include "ShadowMapping.h"
@@ -12 +11 @@
 
 using namespace std;
-
-static GLenum mymrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_COLOR_ATTACHMENT3_EXT};
 
 
@@ -130 +127 @@
         case DeferredRenderer::GAUSS:
                 {
-                        static GaussianSampleGenerator gauss(NUM_SAMPLES, 0.5f);
+                        //static GaussianSampleGenerator gauss(NUM_SAMPLES, 0.5f);
+                        //gauss.Generate((Sample2 *)samples);
+
+                        static SphericalSampleGenerator gauss(NUM_SAMPLES, 0.5f);
                         gauss.Generate((Sample2 *)samples);
                 }
@@ -508 +508 @@
         //mNewFbo->Bind();
         mFbo->Bind();
-        glDrawBuffers(1, mymrt + mFboIndex);
+        glDrawBuffers(1, mrt + mFboIndex);
 
 
@@ -657 +657 @@
 
         colorBufferIdx = 3;
-        glDrawBuffers(1, mymrt + colorBufferIdx);
+        glDrawBuffers(1, mrt + colorBufferIdx);
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -727 +727 @@
         mFbo->Bind();
 
-        glDrawBuffers(2, mymrt + mFboIndex);
+        glDrawBuffers(2, mrt + mFboIndex);
 
         //GLuint oldSsaoTex = mOldFbo->GetColorBuffer(0)->GetTexture();
@@ -819 +819 @@
         // overwrite old color texture
         colorBufferIdx = 0;
-        glDrawBuffers(1, mymrt + colorBufferIdx);
+        glDrawBuffers(1, mrt + colorBufferIdx);
 
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
@@ -872 +872 @@
         // overwrite old color texture
         colorBufferIdx = 0;
-        glDrawBuffers(1, mymrt + colorBufferIdx);
+        glDrawBuffers(1, mrt + colorBufferIdx);
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -925 +925 @@
 
         colorBufferIdx = 3;
-        glDrawBuffers(1, mymrt + colorBufferIdx);
+        glDrawBuffers(1, mrt + colorBufferIdx);
 
         

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

@@ -9 +9 @@
 {
 
-GLenum color_attachment[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_COLOR_ATTACHMENT3_EXT};
 
 void PrintFBOStatus(GLenum status)
@@ -73 +72 @@
         
         glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, internalFormat, w, h);
-        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, color_attachment[attachment_idx], GL_RENDERBUFFER_EXT, mId);
+        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, mrt[attachment_idx], GL_RENDERBUFFER_EXT, mId);
 
 
@@ -80 +79 @@
         glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, GL_RGBA, glformat, NULL);
 
-        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, color_attachment[attachment_idx], GL_TEXTURE_2D, mTexId, 0);
+        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, mrt[attachment_idx], GL_TEXTURE_2D, mTexId, 0);
 
         GLuint minfilterParam;

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

@@ -8 +8 @@
 namespace CHCDemoEngine 
 { 
+
 
 

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

@@ -118 +118 @@
         //cout << "minDist after= " << minDist << endl;
 }
+
+
+SphericalSampleGenerator::SphericalSampleGenerator(int numSamples, float radius):
+SampleGenerator(numSamples, radius)
+{}
+
+
+
+
+void SphericalSampleGenerator::Generate(Sample2 *samples) const
+{
+        static HaltonSequence halton;
+        float r[2];
+
+        for (int i = 0; i < mNumSamples; ++ i)
+        {
+                halton.GetNext(2, r);
+
+                // create stratified samples over sphere
+                const float rx = r[0];
+                const float ry = r[1];
+
+                const float theta = 2.0f * acos(sqrt(1.0f - rx));
+                const float phi = 2.0f * M_PI * ry;
+
+                float x = sin(theta) * cos(phi);
+                float y = sin(theta) * sin(phi);
+                float z = cos(theta);
+
+                // project to disc
+                samples[i].x = x / z;
+                samples[i].y = y / z;
+        }
+}

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

@@ -53 +53 @@
 
 
+class SphericalSampleGenerator: public SampleGenerator
+{
+public:
+        
+        SphericalSampleGenerator(int numSamples, float radius);
+
+        virtual void Generate(Sample2 *samples) const;
+};
+
+
 #endif

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

@@ -19 +19 @@
 
 
-static GLenum mrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT};
 
 

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

@@ -13 +13 @@
 {
 
-static GLenum mrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_COLOR_ATTACHMENT3_EXT};
 
 static void PrintGLerror(char *msg)

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

@@ -232 +232 @@
 DeferredRenderer *ssaoShader = NULL;
 
-static GLenum mrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT};
 
 

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

@@ -23 +23 @@
 #endif  
 
+static GLenum mrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_COLOR_ATTACHMENT3_EXT};
+
+
 #endif // GLINTERFACE_H

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

@@ -8 +8 @@
 //#define SAMPLE_INTENSITY 0.14f
 #define SAMPLE_INTENSITY 0.28f
-//#define SAMPLE_INTENSITY 0.9f
+//#define SAMPLE_INTENSITY 1.0f
 
 //#define AREA_SIZE 20e-1f