]> Dogcows Code - chaz/yoink/blobdiff - src/Moof/Octree.hh
considerable refactoring
[chaz/yoink] / src / Moof / Octree.hh
index 78d3aa875706cd61f4558740c7b90a8cf4f82cd3..774eece11c56cb34236a82d2b23ce6f501765351 100644 (file)
 #ifndef _MOOF_OCTREE_HH_
 #define _MOOF_OCTREE_HH_
 
+#include <algorithm>
 #include <list>
 
 #include <boost/shared_ptr.hpp>
 
+#include <stlplus/ntree.hpp>
+
 #include <Moof/Aabb.hh>
 #include <Moof/Drawable.hh>
 #include <Moof/Entity.hh>
 #include <Moof/Math.hh>
 #include <Moof/Sphere.hh>
-#include <Moof/Tree.hh>
        
 
 namespace Mf {
 
 
+class Camera;
+
+
 struct OctreeNode : public Entity
 {
-       std::list<EntityPtr> objects;
+       std::list<EntityP> objects;
 
        OctreeNode()
        {
@@ -64,24 +69,26 @@ struct OctreeNode : public Entity
 
        void draw(Scalar alpha) const
        {
-               std::list<EntityPtr>::const_iterator it;
+               std::list<EntityP>::const_iterator it;
 
                for (it = objects.begin(); it != objects.end(); ++it)
                {
                        (*it)->draw(alpha);
                }
+
                if (!objects.empty())
                        aabb_.draw(); // temporary
        }
 
        void drawIfVisible(Scalar alpha, const Camera& cam) const
        {
-               std::list<EntityPtr>::const_iterator it;
+               std::list<EntityP>::const_iterator it;
 
                for (it = objects.begin(); it != objects.end(); ++it)
                {
                        (*it)->drawIfVisible(alpha, cam);
                }
+
                if (!objects.empty())
                        aabb_.draw();
        }
@@ -96,245 +103,66 @@ struct OctreeNode : public Entity
 
                return false;
        }
+
+
+       static bool compareZOrder(EntityP a, EntityP b)
+       {
+               return a->getSphere().point[2] < b->getSphere().point[2];
+       }
+
+       void sort()
+       {
+               //std::sort(objects.begin(), objects.end(), compareZOrder);
+               objects.sort(compareZOrder);
+       }
 };
 
 
 class Octree;
-typedef boost::shared_ptr<Octree> OctreePtr;
+typedef boost::shared_ptr<Octree> OctreeP;
 
-class Octree : public Tree<OctreeNode>
+class Octree
 {
+       stlplus::ntree<OctreeNode>::iterator
+               insert(stlplus::ntree<OctreeNode>::iterator node, EntityP entity);
+       
+       void addChild(stlplus::ntree<OctreeNode>::iterator node, int index);
 
-       Octree() {}
+       void draw(stlplus::ntree<OctreeNode>::iterator node, Scalar alpha);
+       void drawIfVisible(stlplus::ntree<OctreeNode>::iterator node,
+                       Scalar alpha, const Camera& cam);
 
-       explicit Octree(const OctreeNode& initNode) :
-               Tree<OctreeNode>(initNode) {}
+       stlplus::ntree<OctreeNode> tree_;
 
 public:
 
-       inline static OctreePtr createNewNode(const OctreeNode& item)
+       inline static OctreeP alloc(const OctreeNode& rootNode)
        {
-               OctreePtr newNode = OctreePtr(new Octree(item));
-               init(newNode);
-               return newNode;
-       }
-
-
-       static Tree<OctreeNode>::WeakPtr add(Ptr node, EntityPtr entity)
-       {
-               Plane::Halfspace halfspace;
-               int octantNum = -1;
-
-               Plane xy = node->node.getAabb().getPlaneXY();
-               halfspace = xy.intersectsSphere(entity->getSphere());
-
-               if (halfspace == Plane::POSITIVE)
-               {
-                       Plane xz = node->node.getAabb().getPlaneXZ();
-                       halfspace = xz.intersectsSphere(entity->getSphere());
-
-                       if (halfspace == Plane::POSITIVE)
-                       {
-                               Plane yz = node->node.getAabb().getPlaneYZ();
-                               halfspace = yz.intersectsSphere(entity->getSphere());
-
-                               if (halfspace == Plane::POSITIVE)
-                               {
-                                       octantNum = 2;
-                               }
-                               else if (halfspace == Plane::NEGATIVE)
-                               {
-                                       octantNum = 3;
-                               }
-                       }
-                       else if (halfspace == Plane::NEGATIVE)
-                       {
-                               Plane yz = node->node.getAabb().getPlaneYZ();
-                               halfspace = yz.intersectsSphere(entity->getSphere());
-
-                               if (halfspace == Plane::POSITIVE)
-                               {
-                                       octantNum = 1;
-                               }
-                               else if (halfspace == Plane::NEGATIVE)
-                               {
-                                       octantNum = 0;
-                               }
-                       }
-               }
-               else if (halfspace == Plane::NEGATIVE)
-               {
-                       Plane xz = node->node.getAabb().getPlaneXZ();
-                       halfspace = xz.intersectsSphere(entity->getSphere());
-
-                       if (halfspace == Plane::POSITIVE)
-                       {
-                               Plane yz = node->node.getAabb().getPlaneYZ();
-                               halfspace = yz.intersectsSphere(entity->getSphere());
-
-                               if (halfspace == Plane::POSITIVE)
-                               {
-                                       octantNum = 6;
-                               }
-                               else if (halfspace == Plane::NEGATIVE)
-                               {
-                                       octantNum = 7;
-                               }
-                       }
-                       else if (halfspace == Plane::NEGATIVE)
-                       {
-                               Plane yz = node->node.getAabb().getPlaneYZ();
-                               halfspace = yz.intersectsSphere(entity->getSphere());
-
-                               if (halfspace == Plane::POSITIVE)
-                               {
-                                       octantNum = 5;
-                               }
-                               else if (halfspace == Plane::NEGATIVE)
-                               {
-                                       octantNum = 4;
-                               }
-                       }
-               }
-
-               if (octantNum == -1)
-               {
-                       node->node.objects.push_front(entity);
-                       return node;
-               }
-               else
-               {
-                       if (node->isLeaf())
-                       {
-                               addChildren(node);
-                       }
-
-                       Ptr child = node->getChild(octantNum);
-                       if (child)
-                       {
-                               return add(child, entity);
-                       }
-                       else
-                       {
-                               std::cerr << "no child at index " << octantNum << std::endl;
-                               return Ptr();
-                       }
-                       //return WeakPtr();
-               }
+               return OctreeP(new Octree(rootNode));
        }
 
-       static void addChildren(Ptr node)
+       explicit Octree(const OctreeNode& rootNode)
        {
-               Aabb octant;
-
-               for (int i = 0; i < 8; ++i)
-               {
-                       node->node.getAabb().getOctant(octant, i);
-                       //OctreeNode octantNode(octant);
-
-                       Ptr newChild = createNewNode(octant);
-                       node->addChild(newChild);
-               }
+               tree_.insert(rootNode);
        }
 
-       void draw(Ptr node, Scalar alpha)
+       stlplus::ntree<OctreeNode>::iterator insert(EntityP entity)
        {
-               if (!node)
-               {
-                       std::cerr << "null child :-(" << std::endl;
-                       return;
-               }
-
-               node->node.draw(alpha);
-
-               if (!node->isLeaf())
-               {
-                       Ptr firstChild = node->getFirstChild();
-                       Ptr temp = firstChild;
-
-                       if (!firstChild)
-                       {
-                               std::cerr << "node is not a leaf, but has no first child :-(" << std::endl;
-                               return;
-                       }
-
-                       do
-                       {
-                               draw(temp, alpha);
-                               temp = temp->getNextSibling();
-                       }
-                       while (temp && temp != firstChild);
-               }
+               return insert(tree_.root(), entity);
        }
 
-       void drawIfVisible(Ptr node, Scalar alpha, const Camera& cam)
-       {
-               //node.drawIfVisible(alpha, cam);
-               
-               if (!node)
-               {
-                       std::cerr << "null child :-(" << std::endl;
-                       return;
-               }
-
-               Frustum::Collision collision =
-                       cam.getFrustum().containsSphere(node->node.getSphere());
-               if (collision == Frustum::OUTSIDE) return;
-
-               collision = cam.getFrustum().containsAabb(node->node.getAabb());
-               if (collision == Frustum::OUTSIDE) return;
-
-
-               if (collision == Frustum::INSIDE)
-               {
-                       node->node.draw(alpha);
-               }
-               else // collision == Frustum::INTERSECT
-               {
-                       node->node.drawIfVisible(alpha, cam);
-               }
-
-               if (!node->isLeaf())
-               {
-                       Ptr firstChild = node->getFirstChild();
-                       Ptr temp = firstChild;
-
-                       if (!firstChild)
-                       {
-                               std::cerr << "node is not a leaf, but has no first child :-(" << std::endl;
-                               return;
-                       }
-
-                       if (collision == Frustum::INSIDE)
-                       {
-                               do
-                               {
-                                       draw(temp, alpha);
-                                       temp = temp->getNextSibling();
-                               }
-                               while (temp && temp != firstChild);
-                       }
-                       else // collision == Frustum::INTERSECT
-                       {
-                               do
-                               {
-                                       drawIfVisible(temp, alpha, cam);
-                                       temp = temp->getNextSibling();
-                               }
-                               while (temp && temp != firstChild);
-                       }
-               }
-       }
+       stlplus::ntree<OctreeNode>::iterator reinsert(EntityP entity,
+                       stlplus::ntree<OctreeNode>::iterator node);
 
        void drawIfVisible(Scalar alpha, const Camera& cam)
        {
-               drawIfVisible(getThis(), alpha, cam);
+               drawIfVisible(tree_.root(), alpha, cam);
        }
 
+       void sort();
 };
 
 
-
 } // namespace Mf
 
 #endif // _MOOF_OCTREE_HH_
This page took 0.028833 seconds and 4 git commands to generate.