Changeset 2913 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.cpp

Timestamp:

09/08/08 00:52:31 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.cpp (modified) (2 diffs)

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

@@ -151 +151 @@
         float fov = mFovy;
 
+        const float aspectRatio = GetAspect();
+
         const float w_near = 2.0f * tan(fov * 0.5f) * z_near;
-        const float h_near = w_near / GetAspect();
+        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 / GetAspect();
+        const float h_far = w_far / aspectRatio;
 
         const Vector3 fc = pos + view * z_far; 
@@ -196 +198 @@
 }
 
-
-Polyhedron *Camera::CalcClippedFrustum(const AxisAlignedBox3 &box) const
-{
-        Vector3 ftl, ftr, fbl, fbr;
-        Vector3 ntl, ntr, nbl, nbr;
-
-        VertexArray sides[6];
-
-        ComputeBasePoints(ftl, ftr, fbl, fbr,ntl, ntr, nbl, nbr);
-        //ComputePoints(ftl, ftr, fbl, fbr,ntl, ntr, nbl, nbr);
-
-        for (int i = 0; i < 6; i ++)
-                sides[i].resize(4);
-        
-        // left, right
-        sides[0][0] = ntl; sides[0][1] = ftl; sides[0][2] = fbl; sides[0][3] = nbl;
-        sides[1][0] = ntr; sides[1][1] = ftr; sides[1][2] = fbr; sides[1][3] = nbr;
-        // bottom, top
-        sides[2][0] = ntl; sides[2][1] = ftl; sides[2][2] = ftr; sides[2][3] = ntr;
-        sides[3][0] = nbl; sides[3][1] = fbl; sides[3][2] = fbr; sides[3][3] = nbr;
-        // near, far
-        sides[4][0] = ntl; sides[4][1] = ntr; sides[4][2] = nbr; sides[4][3] = nbl; 
-        sides[5][0] = ntl; sides[5][1] = ntr; sides[5][2] = nbr; sides[5][3] = nbl;
-
-
-        //////////
-        //-- compute polyhedron
-
-        PolygonContainer polygons;
-
-        for (int i = 0; i < 6; ++ i)
-        {
-                Polygon3 *poly = new Polygon3(sides[i]);
-                polygons.push_back(poly);
-        }
-
-        Polyhedron *p = new Polyhedron(polygons);
-
-        //Polyhedron *clippedPolyhedron = box.CalcIntersection(po);
-        //DEL_PTR(p);
-
-        //return clippedPolyhedron;
-        return p;
-}