Merge pull request #37 from teamfisk/OctTree

Oct tree
2016-01-21 09:57:46 +01:00
parent 60037c2849 d1b6fb1259
commit f1a54a89b3
15 changed files with 265 additions and 207 deletions
@@ -205,9 +205,9 @@ BOOST_AUTO_TEST_CASE(octTest)
 {
    glm::vec3 mini = glm::vec3(-1, -1, -1);
    glm::vec3 maxi = glm::vec3(1, 1, 1);
-    Octree tree(AABB(mini, maxi), 2);
+    Octree<AABB> tree(AABB(mini, maxi), 2);
    tree.AddDynamicObject(AABB(mini, -0.9f*maxi));
-    Octree::Output data;
+    OctSpace::Output data;
    glm::vec3 origin = 3.0f * mini;
    bool rayIntersected = tree.RayCollides(Ray(origin , mini - origin), data);
    BOOST_CHECK(rayIntersected);