diff --git a/src/lol/algorithm/aabb_tree.h b/src/lol/algorithm/aabb_tree.h index 313308c1..7ac7b408 100644 --- a/src/lol/algorithm/aabb_tree.h +++ b/src/lol/algorithm/aabb_tree.h @@ -20,8 +20,8 @@ namespace lol //------ AABB TREE SYSTEM ----- template class AABBTree; -template class QuadTree; -template class OcTree; +template class Quadtree; +template class Octree; //-- namespace Debug { @@ -67,13 +67,13 @@ void DrawInner(TREE *tree, Array &boxes, //-- template -void Draw(QuadTree* tree, vec4 color) +void Draw(Quadtree* tree, vec4 color) { Array boxes; Array elements; Array leaves; - DrawInner, TE, box2>(tree, boxes, elements, leaves, 4, color); + DrawInner, TE, box2>(tree, boxes, elements, leaves, 4, color); vec3 off = vec3::v010 * .1f; vec3 add = vec3::v010 * .1f; @@ -98,13 +98,13 @@ void Draw(QuadTree* tree, vec4 color) } //-- template -void Draw(OcTree* tree, vec4 color) +void Draw(Octree* tree, vec4 color) { Array boxes; Array elements; Array leaves; - DrawInner, TE, box3>(tree, boxes, elements, leaves, 8, color); + DrawInner, TE, box3>(tree, boxes, elements, leaves, 8, color); vec3 off = vec3::v010 * .1f; vec3 add = vec3::v010 * .1f; @@ -356,12 +356,12 @@ protected: //-- template -class QuadTree : public AABBTree +class Quadtree : public AABBTree { - friend void Debug::Draw(OcTree* tree, vec4 color); + friend void Debug::Draw(Octree* tree, vec4 color); public: - QuadTree() { m_debug_y_offset = 0.f; } - virtual ~QuadTree() { } + Quadtree() { m_debug_y_offset = 0.f; } + virtual ~Quadtree() { } float m_debug_y_offset; protected: virtual vec2 GetSubOffset(int sub) { return vec2(ivec2(sub % 2, sub / 2)); } @@ -369,12 +369,12 @@ protected: //-- template -class OcTree : public AABBTree +class Octree : public AABBTree { - friend void Debug::Draw(OcTree* tree, vec4 color); + friend void Debug::Draw(Octree* tree, vec4 color); public: - OcTree() { } - virtual ~OcTree() { } + Octree() { } + virtual ~Octree() { } protected: virtual vec3 GetSubOffset(int sub) { return vec3(ivec3(sub % 2, sub / 4, (sub % 4) / 2)); } };