diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
commit | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch) | |
tree | de6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/llmath/llbbox.cpp | |
parent | 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff) | |
parent | 2d6228b4e0454c7d82770748eb572258c402319c (diff) |
merge changes for storm-869
Diffstat (limited to 'indra/llmath/llbbox.cpp')
-rw-r--r-- | indra/llmath/llbbox.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/llmath/llbbox.cpp b/indra/llmath/llbbox.cpp index b46a6e03d2..3e2c05a6e6 100644 --- a/indra/llmath/llbbox.cpp +++ b/indra/llmath/llbbox.cpp @@ -89,6 +89,19 @@ void LLBBox::addBBoxAgent(const LLBBox& b) } } +LLBBox LLBBox::getAxisAligned() const +{ + // no rotation = axis aligned rotation + LLBBox aligned(mPosAgent, LLQuaternion(), LLVector3(), LLVector3()); + + // add the center point so that it's not empty + aligned.addPointAgent(mPosAgent); + + // add our BBox + aligned.addBBoxAgent(*this); + + return aligned; +} void LLBBox::expand( F32 delta ) { @@ -147,6 +160,15 @@ BOOL LLBBox::containsPointAgent(const LLVector3& p) const return containsPointLocal(point_local); } +LLVector3 LLBBox::getMinAgent() const +{ + return localToAgent(mMinLocal); +} + +LLVector3 LLBBox::getMaxAgent() const +{ + return localToAgent(mMaxLocal); +} /* LLBBox operator*(const LLBBox &a, const LLMatrix4 &b) |