Changeset 2941

Timestamp:

09/13/08 13:20:05 (16 years ago)

Author:

mattausch

Message:

changing camera stuff, not working yet

Location:

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

Files:

• Camera.cpp (modified) (1 diff)
• ShadowMapping.cpp (modified) (2 diffs)
• shaders/deferred.cg (modified) (3 diffs)

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

@@ -53 +53 @@
 {
         Vector3 up = Vector3::UNIT_Z();
-        Vector3 right = Normalize(CrossProd(dir, up));
-        up = Normalize(CrossProd(right, dir));
-
-        mBaseOrientation = Matrix4x4(right, up, -dir);
+        //Vector3 right = Normalize(CrossProd(dir, up));
+        //up = Normalize(CrossProd(right, dir));
+
+        //mBaseOrientation = Matrix4x4(right, up, -dir);
+        mBaseOrientation = MyLookAt(Vector3::ZERO(), dir, up);//Matrix4x4(right, up, -dir);
         mViewOrientation = mBaseOrientation;
 }

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

@@ -605 +605 @@
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 
+//glDisable(GL_CULL_FACE);
+
         glPolygonOffset(1.0f, 2000.0f);
         glEnable(GL_POLYGON_OFFSET_FILL);
+        //glDisable(GL_POLYGON_OFFSET_FILL);
 
         glShadeModel(GL_FLAT);
@@ -757 +760 @@
         DEL_PTR(hpoly);
 
-        //glEnable(GL_CULL_FACE);
 
         glEnable(GL_LIGHTING);

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

@@ -104 +104 @@
         lightSpacePos /= lightSpacePos.w;
 
-        float shadowDepth[9];
+        /*float shadowDepth[9];
 
         float w = sampleWidth;
 
         // pcf sampling using 3 x 3 tab
-
         shadowDepth[0] = tex2D(shadowMap, lightSpacePos.xy).x;
         
@@ -122 +121 @@
         shadowDepth[8] = tex2D(shadowMap, lightSpacePos.xy - float2( 0, -w)).x;
 
-        OUT.color = col;
         
         float depth = lightSpacePos.z;
@@ -134 +132 @@
 
         d /= 9.0f;
-        
-        /*if ((amb < 0.9) && // hack: prevent shadowing the sky 
-                (lightSpacePos.z / lightSpacePos.w > shadowDepth))
+        */
+
+        OUT.color = col;
+
+        float shadowDepth = tex2D(shadowMap, lightSpacePos.xy).x;
+
+        if ((amb < 0.9f) && // hack: prevent shadowing the sky  
+                (lightSpacePos.z > shadowDepth))
         {
                 OUT.color *= 0.1f;
-        }*/
-        
-        if (amb < 0.9) // hack: prevent shadowing the sky       
+        }
+        /*
+        if (amb < 0.9f) // hack: prevent shadowing the sky      
         {
                 const float x = 0.1f;
                 OUT.color *= x + (1.0f - x) * (1.0f - d);
         }
-        
+        */
         //OUT.color = lightSpacePos;//float4(lightSpacePos.z / lightSpacePos.w);
         //OUT.color = float4(shadowDepth);