InVoxel() for all Primitives, including fix for Triangle::CalcBounds()

diff --git a/InfinitePlane.cxx b/InfinitePlane.cxx
index 13d6e53..93e165f 100644 (file)
--- a/InfinitePlane.cxx
+++ b/InfinitePlane.cxx
@@ -55,5 +55,5 @@ InfinitePlane::CalcBounds()
 bool
 InfinitePlane::InVoxel(const Box& box)
 {
-  return false;
+  return CalcBounds().Overlaps(box);
 }

diff --git a/Sphere.cxx b/Sphere.cxx
index 6060361..137ce8f 100644 (file)
--- a/Sphere.cxx
+++ b/Sphere.cxx
@@ -62,5 +62,5 @@ Sphere::CalcBounds()
 bool
 Sphere::InVoxel(const Box& box)
 {
-  return false;
+  return CalcBounds().Overlaps(box);
 }

diff --git a/Triangle.cxx b/Triangle.cxx
index b718555..873f440 100644 (file)
--- a/Triangle.cxx
+++ b/Triangle.cxx
@@ -68,11 +68,11 @@ Triangle::CalcBounds()
   bounds.Extend(m_a);
   bounds.Extend(m_b);
   bounds.Extend(m_c);
-  return Box();
+  return bounds;
 }
 
 bool
 Triangle::InVoxel(const Box& box)
 {
-  return false;
+  return CalcBounds().Overlaps(box);
 }