improved new vorbisfile compatibility

[chaz/yoink] / src / Moof / Octree.cc

diff --git a/src/Moof/Octree.cc b/src/Moof/Octree.cc
index 22b4eb1dd58219b460fa010df0014d9844c808bc..062788daa1f0d0378460c09cfd4b99eff4d924ca 100644 (file)
--- a/src/Moof/Octree.cc
+++ b/src/Moof/Octree.cc
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include "Camera.hh"
+#include "Frustum.hh"
 #include "Log.hh"
 #include "Octree.hh"
        
@@ -45,38 +45,55 @@ void Octree::sort()
 }
 
 
-stlplus::ntree<OctreeNode>::iterator Octree::insert(stlplus::ntree<OctreeNode>::iterator node,
-               EntityP entity)
+OctreeNodeP Octree::insert(EntityP entity, OctreeNodeP node)
 {
        ASSERT(node.valid() && "invalid node passed");
        ASSERT(entity && "null entity passed");
 
-       Plane::Halfspace halfspace;
        int octantNum = -1;
 
+       Plane::Halfspace halfspace;
+
+       // TODO this method needs a lot of work
        Plane xy = node->getAabb().getPlaneXY();
-       halfspace = xy.intersectsSphere(entity->getSphere());
+
+
+       // make sure the entity is fully inside the volume
+       if (!(entity->getAabb().max[0] < node->getAabb().max[0] &&
+                       entity->getAabb().min[0] > node->getAabb().min[0] &&
+                       entity->getAabb().max[1] < node->getAabb().max[1] &&
+                       entity->getAabb().min[1] > node->getAabb().min[1] &&
+                       entity->getAabb().max[2] < node->getAabb().max[2] &&
+                       entity->getAabb().min[2] > node->getAabb().min[2]))
+       {
+               // TODO this check is only needed for the root node, if we're inside the
+               // volume of the root node, we'll be fully inside the child as
+               // determined by trying to insert the parent node
+               goto done;
+       }
+
+       halfspace = xy.intersects(entity->getSphere());
        if (halfspace == Plane::INTERSECT)
        {
-               halfspace = xy.intersectsAabb(entity->getAabb());
+               halfspace = xy.intersects(entity->getAabb());
        }
 
        if (halfspace == Plane::POSITIVE)
        {
                Plane xz = node->getAabb().getPlaneXZ();
-               halfspace = xz.intersectsSphere(entity->getSphere());
+               halfspace = xz.intersects(entity->getSphere());
                if (halfspace == Plane::INTERSECT)
                {
-                       halfspace = xz.intersectsAabb(entity->getAabb());
+                       halfspace = xz.intersects(entity->getAabb());
                }
 
                if (halfspace == Plane::POSITIVE)
                {
                        Plane yz = node->getAabb().getPlaneYZ();
-                       halfspace = yz.intersectsSphere(entity->getSphere());
+                       halfspace = yz.intersects(entity->getSphere());
                        if (halfspace == Plane::INTERSECT)
                        {
-                               halfspace = yz.intersectsAabb(entity->getAabb());
+                               halfspace = yz.intersects(entity->getAabb());
                        }
 
                        if (halfspace == Plane::POSITIVE)
@@ -91,10 +108,10 @@ stlplus::ntree<OctreeNode>::iterator Octree::insert(stlplus::ntree<OctreeNode>::
                else if (halfspace == Plane::NEGATIVE)
                {
                        Plane yz = node->getAabb().getPlaneYZ();
-                       halfspace = yz.intersectsSphere(entity->getSphere());
+                       halfspace = yz.intersects(entity->getSphere());
                        if (halfspace == Plane::INTERSECT)
                        {
-                               halfspace = yz.intersectsAabb(entity->getAabb());
+                               halfspace = yz.intersects(entity->getAabb());
                        }
 
                        if (halfspace == Plane::POSITIVE)
@@ -110,19 +127,19 @@ stlplus::ntree<OctreeNode>::iterator Octree::insert(stlplus::ntree<OctreeNode>::
        else if (halfspace == Plane::NEGATIVE)
        {
                Plane xz = node->getAabb().getPlaneXZ();
-               halfspace = xz.intersectsSphere(entity->getSphere());
+               halfspace = xz.intersects(entity->getSphere());
                if (halfspace == Plane::INTERSECT)
                {
-                       halfspace = xz.intersectsAabb(entity->getAabb());
+                       halfspace = xz.intersects(entity->getAabb());
                }
 
                if (halfspace == Plane::POSITIVE)
                {
                        Plane yz = node->getAabb().getPlaneYZ();
-                       halfspace = yz.intersectsSphere(entity->getSphere());
+                       halfspace = yz.intersects(entity->getSphere());
                        if (halfspace == Plane::INTERSECT)
                        {
-                               halfspace = yz.intersectsAabb(entity->getAabb());
+                               halfspace = yz.intersects(entity->getAabb());
                        }
 
                        if (halfspace == Plane::POSITIVE)
@@ -137,10 +154,10 @@ stlplus::ntree<OctreeNode>::iterator Octree::insert(stlplus::ntree<OctreeNode>::
                else if (halfspace == Plane::NEGATIVE)
                {
                        Plane yz = node->getAabb().getPlaneYZ();
-                       halfspace = yz.intersectsSphere(entity->getSphere());
+                       halfspace = yz.intersects(entity->getSphere());
                        if (halfspace == Plane::INTERSECT)
                        {
-                               halfspace = yz.intersectsAabb(entity->getAabb());
+                               halfspace = yz.intersects(entity->getAabb());
                        }
 
                        if (halfspace == Plane::POSITIVE)
@@ -154,6 +171,8 @@ stlplus::ntree<OctreeNode>::iterator Octree::insert(stlplus::ntree<OctreeNode>::
                }
        }
 
+done:
+
        if (octantNum == -1)
        {
                node->objects.push_front(entity);
@@ -166,15 +185,14 @@ stlplus::ntree<OctreeNode>::iterator Octree::insert(stlplus::ntree<OctreeNode>::
                        addChild(node, octantNum);
                }
 
-               stlplus::ntree<OctreeNode>::iterator child = tree_.child(node, octantNum);
+               OctreeNodeP child = tree_.child(node, octantNum);
                ASSERT(child.valid() && "expected valid child node");
 
-               return insert(child, entity);
+               return insert(entity, child);
        }
 }
 
-stlplus::ntree<OctreeNode>::iterator Octree::reinsert(EntityP entity,
-               stlplus::ntree<OctreeNode>::iterator node)
+OctreeNodeP Octree::reinsert(EntityP entity, OctreeNodeP node)
 {
        ASSERT(entity && "null entity passed");
        ASSERT(node.valid() && "invalid node passed");
@@ -191,7 +209,7 @@ stlplus::ntree<OctreeNode>::iterator Octree::reinsert(EntityP entity,
 }
 
 
-void Octree::addChild(stlplus::ntree<OctreeNode>::iterator node, int index)
+void Octree::addChild(OctreeNodeP node, int index)
 {
        ASSERT(node.valid() && "invalid node passed");
 
@@ -205,7 +223,7 @@ void Octree::addChild(stlplus::ntree<OctreeNode>::iterator node, int index)
 }
 
 
-void Octree::draw(stlplus::ntree<OctreeNode>::iterator node, Scalar alpha)
+void Octree::draw(Scalar alpha, OctreeNodeP node)
 {
        ASSERT(node.valid() && "invalid node passed");
 
@@ -213,25 +231,24 @@ void Octree::draw(stlplus::ntree<OctreeNode>::iterator node, Scalar alpha)
 
        for (unsigned i = 0; i < tree_.children(node); ++i)
        {
-               stlplus::ntree<OctreeNode>::iterator child = tree_.child(node, i);
+               OctreeNodeP child = tree_.child(node, i);
                ASSERT(child.valid() && "expected valid child node");
 
-               draw(child, alpha);
+               draw(alpha, child);
        }
 }
 
-void Octree::drawIfVisible(stlplus::ntree<OctreeNode>::iterator node,
-               Scalar alpha, const Camera& cam)
+void Octree::drawIfVisible(Scalar alpha, const Frustum& frustum, OctreeNodeP node)
 {
        ASSERT(node.valid() && "invalid node passed");
 
        // try to cull by sphere
        Frustum::Collision collision =
-               cam.getFrustum().containsSphere(node->getSphere());
+               frustum.contains(node->getSphere());
        if (collision == Frustum::OUTSIDE) return;
 
        // try to cull by aabb
-       collision = cam.getFrustum().containsAabb(node->getAabb());
+       collision = frustum.contains(node->getAabb());
        if (collision == Frustum::OUTSIDE) return;
 
 
@@ -241,7 +258,7 @@ void Octree::drawIfVisible(stlplus::ntree<OctreeNode>::iterator node,
        }
        else // collision == Frustum::INTERSECT
        {
-               node->drawIfVisible(alpha, cam);
+               node->drawIfVisible(alpha, frustum);
        }
 
        if (tree_.children(node) > 0)
@@ -250,20 +267,20 @@ void Octree::drawIfVisible(stlplus::ntree<OctreeNode>::iterator node,
                {
                        for (unsigned i = 0; i < tree_.children(node); ++i)
                        {
-                               stlplus::ntree<OctreeNode>::iterator child = tree_.child(node, i);
+                               OctreeNodeP child = tree_.child(node, i);
                                ASSERT(child.valid() && "expected valid child node");
 
-                               draw(child, alpha);
+                               draw(alpha, child);
                        }
                }
                else // collision == Frustum::INTERSECT
                {
                        for (unsigned i = 0; i < tree_.children(node); ++i)
                        {
-                               stlplus::ntree<OctreeNode>::iterator child = tree_.child(node, i);
+                               OctreeNodeP child = tree_.child(node, i);
                                ASSERT(child.valid() && "expected valid child node");
 
-                               drawIfVisible(child, alpha, cam);
+                               drawIfVisible(alpha, frustum, child);
                        }
                }
        }