Changeset 3015

Timestamp:

10/08/08 14:55:08 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (2 diffs)
• shaderenv.h (modified) (2 diffs)

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

@@ -696 +696 @@
 
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
-
-        //GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
-        //GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        //GLuint positionsTex = fbo->GetColorBuffer(2)->GetTexture();
-
+#if 1
+        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+        GLuint positionsTex = fbo->GetColorBuffer(2)->GetTexture();
+#else
         GLuint colorsTex = mDownSampleFbo->GetColorBuffer(0)->GetTexture();
         GLuint normalsTex = mDownSampleFbo->GetColorBuffer(1)->GetTexture();
         GLuint positionsTex = mDownSampleFbo->GetColorBuffer(2)->GetTexture();
-        
+#endif
+
         GLuint oldTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
 
@@ -1296 +1297 @@
         downSampleOffsets[6] = -xoffs; downSampleOffsets[7] =  yoffs;
         */
-        const float xoffs = .5f / w;
-        const float yoffs = .5f / h;
+        //const float xoffs = .5f / w;
+        //const float yoffs = .5f / h;
+        
+        const float xoffs = 1.0f / w;
+        const float yoffs = 1.0f / h;
 
         int idx  = 0;

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

@@ -627 +627 @@
 
         // the diffuse color buffer
-        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_NEAREST);
         // the normals buffer
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
@@ -634 +634 @@
         fbo->AddColorBuffer(ColorBufferObject::RGB_UBYTE, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST);
         // another color buffer
-        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_NEAREST);
 
         PrintGLerror("fbo");

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

@@ -15 +15 @@
 #define AREA_SIZE 8e-1f
 
-#define DISTANCE_SCALE 1e-4f
+#define DISTANCE_SCALE 1e-1f
 //#define DISTANCE_SCALE 1e-6f
 
@@ -40 +40 @@
 #define MAX_LOD_LEVEL 10
 
-#define MIN_DEPTH_DIFF 1e-3f
+#define MIN_DEPTH_DIFF 1e-1f
 // burnout
 #define WHITE_LUMINANCE 3e4f