RayVsModel tests in progress

src/Engine/Core/Collision.cpp

@@ -86,10 +86,14 @@ bool RayVsModel(const Ray& ray,
         glm::vec3 m = ray.Origin - v0;
         glm::vec3 MxE1 = glm::cross(m, e1);
         glm::vec3 DxE2 = glm::cross(ray.Direction, e2);
-        float DetInv = 1.0f / glm::dot(e1, DxE2);
+        float DetInv = glm::dot(e1, DxE2);
+        if (std::abs(DetInv) < FLT_EPSILON) {
+            continue;
+        }
+        DetInv = 1.0f / DetInv;
         float u = glm::dot(m, DxE2) * DetInv;
         float v = glm::dot(ray.Direction, MxE1) * DetInv;
-        if (u < 0 && v < 0 && 1 < u + v) {
+        if (u < 0 || v < 0 || 1 < u + v) {
             continue;
         }
         //Here, u and v are positive, u+v <= 1, and if distance is positive - triangle is hit.
@@ -116,7 +120,10 @@ bool RayVsModel(const Ray& ray,
         glm::vec3 m = ray.Origin - v0;
         glm::vec3 MxE1 = glm::cross(m, e1);
         glm::vec3 DxE2 = glm::cross(ray.Direction, e2);
-        float DetInv = 1.0f / glm::dot(e1, DxE2);
+        float DetInv = glm::dot(e1, DxE2);
+        if (std::abs(DetInv) < FLT_EPSILON) {
+            continue;
+        }
         float dist = glm::dot(e2, MxE1) * DetInv;
         if (dist >= outDistance) {
             continue;

src/Tests/CMakeLists.txt

@@ -12,6 +12,7 @@ include_directories(
 )
 
 file(GLOB SOURCE_FILES
+	"*.h"
     "*.cpp"
 )
 

src/Tests/CollisionTest.cpp

@@ -3,11 +3,18 @@
 #include <boost/test/execution_monitor.hpp>
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
-#include <Engine\Core\Collision.h>
+#include "Engine\Core\Collision.h"
 #include "Engine/Core/AABB.h"
 #include "Engine/Core/Ray.h"
 #include <stdlib.h>//srand
 #include "Engine/Core/OctTree.h"
+//vs model
+#include <sstream>
+
+//ray vs model
+#include "Engine\Core\ResourceManager.h"
+#include "Engine\Rendering\Model.h"
+#include "Engine\Core\Ray.h"
 
 //vs memleaks
 //#define _CRTDBG_MAP_ALLOC
@@ -87,6 +94,92 @@ BOOST_AUTO_TEST_CASE(collisionTest2)
     BOOST_CHECK(test >= 0);
 }
 
+BOOST_AUTO_TEST_CASE(rayVsModelTest)
+{
+    //simple test
+
+    Ray ray;
+    ray.Origin = glm::vec3(-50, 0, 0);
+    //ray.Direction = glm::vec3(-1, 0, 0);
+    ray.Direction = glm::normalize(glm::vec3(1, 0, 0));
+    //inte model, det kräver renderar grejs tydligen
+    ResourceManager::RegisterType<RawModel>("RawModel");
+    auto unitBox = ResourceManager::Load<RawModel>("Models/Core/UnitBox.obj");
+    BOOST_CHECK(unitBox != nullptr);
+    bool hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+    BOOST_CHECK(hit);
+    ray.Direction = glm::normalize(glm::vec3(-1, 0, 0));
+    hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+    BOOST_CHECK(!hit);
+}
+
+BOOST_AUTO_TEST_CASE(rayVsModelTest2)
+{
+    //advanced test, based on ray vs AABB
+    srand(7676762);
+    Ray ray;
+    AABB someAABB;
+    glm::vec3 minPos;
+    glm::vec3 maxPos;
+    bool z;
+    int test = 0;
+    minPos = glm::vec3(-0.5f, -0.5f, -0.5f);
+    maxPos = glm::vec3(0.5f, 0.5f, 0.5f);
+    someAABB = AABB(minPos, maxPos);
+    ResourceManager::RegisterType<RawModel>("RawModel");
+    auto unitBox = ResourceManager::Load<RawModel>("Models/Core/UnitBox.obj");
+    BOOST_CHECK(unitBox != nullptr);
+
+    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;
+        ray.Origin /= 100;
+        ray.Origin = glm::vec3(-2, 0, 0);
+        ray.Direction /= 100;
+        ray.Direction = glm::normalize(ray.Direction);
+
+        z = Collision::RayVsAABB(ray, someAABB);
+        if (z) {
+            //hit
+            bool hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+            if (!hit) {
+                hit = hit;
+                glm::vec3 outtttttttt;
+                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices, outtttttttt);
+                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+            }
+            else {
+                hit = hit;
+            }
+            BOOST_CHECK(hit);
+        }
+        //
+        bool hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+        if (hit) {
+            //hit
+            z = Collision::RayVsAABB(ray, someAABB);
+            if (!z) {
+                z = z;
+                z = Collision::RayVsAABB(ray, someAABB);
+                glm::vec3 outtttttttt;
+                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices, outtttttttt);
+                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+            }
+            else {
+                z = z;
+            }
+            BOOST_CHECK(hit);
+        }
+
+    }
+}
+
+
 BOOST_AUTO_TEST_CASE(octTest)
 {
     glm::vec3 mini = glm::vec3(-1, -1, -1);