From 2c2bf091409f124946cc63ec3e1fe56d9f59dde1 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 9 Aug 2014 10:11:44 -0700 Subject: [PATCH] Compiler errors in Box::DoIntersect, hidden until now... --- src/objectBox.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/objectBox.cc b/src/objectBox.cc index 17041ef..f194a1a 100644 --- a/src/objectBox.cc +++ b/src/objectBox.cc @@ -108,13 +108,19 @@ Box::DoIntersect(const basics::Ray& ray, Double tNear = -std::numeric_limits::infinity(); Double tFar = std::numeric_limits::infinity(); - if (!IntersectSlab(mNear.x, mFar.x, ray.origin.x, ray.direction.x, tNear, tFar)) { + if (!IntersectSlab(mNear.x, mFar.x, + ray.origin.X(), ray.direction.X(), + tNear, tFar)) { return false; } - if (!IntersectSlab(mNear.y, mFar.y, ray.origin.y, ray.direction.y, tNear, tFar)) { + if (!IntersectSlab(mNear.y, mFar.y, + ray.origin.Y(), ray.direction.Y(), + tNear, tFar)) { return false; } - if (!IntersectSlab(mNear.z, mFar.z, ray.origin.z, ray.direction.z, tNear, tFar)) { + if (!IntersectSlab(mNear.z, mFar.z, + ray.origin.Z(), ray.direction.Z(), + tNear, tFar)) { return false; } @@ -199,6 +205,9 @@ Box::IntersectSlab(const Double& slabLow, } +/* + * charles::Box::Write -- + */ void Box::Write(std::ostream& ost) const