BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree

Browse Source 
# Conflicts:
#	src/Engine/Core/OctTree.cpp
This commit is contained in:
verysecrethero
2015-12-09 13:37:27 +01:00
parent ed5cd392ab bad42fae1c
commit 519178dfba
3 changed files with 111 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tests/CollisionTest.cpp
+6 -4
View File
@@ -92,12 +92,14 @@ 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));
tree.AddDynamicObject(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));
bool rayIntersected = tree.RayCollides({ origin , glm::normalize(mini - origin) }, data);
BOOST_CHECK(rayIntersected);
tree.ClearDynamicObjects();
rayIntersected = tree.RayCollides({ origin , glm::normalize(mini - origin) }, data);
BOOST_CHECK(!rayIntersected);
}
BOOST_AUTO_TEST_SUITE_END()