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

Timestamp:

01/20/07 00:14:25 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -9 +9 @@
 #include "Mesh.h"
 #include "Halton.h"
+#include "Triangle3.h"
+
 
 namespace GtpVisibilityPreprocessor {
@@ -556 +558 @@
 AxisAlignedBox3::IsInside(const Vector3 &v) const
 {
-  return ! (v.x < mMin.x ||
-            v.x > mMax.x ||
-            v.y < mMin.y ||
-            v.y > mMax.y ||
-            v.z < mMin.z ||
-            v.z > mMax.z);
+  return ! ((v.x < mMin.x) ||
+            (v.x > mMax.x) ||
+            (v.y < mMin.y) ||
+            (v.y > mMax.y) ||
+            (v.z < mMin.z) ||
+            (v.z > mMax.z));
 }
 #endif
@@ -2353 +2355 @@
 }
 
+
+ bool AxisAlignedBox3::Intersects(const Mesh &mesh) const
+ {
+         VertexContainer::const_iterator vit, vit_end = mesh.mVertices.end();
+
+         for (vit = mesh.mVertices.begin(); vit != vit_end; ++ vit)
+         {
+                if (IsInside(*vit))
+                        return true;
+         }
+         
+         return false;
+ }
+
+
+ bool AxisAlignedBox3::Intersects(const Triangle3 &tri) const
+ {
+         if (IsInside(tri.mVertices[0]) ||
+                 IsInside(tri.mVertices[1]) ||
+                 IsInside(tri.mVertices[2]))
+         {
+                        return true;
+         }
+
+         return false;
+ }
+
 /*
 int inline GetIntersection(const float fDst1,