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

Fixed wrong paths and added an outDistance to RayVsAABB.

Browse Source
This commit is contained in:
William Moberg
2015-12-03 17:24:53 +01:00
parent abb61d2cd6
commit af5b3a9302
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tests/CollisionTest.cpp
+8 -6
View File
@@ -2,6 +2,8 @@
using boost::unit_test_framework::test_suite;
using boost::unit_test_framework::test_case;
#include <Engine\Core\Collision.h>
#include "Engine/Core/AABB.h"
#include "Engine/Core/Ray.h"
#include <stdlib.h>//srand
BOOST_AUTO_TEST_SUITE(collisionTests)
@@ -10,8 +12,8 @@ BOOST_AUTO_TEST_CASE(collisionTest)
{
//fixed seed
srand(2);
Collision::Ray ray;
Collision::AABB someAABB;
Ray ray;
AABB someAABB;
glm::vec3 minPos;
glm::vec3 maxPos;
bool z;
@@ -31,7 +33,7 @@ BOOST_AUTO_TEST_CASE(collisionTest)
maxPos.y = rand() % 100;
maxPos.z = rand() % 100;
someAABB = Collision::AABB(minPos, maxPos);
someAABB = AABB(minPos, maxPos);
z = Collision::RayVsAABB(ray, someAABB);
if (z) ++test;
}
@@ -42,8 +44,8 @@ BOOST_AUTO_TEST_CASE(collisionTest2)
{
//fixed seed
srand(2);
Collision::Ray ray;
Collision::AABB someAABB;
Ray ray;
AABB someAABB;
glm::vec3 minPos;
glm::vec3 maxPos;
bool z;
@@ -63,7 +65,7 @@ BOOST_AUTO_TEST_CASE(collisionTest2)
maxPos.y = rand() % 100;
maxPos.z = rand() % 100;
someAABB = Collision::AABB(minPos, maxPos);
someAABB = AABB(minPos, maxPos);
z = Collision::RayAABBIntr(ray, someAABB);
if (z) ++test;
}