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

Reworked changes to more closely match Cinders' - hers seem more correct

master
callum_linden 2014-11-14 14:50:50 -08:00
parent 129be3f65d
commit ee5463a903
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llmath/lloctree.h
View File

@ -445,7 +445,7 @@ public:
mDataEnd = &mData[0];
}
BaseType::notifyRemoval(data);
this->notifyRemoval(data);
checkAlive();
}
@ -755,10 +755,10 @@ public:
return false;
}
if (this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup()))
if (this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup()))
{
//we got it, just act like a branch
oct_node* node = oct_node::getNodeAt(data);
oct_node* node = this->getNodeAt(data);
if (node == this)
{
LLOctreeNode<T>::insert(data);
@ -771,7 +771,7 @@ public:
else if (this->getChildCount() == 0)
{
//first object being added, just wrap it up
while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup())))
while (!(this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup())))
{
LLVector4a center, size;
center = this->getCenter();
@ -786,7 +786,7 @@ public:
}
else
{
while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup())))
while (!(this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup())))
{
//the data is outside the root node, we need to grow
LLVector4a center(this->getCenter());