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

Update to build on Xcode 6.0: various scoping issues with octree code

meow-7.2.2
callum_linden 2014-10-17 14:31:54 -07:00
parent a38e89bf11
commit 07fd457e13
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llmath/lloctree.h
View File

@ -445,7 +445,7 @@ public:
mDataEnd = &mData[0];
}
notifyRemoval(data);
BaseType::notifyRemoval(data);
checkAlive();
}
@ -711,7 +711,7 @@ public:
//(don't notify listeners of addition)
for (U32 i = 0; i < child->getChildCount(); i++)
{
addChild(child->getChild(i), TRUE);
this->addChild(child->getChild(i), TRUE);
}
//destroy child
@ -755,10 +755,10 @@ public:
return false;
}
if (this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup()))
if (this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup()))
{
//we got it, just act like a branch
oct_node* node = getNodeAt(data);
oct_node* node = oct_node::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() && isInside(data->getPositionGroup())))
while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup())))
{
LLVector4a center, size;
center = this->getCenter();
@ -786,7 +786,7 @@ public:
}
else
{
while (!(this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup())))
while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup())))
{
//the data is outside the root node, we need to grow
LLVector4a center(this->getCenter());
@ -814,7 +814,7 @@ public:
//clear our children and add the root copy
this->clearChildren();
addChild(newnode);
this->addChild(newnode);
}
//insert the data