Changeset 2124 for GTP/trunk/Lib/Vis/Preprocessing/src/AxisAlignedBox3.cpp

Timestamp:

02/19/07 02:51:22 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -209 +209 @@
 int
 AxisAlignedBox3::ComputeMinMaxT(const Ray &ray,
-                                float *tmin,
-                                float *tmax) const
+                                                                float *tmin,
+                                                                float *tmax) const
 {
   float minx, maxx, miny, maxy, minz, maxz;
@@ -301 +301 @@
 int
 AxisAlignedBox3::ComputeMinMaxT(const Ray &ray,
-                                float *tmin,
-                                float *tmax) const
+                                                                float *tmin,
+                                                                float *tmax) const
 {
   const float dirEps = 1e-8f;
@@ -396 +396 @@
 // of intersection with the ray; it returns 1 if the ray hits
 // the bounding box and 0 if it does not.
-int
-AxisAlignedBox3::ComputeMinMaxT(const Ray &ray, float *tmin, float *tmax,
-                                EFaces &entryFace, EFaces &exitFace) const
+int AxisAlignedBox3::ComputeMinMaxT(const Ray &ray, float *tmin, float *tmax,
+                                                                        EFaces &entryFace, EFaces &exitFace) const
 {
   float minx, maxx, miny, maxy, minz, maxz;
@@ -532 +531 @@
 
 // computes the signed distances for case tmin<tmax and tmax>0
-int
-AxisAlignedBox3::GetMinMaxT(const Ray &ray, float *tmin, float *tmax,
-                            EFaces &entryFace, EFaces &exitFace) const
+int AxisAlignedBox3::GetMinMaxT(const Ray &ray, 
+                                                                float *tmin, 
+                                                                float *tmax,
+                                                                EFaces &entryFace,
+                                                                EFaces &exitFace) const
 {
   if (!ComputeMinMaxT(ray, tmin, tmax, entryFace, exitFace))
@@ -583 +584 @@
       b.mMax.y <= mMax.y &&
       b.mMax.z <= mMax.z);
-
 }
 
 
 // compute the coordinates of one vertex of the box
-Vector3
-AxisAlignedBox3::GetVertex(int xAxis, int yAxis, int zAxis) const
+Vector3 AxisAlignedBox3::GetVertex(int xAxis, int yAxis, int zAxis) const
 {
   Vector3 p;
@@ -2389 +2388 @@
  }
 
-/*
-int inline GetIntersection(const float fDst1, 
-                                                   const float fDst2, 
-                                                   const Vector3 p1, 
-                                                   const Vector3 p2, 
-                                                   const Vector3 &hit) 
-{
-        if ((fDst1 * fDst2) >= 0.0f) 
-                return 0;
-    
-        if (fDst1 == fDst2) 
-                return 0; 
-    
-        hit = p1 + (p2 - p1) * (-fDst1 / (fDst2 - fDst1));
-        
-        return 1;
-}
-
-
-int inline InBox( CVec3 Hit, CVec3 B1, CVec3 B2, const int Axis) {
-if ( Axis==1 && Hit.z > B1.z && Hit.z < B2.z && Hit.y > B1.y && Hit.y < B2.y) return 1;
-if ( Axis==2 && Hit.z > B1.z && Hit.z < B2.z && Hit.x > B1.x && Hit.x < B2.x) return 1;
-if ( Axis==3 && Hit.x > B1.x && Hit.x < B2.x && Hit.y > B1.y && Hit.y < B2.y) return 1;
-return 0;
-}
-
-// returns true if line (L1, L2) intersects with the box (B1, B2)
-// returns intersection point in Hit
-int CheckLineBox( CVec3 B1, CVec3 B2, CVec3 L1, CVec3 L2, CVec3 &Hit)
-{
-if (L2.x < B1.x && L1.x < B1.x) return false;
-if (L2.x > B2.x && L1.x > B2.x) return false;
-if (L2.y < B1.y && L1.y < B1.y) return false;
-if (L2.y > B2.y && L1.y > B2.y) return false;
-if (L2.z < B1.z && L1.z < B1.z) return false;
-if (L2.z > B2.z && L1.z > B2.z) return false;
-if (L1.x > B1.x && L1.x < B2.x &&
-    L1.y > B1.y && L1.y < B2.y &&
-    L1.z > B1.z && L1.z < B2.z) 
-    {Hit = L1; 
-    return true;}
-if ( (GetIntersection( L1.x-B1.x, L2.x-B1.x, L1, L2, Hit) && InBox( Hit, B1, B2, 1 ))
-  || (GetIntersection( L1.y-B1.y, L2.y-B1.y, L1, L2, Hit) && InBox( Hit, B1, B2, 2 )) 
-  || (GetIntersection( L1.z-B1.z, L2.z-B1.z, L1, L2, Hit) && InBox( Hit, B1, B2, 3 )) 
-  || (GetIntersection( L1.x-B2.x, L2.x-B2.x, L1, L2, Hit) && InBox( Hit, B1, B2, 1 )) 
-  || (GetIntersection( L1.y-B2.y, L2.y-B2.y, L1, L2, Hit) && InBox( Hit, B1, B2, 2 )) 
-  || (GetIntersection( L1.z-B2.z, L2.z-B2.z, L1, L2, Hit) && InBox( Hit, B1, B2, 3 )))
-        return true;
-
-return false;
-}
-*/
-
-}
-
+
+bool AxisAlignedBox3::Intersects(const Vector3 &lStart, 
+                                                                 const Vector3 &lEnd) const
+{
+   float st, et, fst = 0, fet = 1;
+   float const *bmin = &mMin.x;
+   float const *bmax = &mMax.x;
+   float const *si = &lStart.x;
+   float const *ei = &lEnd.x;
+
+   for (int i = 0; i < 3; ++ i) 
+   {
+      if (*si < *ei) 
+          {
+                  if (*si > *bmax || *ei < *bmin)
+                          return false;
+
+         const float di = *ei - *si;
+                 
+                 st = (*si < *bmin)? (*bmin - *si) / di : 0;
+         et = (*ei > *bmax)? (*bmax - *si) / di : 1;
+      }
+          else 
+          {
+                  if (*ei > *bmax || *si < *bmin)
+                          return false;
+                  
+                  const float di = *ei - *si;
+                  
+                  st = (*si > *bmax)? (*bmax - *si) / di : 0;
+                  et = (*ei < *bmin)? (*bmin - *si) / di : 1;
+      }
+
+      if (st > fst) fst = st;
+      if (et < fet) fet = et;
+      if (fet < fst)
+                  return false;
+          
+          ++ bmin; ++ bmax;
+      ++ si; ++ ei;
+   }
+
+   //*time = fst;
+   return true;
+}
+
+}
+