Changeset 2814 for GTP/trunk

Timestamp:

07/04/08 01:32:30 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• chcdemo.cpp (modified) (3 diffs)
• shaders/deferred.cg (modified) (3 diffs)

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

@@ -98 +98 @@
 
 // rendertexture
-//const static int texWidth = 1024;
-//const static int texHeight = 768;
-const static int texWidth = 2048;
-const static int texHeight = 2048;
+const static int texWidth = 1024;
+const static int texHeight = 768;
+//const static int texWidth = 2048;
+//const static int texHeight = 2048;
 
 int renderedObjects = 0;
@@ -1802 +1802 @@
 #else
 void CreateNoiseTex2D()
-{int w=256;
-int h=256;
+{
         GLubyte *data = new GLubyte[texWidth * texHeight * 4];
 
@@ -1812 +1811 @@
                 const float theta = 2.0f * acos(sqrt(1.0f - rx));
 
-                data[i + 0] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
-                data[i + 1] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
+                data[i + 0] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
+                data[i + 1] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
                 data[i + 2] = 0;
                 data[i + 3] = 255;

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

@@ -44 +44 @@
 
 
+float2 reflect(float2 pt, float2 n)
+{
+  // distance to plane
+  float d = dot(n, pt);
+  // reflect around plane
+  float2 rpt = pt - d * 2.0f * n;
+  
+  //return pt;
+  return rpt;
+}
+
+
 //based on kustls shader        
 float ssao(fragment IN,
@@ -77 +89 @@
     float3 noise = tex2D(noiseTexture, IN.texCoord.xy).xyz * 2.0f - 1.0f;
 
-    float2 offsetTransformed = offset;
-    //float2 offsetTransformed;
-    //offsetTransformed.x = noise.r*offset.x - noise.g*offset.y;
-    //offsetTransformed.y = noise.g*offset.x + noise.r*offset.y;
+    //float2 offsetTransformed = offset;//reflect(offset, noise.xy);
+    float2 offsetTransformed;
+    offsetTransformed.x = noise.r * offset.x - noise.g * offset.y;
+    offsetTransformed.y = noise.g * offset.x + noise.r * offset.y;
                 
     // weight with projected coordinate to reach similar kernel size for near and far
@@ -96 +108 @@
     
     // distance between current position and sample position controls AO intensity.
-    const float maxdist = 1e-1f;
+    const float maxdist = 5e-1f;
     //const float scale = 50.0f;
 
     float distance_intensity = maxdist - length_to_sample;
+    distance_intensity *= distance_intensity;
     distance_intensity = max(distance_intensity, 0.0f);