Changeset 2815 for GTP/trunk

Timestamp:

07/04/08 03:38:22 (16 years ago)

Author:

mattausch

Message:

shader nice but lights dull

Location:

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

Files:

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

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

@@ -576 +576 @@
         glGenRenderbuffersEXT(1, &depthBuffer); 
         glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, depthBuffer);
-        glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, texWidth, texHeight);
+        glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, texWidth, texHeight);
         glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depthBuffer);
 
@@ -821 +821 @@
         glLightfv(GL_LIGHT0, GL_POSITION, position);
 
-        GLfloat position1[] = {bvh->GetBox().Center().x, bvh->GetBox().Max().y, bvh->GetBox().Center().z, 1.0f};
+        GLfloat position1[] = {bvh->GetBox().Center().x, bvh->GetBox().Center().y, bvh->GetBox().Max().z, 1.0f};
         glLightfv(GL_LIGHT1, GL_POSITION, position1);
 }

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

@@ -70 +70 @@
   // the normal on the current position
   float3 centerNormal = tex2D(normals, IN.texCoord.xy).xyz;
-  normalize(centerNormal);
+  //normalize(centerNormal);
   
   // Check in a circular area around the current position.
@@ -81 +81 @@
   const float areaSize = 5e-1f;
   //const float areaSize = 1e-4f;
-  const float sampleIntensity = 0.2f;
+  const float sampleIntensity = 0.1f;
   
   for (int i = 0; i < SAMPLES; i ++) {
@@ -130 +130 @@
 {
   pixel OUT;
-  float4 lightDir = float4(1.0f, 1.0f, 1.0f, 0.0f);
-  //float4 lightDir = float4(0.0f, 1.0f, 0.0f, 0.0f);
+
+  float4 lightDir = float4(0.8f, 1.0f, 1.5f, 0.0f);
+  float4 lightDir2 = float4(-0.5f, 0.5f, 0.4f, 0.0f);
   
   float4 color = tex2D(colors, IN.texCoord.xy);
   float3 normal = tex2D(normals, IN.texCoord.xy).xyz;
+
   // expand normal
   normal = normal * 2.0f - 1.0f;
@@ -144 +146 @@
   // float3 L = normalize(lightPosition - position);
   float3 light = normalize(lightDir.xyz);
+  float3 light2 = normalize(lightDir.xyz);
 
   float diffuseLight = max(dot(normal, light), 0.0f);
-  float diffuse = diffuseLight;
+  float diffuseLight2 = max(dot(normal, light2), 0.0f);
+
+  float diffuse = diffuseLight + diffuseLight2;
 
   float ao = ssao(IN, positions, normals, ProjTrafo, noiseTexture);
-  OUT.color = ao; 
-  //OUT.color = ao * (ambient + diffuse) * color;
+  //OUT.color = ao; 
+  OUT.color = ao * (ambient + diffuse) * color;
 
   //float4 currentPos = tex2D(normals, IN.texCoord.xy) * 0.5f + 0.5f;