livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ER-407 child bounding boxes not rotated properly for encroachment returnability 

Using the correct method for joining BBoxes in the agent frame ::addBBoxAgent()
master
Andrew Meadows 2010-12-15 11:23:00 -08:00
parent 5663f9dd55
commit 3be87bb046
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llmath/llbbox.cpp
View File

@ -102,20 +102,6 @@ LLBBox LLBBox::getAxisAligned() const
return aligned;
}
// Increases the size to contain other_box
void LLBBox::join(const LLBBox& other_box)
{
LLVector3 other_min = (other_box.mPosAgent - mPosAgent) - other_box.mMinLocal;
mMinLocal.mV[VX] = llmin( other_min.mV[VX], mMinLocal.mV[VX] );
mMinLocal.mV[VY] = llmin( other_min.mV[VY], mMinLocal.mV[VY] );
mMinLocal.mV[VZ] = llmin( other_min.mV[VZ], mMinLocal.mV[VZ] );
LLVector3 other_max = (other_box.mPosAgent - mPosAgent) + other_box.mMaxLocal;
mMaxLocal.mV[VX] = llmax( other_max.mV[VX], mMaxLocal.mV[VX] );
mMaxLocal.mV[VY] = llmax( other_max.mV[VY], mMaxLocal.mV[VY] );
mMaxLocal.mV[VZ] = llmax( other_max.mV[VZ], mMaxLocal.mV[VZ] );
}
void LLBBox::expand( F32 delta )
{

4
indra/llmath/llbbox.h
View File

@ -85,10 +85,6 @@ public:
// Get the smallest possible axis aligned bbox that contains this bbox
LLBBox getAxisAligned() const;
// Increases the size to contain other_box
void join(const LLBBox& other_box);
// friend LLBBox operator*(const LLBBox& a, const LLMatrix4& b);
private:

2
indra/newview/llviewerobject.cpp
View File

@ -524,7 +524,7 @@ bool LLViewerObject::isReturnable()
{
LLViewerObject* child = *iter;
LLBBox child_box(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f);
bounding_box.join(child_box);
bounding_box.addBBoxAgent(child_box);
}
return !isAttachment()