random stuff

[blank.git] / src / model / geometry.cpp

diff --git a/src/model/geometry.cpp b/src/model/geometry.cpp
index b08d59fe5b556ebcdbc680b568cf36358f89a5f7..e0b55826de35ed58bb05ca441a260a5877f45e86 100644 (file)
--- a/src/model/geometry.cpp
+++ b/src/model/geometry.cpp
@@ -47,20 +47,17 @@ bool Intersection(
                *dist = t_min;
        }
        if (normal) {
-               glm::vec4 norm(0.0f);
                if (min_all.x > min_all.y) {
                        if (min_all.x > min_all.z) {
-                               norm.x = t2.x < t1.x ? 1 : -1;
+                               normal->x = t2.x < t1.x ? 1 : -1;
                        } else {
-                               norm.z = t2.z < t1.z ? 1 : -1;
+                               normal->z = t2.z < t1.z ? 1 : -1;
                        }
                } else if (min_all.y > min_all.z) {
-                       norm.y = t2.y < t1.y ? 1 : -1;
+                       normal->y = t2.y < t1.y ? 1 : -1;
                } else {
-                       norm.z = t2.z < t1.z ? 1 : -1;
+                       normal->z = t2.z < t1.z ? 1 : -1;
                }
-               norm = M * norm;
-               *normal = glm::vec3(norm);
        }
        return true;
 }
@@ -70,7 +67,9 @@ bool Intersection(
        const AABB &a_box,
        const glm::mat4 &a_m,
        const AABB &b_box,
-       const glm::mat4 &b_m
+       const glm::mat4 &b_m,
+       float &depth,
+       glm::vec3 &normal
 ) noexcept {
        glm::vec3 a_corners[8] = {
                glm::vec3(a_m * glm::vec4(a_box.min.x, a_box.min.y, a_box.min.z, 1)),
@@ -103,6 +102,10 @@ bool Intersection(
                glm::vec3(b_m * glm::vec4(0, 0, 1, 0)),
        };
 
+       depth = std::numeric_limits<float>::infinity();
+       int min_axis = 0;
+
+       int cur_axis = 0;
        for (const glm::vec3 &axis : axes) {
                float a_min = std::numeric_limits<float>::infinity();
                float a_max = -std::numeric_limits<float>::infinity();
@@ -121,11 +124,17 @@ bool Intersection(
                }
 
                if (a_max < b_min || b_max < a_min) return false;
-       }
 
-       // TODO: find intersection point and normals
-       // normal could be deduced from the axis with the lowest min?
+               float overlap = std::min(a_max, b_max) - std::max(a_min, b_min);
+               if (overlap < depth) {
+                       depth = overlap;
+                       min_axis = cur_axis;
+               }
+
+               ++cur_axis;
+       }
 
+       normal = axes[min_axis];
        return true;
 }