Changeset 2979

Timestamp:

09/28/08 23:36:50 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• FrameBufferObject.cpp (modified) (2 diffs)
• shaders/ssao.cg (modified) (2 diffs)

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

@@ -189 +189 @@
         }
 
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glFlush();
-        glFinish();
-        glEnable(GL_TEXTURE_2D);
+        
         glBindTexture(GL_TEXTURE_2D, mTexId);
-        //glBindTexture(GL_TEXTURE_2D, mTexId);
+        
         GLint width, height;
 
-        glGetTexLevelParameteriv(GL_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &width);
-        glGetTexLevelParameteriv(GL_TEXTURE_2D, 1, GL_TEXTURE_HEIGHT, &height);
+        glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
+        glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
 
         cout << "w: " << width << "h: " << height << endl;
 
-        /*glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
-        glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
-
-        cout << "w: " << width << "h: " << height << endl;
-*/
         unsigned char *data = new unsigned char[bytes * 4 * width * height];
 
-
-        glGetTexImage(GL_TEXTURE_2D, 1, GL_RGBA, GL_FLOAT, data);
-        //glGetTexImage(GL_TEXTURE_RECTANGLE_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, (void *)data);
+        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, data);
 
         glBindTexture(GL_TEXTURE_2D, 0);
@@ -218 +208 @@
         float *d = (float *)data;
 
-        /*for (int i = 0; i < 10000; ++ i)
-        {
-                if (i % 100 == 0)
-                cout << "x: " << d[i];
-        }*/
-        //cout << endl << endl;
         return data;
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg

@@ -52 +52 @@
         float numSamples = 0;
 
-        // avoid singularity of 
-        centerPosition.xyz += currentNormal * 1e-4f;
-
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
@@ -85 +82 @@
                 const float cos_angle = max(dot(direction_to_sample, currentNormal), 0.0f);
 
+                // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
+                // the distance to a sample approaches zero
                 const float distance_intensity = 
                         (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);