eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compiler errors in Box::DoIntersect, hidden until now...

Browse source
This commit is contained in:
Eryn Wells 2014-08-09 10:11:44 -07:00
parent 217c4709aa
commit 2c2bf09140
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/objectBox.cc
View file

@ -108,13 +108,19 @@ Box::DoIntersect(const basics::Ray& ray,
Double tNear = -std::numeric_limits<Double>::infinity();
Double tFar = std::numeric_limits<Double>::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