fix box/box intersection test …again

I am an idiot

diff --git a/doc/todo b/doc/todo
index f2f557e68f6b3e8721d7a88626d71a4b45ec703b..21bf7ae708beb3704f35baba438c2ff6241dfd48 100644 (file)
--- a/doc/todo
+++ b/doc/todo
@@ -83,15 +83,6 @@ gravity
        maybe players should be given the option to switch between
        walk and fly mode
 
-       I had a NaN position while experimenting with (directional) gravity
-       blocks recently. I checked the gravity code and it seems solid, so
-       might be something I overlooked or, what more probable, it triggered
-       some NaN condition in the collision code. Needs investigating
-
-       This may be related to the HUD locking on an entity. If the entity is
-       teleported to a NaN position, the ray intersection test could give a
-       false positive.
-
 block attributes
 
        when blocks are not just a solid rock of color, attributes may

diff --git a/src/geometry/geometry.cpp b/src/geometry/geometry.cpp
index 7d099cf156de9caa2650983395a7dfc562f03a8f..ebd47e9ab9cb10aebe5a7ec760ee74d368dfb460 100644 (file)
--- a/src/geometry/geometry.cpp
+++ b/src/geometry/geometry.cpp
@@ -152,6 +152,7 @@ bool Intersection(
        for (const glm::vec3 &axis : axes) {
                if (any(isnan(axis))) {
                        // can result from the cross products if A and B have parallel axes
+                       ++cur_axis;
                        continue;
                }
                float a_min = std::numeric_limits<float>::infinity();