Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for AABox::touches(otherBox)

Browse source
This commit is contained in:
Andrew Meadows 2014-01-27 17:51:05 -08:00
parent 31a2e467f4
commit 2fa3fc523d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/octree/src/AABox.cpp
View file

@ -119,10 +119,10 @@ bool AABox::contains(const AABox& otherBox) const {
bool AABox::touches(const AABox& otherBox) const {
glm::vec3 relativeCenter = _corner - otherBox._corner + (glm::vec3(_scale - otherBox._scale) * 0.5f);
float totalScale = _scale + otherBox._scale;
return fabs(relativeCenter.x) <= totalScale &&
fabs(relativeCenter.y) <= totalScale &&
fabs(relativeCenter.z) <= totalScale;
float totalHalfScale = 0.5f * (_scale + otherBox._scale);
return fabs(relativeCenter.x) <= totalHalfScale &&
fabs(relativeCenter.y) <= totalHalfScale &&
fabs(relativeCenter.z) <= totalHalfScale;
}
// determines whether a value is within the expanded extents