Changeset 1328 for GTP/trunk/Lib/Vis/Preprocessing/src/Polygon3.cpp

Timestamp:

09/11/06 00:29:47 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Polygon3.cpp (modified) (6 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Polygon3.cpp

@@ -316 +316 @@
 int Polygon3::CastRay(const Ray &ray, float &t, const float nearestT)
 {
-        Plane3 plane = GetSupportingPlane();
-        float dot = DotProd(plane.mNormal, ray.GetDir());
+        const Plane3 plane = GetSupportingPlane();
+        const float dot = DotProd(plane.mNormal, ray.GetDir());
 
         // Watch for near-zero denominator
         // ONLY single sided polygons!!!!!
         if (dot > -Limits::Small)
-        //  if (fabs(dot) < Limits::Small)
-        return Ray::NO_INTERSECTION;
+        {
+                //  if (fabs(dot) < Limits::Small)
+                return Ray::NO_INTERSECTION;
+        }
 
         t = (-plane.mD - DotProd(plane.mNormal, ray.GetLoc())) / dot;
 
         if (t <= Limits::Small)
-        return Ray::INTERSECTION_OUT_OF_LIMITS;
-
-        if (t >= nearestT) {
-        return Ray::INTERSECTION_OUT_OF_LIMITS; // no intersection was found
+        {
+                return Ray::INTERSECTION_OUT_OF_LIMITS;
+        }
+
+        if (t >= nearestT) 
+        {
+                return Ray::INTERSECTION_OUT_OF_LIMITS; // no intersection was found
         }
 
@@ -338 +343 @@
         int i;
 
-        int paxis = plane.mNormal.DrivingAxis();
+        const int paxis = plane.mNormal.DrivingAxis();
 
         // Project the intersection point onto the coordinate plane
@@ -344 +349 @@
         ray.Extrap(t).ExtractVerts(&u, &v, paxis);
 
-        int size = (int)mVertices.size();
+        const int size = (int)mVertices.size();
 
         mVertices.back().ExtractVerts(&u1, &v1, paxis );
@@ -354 +359 @@
                 {
                 mVertices[i].ExtractVerts(&u2, &v2, paxis);
-            
+           
                         // line u1, v1, u2, v2
-            
-                        if ((v2 - v1)*(u1 - u) > (u2 - u1)*(v1 - v))
+                        if ((v2 - v1) * (u1 - u) > (u2 - u1)*(v1 - v))
                                 return Ray::NO_INTERSECTION;
 
                         u1 = u2;
                         v1 = v2;
-        }
-
-        return Ray::INTERSECTION;
+                }
+                
+                return Ray::INTERSECTION;
         }
 
@@ -537 +541 @@
 
                 if ((count ++) % 2)
+                {
                         j = i ++;
+                }
                 else
+                {
                         j = k --;
+                }
         }
 }
@@ -575 +583 @@
 }
 
-}
+
+AxisAlignedBox3 Polygon3::GetBoundingBox() const
+{
+        VertexContainer::const_iterator vit, vit_end = mVertices.end();
+        
+        AxisAlignedBox3 box;
+        box.Initialize();
+
+        for (vit = mVertices.begin(); vit != vit_end; ++ vit)
+        {
+                box.Include(*vit);
+        }
+
+        return box;
+}
+
+
+}