Changeset 2914

Timestamp:

09/08/08 01:01:50 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Camera.cpp (modified) (3 diffs)
• ShadowMapping.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (1 diff)

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

@@ -153 +153 @@
         const float aspectRatio = GetAspect();
 
-        const float w_near = 2.0f * tan(fov * 0.5f) * z_near;
-        const float h_near = w_near / aspectRatio;
-
-        const float w_far = 2.0f * tan(fov * 0.5f) * z_far;
-        const float h_far = w_far / aspectRatio;
+        const float h_near = tan(fov * 0.5f) * z_near;
+        const float w_near = h_near * aspectRatio;
+
+        const float h_far = tan(fov * 0.5f) * z_far;
+        const float w_far = h_far * aspectRatio;
 
         const Vector3 fc = pos + view * z_far; 
@@ -163 +163 @@
         Vector3 t1, t2;
 
-        t1 = h_far * 0.5f * up;
-        t2 = w_far * 0.5f * right;
+        t1 = h_far * up;
+        t2 = w_far * right;
 
         ftl = fc + t1 - t2;
@@ -173 +173 @@
         const Vector3 nc = pos + view * z_near;
         
-        t1 = h_near * 0.5f * up;
-        t2 = w_near * 0.5f * right;
+        t1 = h_near * up;
+        t2 = w_near * right;
 
         ntl = nc + t1 - t2;

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

@@ -144 +144 @@
         VertexArray::const_iterator it, it_end = vertices.end();
 
-        cout << "=================" << endl;
+        //cout << "=================" << endl;
 
         for (it = vertices.begin(); it != it_end; ++ it)
@@ -167 +167 @@
                         frustumPoints.push_back(newpt);
 
-                        if (newpt.z < 220)
-                        cout << "ipt: " << newpt << " " << *it << endl;
+                        //if (newpt.z < 220) cout << "ipt: " << newpt << " " << *it << endl;
                 }
         }

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

@@ -334 +334 @@
         ///////////////////////////
 
-        camera = new Camera(winWidth, winHeight, 60);//fov);
+        camera = new Camera(winWidth, winHeight, fov);
         camera->SetNear(nearDist);
         camera->SetFar(1000);