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

src/Tests/CollisionTest.cpp

@@ -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)
 {

src/Tests/HealthSystemTest.cpp

@@ -55,7 +55,7 @@ GameHealthSystemTest::GameHealthSystemTest()
     EntityID playerID = m_World->CreateEntity();
     ComponentWrapper transform = m_World->AttachComponent(playerID, "Transform");
     ComponentWrapper model = m_World->AttachComponent(playerID, "Model");
-    model["Resource"] = "Models/Core/UnitSphere.obj"; // 360NoScope UnitSphere
+    model["Resource"] = "Models/Core/UnitSphere.mesh"; // 360NoScope UnitSphere
     ComponentWrapper player = m_World->AttachComponent(playerID, "Player");
     ComponentWrapper health = m_World->AttachComponent(playerID, "Health");
     healthsID = playerID;
@@ -80,7 +80,7 @@ GameHealthSystemTest::GameHealthSystemTest()
     EntityID playerID2 = m_World->CreateEntity();
     ComponentWrapper transform2 = m_World->AttachComponent(playerID2, "Transform");
     ComponentWrapper model2 = m_World->AttachComponent(playerID2, "Model");
-    model2["Resource"] = "Models/Core/UnitSphere.obj"; // 360NoScope UnitSphere
+    model2["Resource"] = "Models/Core/UnitSphere.mesh"; // 360NoScope UnitSphere
     ComponentWrapper player2 = m_World->AttachComponent(playerID2, "Player");
     ComponentWrapper health2 = m_World->AttachComponent(playerID2, "Health");
     //END TEST

src/Tests/OctTreeTestGameClass.cpp

@@ -149,7 +149,7 @@ void Game::Tick()
         ComponentWrapper transform = m_World->AttachComponent(m_BoxID, "Transform");
         transform["Scale"] = boxSize;
         ComponentWrapper model = m_World->AttachComponent(m_BoxID, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj"; // 360NoScope UnitBox
+        model["Resource"] = "Models/Core/UnitBox.mesh"; // 360NoScope UnitBox
         m_World->createTestEntitiesTest2();
     }
 

src/Tests/OctTreeTestHardCodedTestWorld.h

@@ -112,7 +112,7 @@ private:
         ComponentWrapper transform = world.AttachComponent(entityCollisionBox, "Transform");
         transform["Position"] = glm::vec3(0.f, 2.f, 0.f);
         ComponentWrapper model = world.AttachComponent(entityCollisionBox, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj"; // 360NoScope UnitBox
+        model["Resource"] = "Models/Core/UnitBox.mesh"; // 360NoScope UnitBox
     }
 
     void AddBoxModel(const glm::vec3 &center, const float &halfSize, Octree::Child* child, EntityID &outEntityId) {
@@ -124,7 +124,7 @@ private:
         transform["Position"] = center;
         transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*halfSize*2.0f*0.97f;
         ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj"; // 360NoScope unitBox
+        model["Resource"] = "Models/Core/UnitBox.mesh"; // 360NoScope unitBox
         model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
         if (child->m_DynamicObjIndices.size() != 0)
             model["Color"] = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);

src/Tests/OldOctTree.cpp

@@ -112,7 +112,7 @@ void OctTree::Update(float dt, World* world, Camera* cam)
         ComponentWrapper transform = world->AttachComponent(m_BoxID, "Transform");
         transform["Scale"] = boxSize;
         ComponentWrapper model = world->AttachComponent(m_BoxID, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj"; // 360NoScope UnitBox
+        model["Resource"] = "Models/Core/UnitBox.mesh"; // 360NoScope UnitBox
         m_UpdatedOnce = true;
     }
 

src/Tests/ResourceManagerTest.cpp

@@ -26,8 +26,8 @@ BOOST_AUTO_TEST_CASE(resourceManagerTest)
 
     //configfile without register
     //check so output says "EE failed to load: type not registered..."
-    auto m_ScreenQuadNoRegister = ResourceManager::Load<Model>("Models/Core/ScreenQuad.obj"); // 360NoScope ScreenQuad
-    BOOST_CHECK(!ResourceManager::IsResourceLoaded("Model", "Models/Core/ScreenQuad.obj"));
+    auto m_ScreenQuadNoRegister = ResourceManager::Load<Model>("Models/Core/ScreenQuad.mesh"); // 360NoScope ScreenQuad
+    BOOST_CHECK(!ResourceManager::IsResourceLoaded("Model", "Models/Core/ScreenQuad.mesh"));
 
     //there is no error feedback to check if you try to release the wrong resources - hence that cant be tested either
 }