Changed .obj files to our own format. DummyScene.mesh may be broken.

This commit is contained in:
antc13
2016-01-23 20:35:58 +01:00
parent f1835fd89c
commit 3baa988ad4
26 changed files with 99 additions and 83 deletions
+5 -5
View File
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(collisionTest2)
BOOST_AUTO_TEST_CASE(rayVsModelTest)
{
//simple box test
RayTest("Models/Core/UnitCube.obj"); // 360NoScope Unitcube
RayTest("Models/Core/UnitCube.mesh"); // 360NoScope Unitcube
}
BOOST_AUTO_TEST_CASE(rayVsModelTest2)
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE(rayVsModelTest2)
someAABB = AABB(minPos, maxPos);
//using a rawmodel here, else we have to init the renderingsystem
ResourceManager::RegisterType<RawModel>("RawModel");
auto unitBox = ResourceManager::Load<RawModel>("Models/Core/UnitCube.obj"); // 360NoScope unitcube
auto unitBox = ResourceManager::Load<RawModel>("Models/Core/UnitCube.mesh"); // 360NoScope unitcube
BOOST_CHECK(unitBox != nullptr);
for (size_t i = 0; i < 1000000; i++)
@@ -189,19 +189,19 @@ BOOST_AUTO_TEST_CASE(rayVsModelTest2)
BOOST_AUTO_TEST_CASE(rayVsModelTest3)
{
//simple test
RayTest("Models/Core/UnitSphere.obj"); // 360NoScope unitSphere
RayTest("Models/Core/UnitSphere.mesh"); // 360NoScope unitSphere
}
BOOST_AUTO_TEST_CASE(rayVsModelTest4)
{
//simple test
RayTest("Models/Core/UnitCylinder.obj"); // 360NoScope unitCylinder
RayTest("Models/Core/UnitCylinder.mesh"); // 360NoScope unitCylinder
}
BOOST_AUTO_TEST_CASE(rayVsModelTest5)
{
//simple test
RayTest("Models/Core/UnitRaptor.obj"); // 360NoScope unitRaptor
RayTest("Models/Core/UnitRaptor.mesh"); // 360NoScope unitRaptor
}
BOOST_AUTO_TEST_CASE(octTest)
{