Changeset 2919 for GTP/trunk

Timestamp:

09/08/08 17:32:16 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Matrix4x4.h (modified) (3 diffs)
• ShadowMapping.cpp (modified) (2 diffs)

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

@@ -82 +82 @@
         // create the rotation matrix that rotates 'vecFrom' to 'vecTo'
         friend Matrix4x4 RotationVectorsMatrix(const Vector3 &vecFrom,
-                const Vector3 &vecTo);
+                                                   const Vector3 &vecTo);
 
         friend Matrix4x4 ScaleMatrix(float X, float Y, float Z);
         friend Matrix4x4 GenRotation(const Vector3 &x, const Vector3 &y,
-                const Vector3 &z);
+                                        const Vector3 &z);
         friend Matrix4x4 QuadricMatrix(float a, float b, float c, float d, float e,
-                float f, float g, float h, float j, float k);
+                                           float f, float g, float h, float j, float k);
         // returns matrix for transforming normal
         friend Matrix4x4 NormalTransformMatrix(const Matrix4x4 &M);
@@ -115 +115 @@
 
         // look from position into given direction with given up vector
-        Matrix4x4 LookAt(const Vector3 &pos, const Vector3 &dir, const Vector3& up);
+        friend Matrix4x4 LookAt(const Vector3 &pos, const Vector3 &dir, const Vector3& up);
 
         // Overloaded output operator.
@@ -160 +160 @@
 Matrix4x4 GetFrustum(float left, float right, float bottom, float top, float near, float far);
 Matrix4x4 LookAt(const Vector3 &pos, const Vector3 &dir, const Vector3& up);
+
+
 }
 

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

@@ -224 +224 @@
 
 
+Vector3 ShadowMap::GetProjViewDir(const Matrix4x4 &lightSpace) const 
+{
+        //get the point in the LVS volume that is nearest to the camera
+        const V3 e = getNearCameraPointE(fs);
+        //construct edge to transform into light-space
+        const V3 b = e+fs.getEyeDir();
+        //transform to light-space
+        const V3 e_lp = lightSpace.mulHomogenPoint(e);
+        const V3 b_lp = lightSpace.mulHomogenPoint(b);
+        V3 projDir(b_lp-e_lp);
+        //project the view direction into the shadow map plane
+        projDir.y() = 0.0;
+        return projDir;
+}
+
+
 bool ShadowMap::CalcLightProjection(Matrix4x4 &lightProj)
 {
@@ -267 +283 @@
         mShadowCam->GetModelViewMatrix(shadowView);
 
+        Vector3 projViewDir = 
         //do Light Space Perspective shadow mapping
         //rotate the lightspace so that the proj light view always points upwards
         //calculate a frame matrix that uses the projViewDir[light-space] as up vector
         //look(from position, into the direction of the projected direction, with unchanged up-vector)
-        //lightProj = Math::look<REAL>(M4(),V3::ZERO(),projViewDir,V3::UNIT_Y())*lightProj
+        Matrix4x4 frame = LookAt(Vector3(0), projViewDir, Vector3(0, 0, 1));
+        lightProj *= frame;
 
         const Matrix4x4 matLispSM =