X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FOctree.hh;h=4657aecf3680d6db4a61b92d17921fe30080329e;hp=ca464a575efa16ad44ade5269005ab9e6c3f4ae4;hb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/Moof/Octree.hh b/src/Moof/Octree.hh
index ca464a5..4657aec 100644
--- a/src/Moof/Octree.hh
+++ b/src/Moof/Octree.hh
@@ -52,7 +52,7 @@ struct OctreeInsertable
 {
 	virtual ~OctreeInsertable() {}
 
-	virtual int getOctant(const Aabb& aabb) const = 0;
+	virtual int getOctant(const Aabb<3>& aabb) const = 0;
 };
 
 
@@ -65,7 +65,7 @@ class Octree : public Entity
 	{
 		std::list<InsertableP> objects;
 
-		Node(const Aabb& aabb)
+		Node(const Aabb<3>& aabb)
 		{
 			mAabb = aabb;
 			mSphere.point = mAabb.getCenter();
@@ -79,7 +79,7 @@ class Octree : public Entity
 
 		void printSize()
 		{
-			logDebug("size of node %d", objects.size());
+			logDebug << "size of node " << objects.size() << std::endl;
 		}
 
 		void getAll(std::list<InsertableP>& insertables) const
@@ -114,8 +114,8 @@ private:
 		ASSERT(node.valid() && "invalid node passed");
 		ASSERT(entity && "null entity passed");
 
-		Aabb entityAabb = entity->getAabb();
-		Aabb nodeAabb = node->getAabb();
+		Aabb<3> entityAabb = entity->getAabb();
+		Aabb<3> nodeAabb = node->getAabb();
 
 		if (!(entityAabb.max[0] < nodeAabb.max[0] &&
 			  entityAabb.min[0] > nodeAabb.min[0] &&
@@ -162,7 +162,7 @@ private:
 	{
 		ASSERT(node.valid() && "invalid node passed");
 
-		Aabb octant;
+		Aabb<3> octant;
 
 		for (int i = mTree.children(node); i <= index; ++i)
 		{
@@ -272,8 +272,8 @@ public:
 	void print(NodeP node)
 	{
 		logInfo("-----");
-		logInfo("depth to node: %d", mTree.depth(node));
-		logInfo("size of node: %d", mTree.size(node));
+		logInfo << "depth to node: " << mTree.depth(node) << std::endl;
+		logInfo << "size of node: " << mTree.size(node) << std::endl;
 	}
 
 	static Ptr alloc(const Node& rootNode)