Compiler errors in Box::DoIntersect, hidden until now...
This commit is contained in:
parent
217c4709aa
commit
2c2bf09140
1 changed files with 12 additions and 3 deletions
|
@ -108,13 +108,19 @@ Box::DoIntersect(const basics::Ray& ray,
|
||||||
Double tNear = -std::numeric_limits<Double>::infinity();
|
Double tNear = -std::numeric_limits<Double>::infinity();
|
||||||
Double tFar = 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;
|
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;
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -199,6 +205,9 @@ Box::IntersectSlab(const Double& slabLow,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* charles::Box::Write --
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
Box::Write(std::ostream& ost)
|
Box::Write(std::ostream& ost)
|
||||||
const
|
const
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue