more cleanup

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

diff --git a/src/Moof/Octree.hh b/src/Moof/Octree.hh
index 774eece11c56cb34236a82d2b23ce6f501765351..3614606fd911882dc96195cb28cedd3f83282120 100644 (file)
--- a/src/Moof/Octree.hh
+++ b/src/Moof/Octree.hh
@@ -39,6 +39,7 @@
 #include <Moof/Aabb.hh>
 #include <Moof/Drawable.hh>
 #include <Moof/Entity.hh>
+#include <Moof/Log.hh>
 #include <Moof/Math.hh>
 #include <Moof/Sphere.hh>
        
@@ -49,6 +50,13 @@ namespace Mf {
 class Camera;
 
 
+struct OctreeNode;
+typedef stlplus::ntree<OctreeNode>::iterator OctreeNodeP;
+
+class Octree;
+typedef boost::shared_ptr<Octree> OctreeP;
+
+
 struct OctreeNode : public Entity
 {
        std::list<EntityP> objects;
@@ -118,24 +126,26 @@ struct OctreeNode : public Entity
 };
 
 
-class Octree;
-typedef boost::shared_ptr<Octree> OctreeP;
-
 class Octree
 {
-       stlplus::ntree<OctreeNode>::iterator
-               insert(stlplus::ntree<OctreeNode>::iterator node, EntityP entity);
+       OctreeNodeP insert(EntityP entity, OctreeNodeP node);
        
-       void addChild(stlplus::ntree<OctreeNode>::iterator node, int index);
+       void addChild(OctreeNodeP node, int index);
 
-       void draw(stlplus::ntree<OctreeNode>::iterator node, Scalar alpha);
-       void drawIfVisible(stlplus::ntree<OctreeNode>::iterator node,
-                       Scalar alpha, const Camera& cam);
+       void draw(Scalar alpha, OctreeNodeP node);
+       void drawIfVisible(Scalar alpha, const Camera& cam, OctreeNodeP node);
 
        stlplus::ntree<OctreeNode> tree_;
 
 public:
 
+       inline void print(OctreeNodeP node)
+       {
+               logDebug("-----");
+               logDebug("depth to node: %d", tree_.depth(node));
+               logDebug("size of node: %d", tree_.size(node));
+       }
+
        inline static OctreeP alloc(const OctreeNode& rootNode)
        {
                return OctreeP(new Octree(rootNode));
@@ -146,17 +156,16 @@ public:
                tree_.insert(rootNode);
        }
 
-       stlplus::ntree<OctreeNode>::iterator insert(EntityP entity)
+       OctreeNodeP insert(EntityP entity)
        {
-               return insert(tree_.root(), entity);
+               return insert(entity, tree_.root());
        }
 
-       stlplus::ntree<OctreeNode>::iterator reinsert(EntityP entity,
-                       stlplus::ntree<OctreeNode>::iterator node);
+       OctreeNodeP reinsert(EntityP entity, OctreeNodeP node);
 
        void drawIfVisible(Scalar alpha, const Camera& cam)
        {
-               drawIfVisible(tree_.root(), alpha, cam);
+               drawIfVisible(alpha, cam, tree_.root());
        }
 
        void sort();