Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5464 from nnesse/master

Browse source 
Remove redundant code in getOrCreateChildElementAt()
This commit is contained in:
Seth Alves 2015-08-04 15:54:14 -07:00
commit fcec6cb1f0
1 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libraries/octree/src/OctreeElement.cpp
View file

@ -639,50 +639,7 @@ OctreeElement* OctreeElement::getOrCreateChildElementAt(float x, float y, float
// otherwise, we need to find which of our children we should recurse // otherwise, we need to find which of our children we should recurse
glm::vec3 ourCenter = _cube.calcCenter(); glm::vec3 ourCenter = _cube.calcCenter();
int childIndex = CHILD_UNKNOWN; int childIndex = getMyChildContainingPoint(glm::vec3(x, y, z));
// left half
if (x > ourCenter.x) {
if (y > ourCenter.y) {
// top left
if (z > ourCenter.z) {
// top left far
childIndex = CHILD_TOP_LEFT_FAR;
} else {
// top left near
childIndex = CHILD_TOP_LEFT_NEAR;
}
} else {
// bottom left
if (z > ourCenter.z) {
// bottom left far
childIndex = CHILD_BOTTOM_LEFT_FAR;
} else {
// bottom left near
childIndex = CHILD_BOTTOM_LEFT_NEAR;
}
}
} else {
// right half
if (y > ourCenter.y) {
// top right
if (z > ourCenter.z) {
// top right far
childIndex = CHILD_TOP_RIGHT_FAR;
} else {
// top right near
childIndex = CHILD_TOP_RIGHT_NEAR;
}
} else {
// bottom right
if (z > ourCenter.z) {
// bottom right far
childIndex = CHILD_BOTTOM_RIGHT_FAR;
} else {
// bottom right near
childIndex = CHILD_BOTTOM_RIGHT_NEAR;
}
}
}
// Now, check if we have a child at that location // Now, check if we have a child at that location
child = getChildAtIndex(childIndex); child = getChildAtIndex(childIndex);