Changeset 2925 for GTP/trunk

Timestamp:

09/10/08 08:29:37 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• ShadowMapping.cpp (modified) (8 diffs)
• chcdemo.cpp (modified) (1 diff)

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

@@ -209 +209 @@
         ///////////////
         //-- We apply the lispsm algorithm in order to calculate an optimal light projection matrix
-
-
-        ////////
         //-- first find the free parameter values n, and P (the projection center), and the projection depth
 
-        const float n = 1e6;//ComputeN(bounds_ls);
+        //const float n = 1e6f;
+        const float n = ComputeN(bounds_ls);
 
         cout << "n: " << n << endl;
@@ -230 +228 @@
 
         // the new projection center
-        Vector3 projCenter = startPt + Vector3::UNIT_Z() * n;
+        Vector3 projCenter = startPt + Vector3::UNIT_Z() * n * 1000;
 
         cout <<"start: " << startPt << " " << projCenter << " " << Distance(lightSpace * mCamera->GetPosition(), startPt) << endl;
@@ -268 +266 @@
 }
 
-
+#if 0
 Vector3 ShadowMap::GetNearCameraPointE(const VertexArray &pts) const
 {
+        float maxDist = -1e25f;
+        Vector3 nearest = Vector3::ZERO();
+
+        Matrix4x4 eyeView;
+        mCamera->GetModelViewMatrix(eyeView);
+
+        VertexArray newPts;
+        polyhedron->CollectVertices(newPts);
+        
+        //the LVS volume is always in front of the camera
+        VertexArray::const_iterator it, it_end = pts.end();     
+
+        for (it = pts.begin(); it != it_end; ++ it)
+        {
+                Vector3 pt = *it;
+                Vector3 ptE = eyeView * pt;
+//cout<<"i"<< pt.z;
+                if (ptE.z > 0) cerr <<"should not happen " << ptE.z << endl;
+                else
+                if (ptE.z > maxDist)
+                {
+                        cout << " d " << ptE.z;
+        
+                        maxDist = ptE.z;
+                        nearest = pt;
+                }
+        }
+
+        //      Invert(eyeView); return eyeView * nearest;
+        return nearest;
+}
+
+#else
+
+Vector3 ShadowMap::GetNearCameraPointE(const VertexArray &pts) const
+{
+        VertexArray newPts;
+        polyhedron->CollectVertices(newPts);
+
         Vector3 nearest = Vector3::ZERO();
         float minDist = 1e25f;
@@ -276 +313 @@
         const Vector3 camPos = mCamera->GetPosition();
 
-        /*Matrix4x4 inverseCamView;
-        mCamera->GetModelViewMatrix(invervseCamView);
-        inverseCamView.Invert();*/
-
-        VertexArray::const_iterator it, it_end = pts.end();
-
-        for (it = pts.begin(); it != it_end; ++ it)
+        VertexArray::const_iterator it, it_end = newPts.end();
+
+        for (it = newPts.begin(); it != it_end; ++ it)
         {
                 Vector3 pt = *it;
@@ -298 +331 @@
 }
 
+#endif
 
 Vector3 ShadowMap::GetProjViewDir(const Matrix4x4 &lightSpace, const VertexArray &pts) const 
@@ -376 +410 @@
         //calculate a frame matrix that uses the projViewDir[lightspace] as up vector
         //look(from position, into the direction of the projected direction, with unchanged up-vector)
-        Matrix4x4 frame = LookAt(Vector3::ZERO(), projViewDir, Vector3::UNIT_Y());
+        const Matrix4x4 frame = LookAt(Vector3::ZERO(), projViewDir, Vector3::UNIT_Y());
 
         cout << "frame\n " << frame << endl;
@@ -386 +420 @@
                 CalcLispSMTransform(lightView * lightProj, extremalPoints, frustumPoints);
 
-        Vector3 mydummy = Vector3::UNIT_Z();
-
-        cout << "yoyo: " << Normalize(lightView * lightProj * mydummy) << endl;
+        Vector3 mydummy = projViewDir;//Vector3::UNIT_Z();
+        //cout << "transformed unit z vector: " << Normalize(lightView * lightProj * mydummy) << endl;
+        cout << "transformed unit z vector: " << Normalize(frame * mydummy) << endl;
+
         lightProj = lightProj * matLispSM;
 
@@ -537 +572 @@
         //////////////
         //-- compute texture matrix
+
         static Matrix4x4 biasMatrix(0.5f, 0.0f, 0.0f, 0.5f,
                                                                 0.0f, 0.5f, 0.0f, 0.5f,

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

@@ -70 +70 @@
 int renderMode = RenderTraverser::CHCPLUSPLUS;
 // eye near plane distance
-float nearDist = 0.2f; 
+float nearDist = 2.0f; 
 /// the field of view
 float fov = 50.0f;