X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FOctree.hh;h=13ece5bb4ecd9ac0fe75f7d3b838e9bacd0bc123;hp=88dae7ac6492e587d1bb133516a27b4343d98735;hb=71bd9dbaf1c1e3c55a9f63392a73865d8aeee7d4;hpb=64bd443538f57ad1bdff6c6b35953e72141129b2 diff --git a/src/Moof/Octree.hh b/src/Moof/Octree.hh index 88dae7a..13ece5b 100644 --- a/src/Moof/Octree.hh +++ b/src/Moof/Octree.hh @@ -52,8 +52,7 @@ struct OctreeInsertable { virtual ~OctreeInsertable() {} - virtual bool isInsideAabb(const Aabb& aabb) const = 0; - virtual int getOctant(const Aabb& aabb) const = 0; + virtual int getOctant(const Aabb<3>& aabb) const = 0; }; @@ -66,27 +65,16 @@ class Octree : public Entity { std::list objects; - Aabb aabb; - Sphere sphere; - - Node(const Aabb& box) : - aabb(box) + Node(const Aabb<3>& aabb) { - sphere.point = aabb.getCenter(); - sphere.radius = (aabb.min - sphere.point).length(); + mAabb = aabb; + mSphere.point = mAabb.getCenter(); + mSphere.radius = (mAabb.min - mSphere.point).length(); } void draw(Scalar alpha) const { - aabb.draw(alpha); - } - - void drawIfVisible(Scalar alpha, const Frustum& frustum) const - { - if (isVisible(frustum)) - { - aabb.draw(alpha); - } + mAabb.draw(alpha); } void printSize() @@ -110,17 +98,6 @@ class Octree : public Entity if ((*it)->isVisible(frustum)) insertables.push_back(*it); } } - - - bool isVisible(const Frustum& frustum) const - { - if (sphere.isVisible(frustum)) - { - return aabb.isVisible(frustum); - } - - return false; - } }; @@ -137,14 +114,22 @@ private: ASSERT(node.valid() && "invalid node passed"); ASSERT(entity && "null entity passed"); - if (entity->isInsideAabb(node->aabb)) + Aabb<3> entityAabb = entity->getAabb(); + Aabb<3> nodeAabb = node->getAabb(); + + if (!(entityAabb.max[0] < nodeAabb.max[0] && + entityAabb.min[0] > nodeAabb.min[0] && + entityAabb.max[1] < nodeAabb.max[1] && + entityAabb.min[1] > nodeAabb.min[1] && + entityAabb.max[2] < nodeAabb.max[2] && + entityAabb.min[2] > nodeAabb.min[2])) { - return insert_recurse(entity, node); + node->objects.push_back(entity); + return node; } else { - node->objects.push_back(entity); - return node; + return insert_recurse(entity, node); } } @@ -153,7 +138,7 @@ private: ASSERT(node.valid() && "invalid node passed"); ASSERT(entity && "null entity passed"); - int octantNum = entity->getOctant(node->aabb); + int octantNum = entity->getOctant(node->getAabb()); if (octantNum == -1) { node->objects.push_back(entity); @@ -161,12 +146,12 @@ private: } else { - if ((int)tree_.children(node) <= octantNum) + if ((int)mTree.children(node) <= octantNum) { addChild(node, octantNum); } - NodeP child = tree_.child(node, octantNum); + NodeP child = mTree.child(node, octantNum); ASSERT(child.valid() && "expected valid child node"); return insert_recurse(entity, child); @@ -177,12 +162,12 @@ private: { ASSERT(node.valid() && "invalid node passed"); - Aabb octant; + Aabb<3> octant; - for (int i = tree_.children(node); i <= index; ++i) + for (int i = mTree.children(node); i <= index; ++i) { - node->aabb.getOctant(octant, i); - tree_.append(node, octant); + node->getAabb().getOctant(octant, i); + mTree.append(node, octant); } } @@ -194,14 +179,14 @@ private: node->printSize(); - int octantNum = entity.getOctant(node->aabb); + int octantNum = entity.getOctant(node->getAabb()); if (octantNum != -1) { node->getAll(insertables); - if (octantNum < (int)tree_.children(node)) + if (octantNum < (int)mTree.children(node)) { - NodeP child = tree_.child(node, octantNum); + NodeP child = mTree.child(node, octantNum); ASSERT(child.valid() && "expected valid child node"); getNearbyObjects(insertables, entity, child); @@ -221,9 +206,9 @@ private: node->getAll(insertables); - for (unsigned i = 0; i < tree_.children(node); ++i) + for (unsigned i = 0; i < mTree.children(node); ++i) { - NodeP child = tree_.child(node, i); + NodeP child = mTree.child(node, i); ASSERT(child.valid() && "expected valid child node"); getAll(insertables, child); @@ -236,11 +221,11 @@ private: ASSERT(node.valid() && "invalid node passed"); // try to cull by sphere - Frustum::Collision collision = frustum.contains(node->sphere); + Frustum::Collision collision = frustum.contains(node->getSphere()); if (collision == Frustum::OUTSIDE) return; // try to cull by aabb - collision = frustum.contains(node->aabb); + collision = frustum.contains(node->getAabb()); if (collision == Frustum::OUTSIDE) return; @@ -253,13 +238,13 @@ private: node->getIfVisible(insertables, frustum); } - if (tree_.children(node) > 0) + if (mTree.children(node) > 0) { if (collision == Frustum::INSIDE) { - for (unsigned i = 0; i < tree_.children(node); ++i) + for (unsigned i = 0; i < mTree.children(node); ++i) { - NodeP child = tree_.child(node, i); + NodeP child = mTree.child(node, i); ASSERT(child.valid() && "expected valid child node"); getAll(insertables, child); @@ -267,9 +252,9 @@ private: } else // collision == Frustum::INTERSECT { - for (unsigned i = 0; i < tree_.children(node); ++i) + for (unsigned i = 0; i < mTree.children(node); ++i) { - NodeP child = tree_.child(node, i); + NodeP child = mTree.child(node, i); ASSERT(child.valid() && "expected valid child node"); getIfVisible(insertables, frustum, child); @@ -279,7 +264,7 @@ private: } - mutable stlplus::ntree tree_; + mutable stlplus::ntree mTree; public: @@ -287,8 +272,8 @@ public: void print(NodeP node) { logInfo("-----"); - logInfo("depth to node: %d", tree_.depth(node)); - logInfo("size of node: %d", tree_.size(node)); + logInfo("depth to node: %d", mTree.depth(node)); + logInfo("size of node: %d", mTree.size(node)); } static Ptr alloc(const Node& rootNode) @@ -298,13 +283,13 @@ public: explicit Octree(const Node& rootNode) { - tree_.insert(rootNode); + mTree.insert(rootNode); } NodeP insert(InsertableP entity) { - return insert(entity, tree_.root()); + return insert(entity, mTree.root()); } void remove(InsertableP entity, NodeP node) @@ -344,8 +329,8 @@ public: void drawIfVisible(Scalar alpha, const Frustum& frustum) const { std::list objects; - //getIfVisible(objects, frustum); - getNearbyObjects(objects, *savedObj); + getIfVisible(objects, frustum); + //getNearbyObjects(objects, *savedObj); typename std::list::const_iterator it; for (it = objects.begin(); it != objects.end(); ++it) @@ -357,13 +342,13 @@ public: void getAll(std::list& insertables) const { - getAll(insertables, tree_.root()); + getAll(insertables, mTree.root()); } void getIfVisible(std::list& insertables, const Frustum& frustum) const { - getIfVisible(insertables, frustum, tree_.root()); + getIfVisible(insertables, frustum, mTree.root()); } mutable const OctreeInsertable* savedObj; @@ -373,7 +358,7 @@ public: const OctreeInsertable& entity) const { logDebug("--- GETTING NEARBY"); - getNearbyObjects(insertables, entity, tree_.root()); + getNearbyObjects(insertables, entity, mTree.root()); logDebug("---"); savedObj = &entity; }