Little more work with OctTreeTest

2015-12-09 13:56:59 +01:00
parent 519178dfba
commit 8949db5456
3 changed files with 11 additions and 95 deletions
@@ -17,88 +17,5 @@ using boost::unit_test_framework::test_case;
 //#define new DEBUG_CLIENTBLOCK

 BOOST_AUTO_TEST_SUITE(cTest)
-
-BOOST_AUTO_TEST_CASE(cTest)
-{
-    //memleak
-    int* globalLeak = new int[5];
-
-    //fixed seed
-    srand(2);
-    Ray ray;
-    AABB someAABB;
-    glm::vec3 minPos;
-    glm::vec3 maxPos;
-    bool z;
-    int test = 0;
-    for (size_t i = 0; i < 10; i++)
-    {
-        ray.Origin.x = rand() % 100;
-        ray.Origin.y = rand() % 100;
-        ray.Origin.z = rand() % 100;
-        ray.Direction.x = rand() % 100;
-        ray.Direction.y = rand() % 100;
-        ray.Direction.z = rand() % 100;
-        minPos.x = rand() % 100;
-        minPos.y = rand() % 100;
-        minPos.z = rand() % 100;
-        maxPos.x = rand() % 100;
-        maxPos.y = rand() % 100;
-        maxPos.z = rand() % 100;
-
-        someAABB = AABB(minPos, maxPos);
-        z = Collision::RayVsAABB(ray, someAABB);
-        if (z) ++test;
-    }
-    BOOST_CHECK(test >= 0);
-
-    //_CrtDumpMemoryLeaks();
-}
-
-BOOST_AUTO_TEST_CASE(cTest2)
-{
-    //fixed seed
-    srand(2);
-    Ray ray;
-    AABB someAABB;
-    glm::vec3 minPos;
-    glm::vec3 maxPos;
-    bool z;
-    int test = 0;
-    for (size_t i = 0; i < 1000000; i++)
-    {
-        ray.Origin.x = rand() % 100;
-        ray.Origin.y = rand() % 100;
-        ray.Origin.z = rand() % 100;
-        ray.Direction.x = rand() % 100;
-        ray.Direction.y = rand() % 100;
-        ray.Direction.z = rand() % 100;
-        minPos.x = rand() % 100;
-        minPos.y = rand() % 100;
-        minPos.z = rand() % 100;
-        maxPos.x = rand() % 100;
-        maxPos.y = rand() % 100;
-        maxPos.z = rand() % 100;
-
-        someAABB = AABB(minPos, maxPos);
-        z = Collision::RayAABBIntr(ray, someAABB);
-        if (z) ++test;
-    }
-    BOOST_CHECK(test >= 0);
-}
-
-BOOST_AUTO_TEST_CASE(octTest)
-{
-    glm::vec3 mini = glm::vec3(-1, -1, -1);
-    glm::vec3 maxi = glm::vec3(1, 1, 1);
-    OctTree tree(AABB(mini, maxi), 2);
-    tree.AddBox(AABB(mini, -0.9f*maxi));
-    OctTree::Output data;
-    glm::vec3 origin = 3.0f * mini;
-    BOOST_CHECK(tree.RayCollides({origin , glm::normalize(mini - origin) }, data));
-    tree.ClearBoxes();
-    BOOST_CHECK(!tree.RayCollides({ origin , glm::normalize(mini - origin) }, data));
-}
-
 BOOST_AUTO_TEST_SUITE_END()