a

1 files changed, 4 insertions, 163 deletions

diff --git a/editor/tests/walk-test.cpp b/editor/tests/walk-test.cpp
index 0921bffe..47cd753d 100644
--- a/editor/tests/walk-test.cpp
+++ b/editor/tests/walk-test.cpp
@@ -1,15 +1,9 @@
 #include "../tests-private.hpp"
-#include "compat/limits.hpp"
 #include "compat/shared-ptr-wrapper.hpp"
 #include "editor/app.hpp"
-#include "src/world.hpp"
 #include "src/critter.hpp"
-#include "src/point.inl"
-#include "src/anim-atlas.hpp"
-#include "src/nanosecond.hpp"
 #include "floormat/main.hpp"
 #include "../imgui-raii.hpp"
-#include <mg/Functions.h>
 
 namespace floormat::tests {
 
@@ -17,70 +11,6 @@ using namespace floormat::imgui;
 
 namespace {
 
-struct step_s
-{
-    uint32_t count;
-    Vector2b direction;
-};
-
-constexpr step_s next_step_(Vector2i vec_in)
-{
-    const auto vec = Vector2ui(Math::abs(vec_in));
-    const auto signs = Vector2b(Math::sign(vec_in));
-
-    if (vec.x() == vec.y())
-        return { vec.x(), Vector2b{1, 1} * signs };
-    else if (vec.y() == 0)
-        return { vec.x(), Vector2b{1, 0} * signs };
-    else if (vec.x() == 0)
-        return { vec.y(), Vector2b{0, 1} * signs };
-    else
-    {
-        uint32_t major_idx, minor_idx;
-        if (vec.x() > vec.y())
-        {
-            major_idx = 0;
-            minor_idx = 1;
-        }
-        else
-        {
-            major_idx = 1;
-            minor_idx = 0;
-        }
-        const auto major = vec[major_idx], minor = vec[minor_idx];
-        const auto num_axis_aligned = (uint32_t)Math::abs((int)major - (int)minor);
-        auto axis_aligned = Vector2b{};
-        axis_aligned[major_idx] = 1;
-        return { num_axis_aligned, axis_aligned * signs };
-    }
-}
-
-constexpr rotation dir_from_step(step_s step)
-{
-    if (step.direction.isZero()) [[unlikely]]
-        return rotation_COUNT;
-
-    auto x = step.direction.x() + 1;
-    auto y = step.direction.y() + 1;
-    fm_debug_assert((x & 3) == x && (y & 3) == y);
-    auto val = x << 2 | y;
-
-    switch (val)
-    {
-    using enum rotation;
-    case 0 << 2 | 0: /* -1 -1 */ return NW;
-    case 0 << 2 | 1: /* -1  0 */ return W;
-    case 0 << 2 | 2: /* -1  1 */ return SW;
-    case 1 << 2 | 0: /*  0 -1 */ return N;
-    case 1 << 2 | 1: /*  0  0 */ return rotation_COUNT;
-    case 1 << 2 | 2: /*  0  1 */ return S;
-    case 2 << 2 | 0: /*  1 -1 */ return NE;
-    case 2 << 2 | 1: /*  1  0 */ return E;
-    case 2 << 2 | 2: /*  1  1 */ return SE;
-    default: return rotation_COUNT;
-    }
-}
-
 struct pending_s
 {
     point dest;
@@ -102,28 +32,6 @@ struct pf_test final : base_test
     void update_post(app&, const Ns&) override {}
 };
 
-constexpr step_s next_step(point from, point to)
-{
-    fm_debug_assert(from.chunk3().z == to.chunk3().z);
-    const auto vec = to - from;
-    fm_debug_assert(!vec.isZero());
-    return next_step_(vec);
-}
-
-constexpr float step_magnitude(Vector2b vec)
-{
-    constexpr double cʹ = critter::move_speed * critter::frame_time;
-    constexpr double dʹ = cʹ / Vector2d{1,  1}.length();
-    constexpr auto c = (float)cʹ, d = (float)dʹ;
-
-    if (vec.x() * vec.y() != 0)
-        // diagonal
-        return d;
-    else
-        // axis-aligned
-        return c;
-}
-
 bool pf_test::handle_key(app& a, const key_event& e, bool is_down)
 {
     (void) a; (void)e; (void)is_down;
@@ -181,80 +89,13 @@ void pf_test::update_pre(app& a, const Ns& dt)
         return;
     }
 
-    const auto& info = C.atlas->info();
-    const auto nframes = C.alloc_frame_time(dt, C.delta, info.fps, C.speed);
-
-    if (nframes == 0)
-        return;
-
-    C.set_keys_auto();
-
     auto index = C.index();
-    bool ok = true;
-
-    for (uint32_t i = 0; i < nframes; i++)
-    {
-        C.chunk().ensure_passability();
-
-        const auto from = C.position();
-        if (from == current.dest)
-        {
-            current.has_value = false;
-            //Debug{} << "done!" << from;
-            C.set_keys(false, false, false, false);
-            return;
-        }
-        const auto step = next_step(from, current.dest);
-        //Debug{} << "step" << step.direction << step.count << "|" << C.position();
-        if (step.direction == Vector2b{})
-        {
-            //Debug{} << "no dir break";
-            ok = false;
-            break;
-        }
-        fm_assert(step.count > 0);
-        const auto new_r = dir_from_step(step);
-        using Frac = decltype(critter::offset_frac_);
-        constexpr auto frac = (float{limits<Frac>::max}+1)/2;
-        constexpr auto inv_frac = 1 / frac;
-        const auto mag = step_magnitude(step.direction);
-        const auto vec = Vector2(step.direction) * mag;
-        const auto from_accum = C.offset_frac_ * inv_frac * vec;
-        auto offset_ = vec + from_accum;
-        auto off_i = Vector2i(offset_);
-        //Debug{} << "vec" << vec << "mag" << mag << "off_i" << off_i << "offset_" << C.offset_frac_;
-
-        if (!off_i.isZero())
-        {
-            auto rem = Math::fmod(offset_, 1.f).length();
-            C.offset_frac_ = Frac(rem * frac);
-            //Debug{} << "foo1" << C.offset_frac_;
-            if (C.can_move_to(off_i))
-            {
-                C.move_to(index, off_i, new_r);
-                ++C.frame %= info.nframes;
-            }
-            else
-            {
-                ok = false;
-                break;
-            }
-        }
-        else
-        {
-            auto rem = offset_.length();
-            C.offset_frac_ = Frac(rem * frac);
-        }
-    }
+    critter::move_result result;
 
-    if (!ok) [[unlikely]]
-    {
-        //Debug{} << "bad";
-        C.set_keys(false, false, false, false);
-        C.delta = {};
-        C.offset_frac_ = {};
+    if (current.dest == C.position() ||
+        (void(result = C.move_toward(index, dt, current.dest)), result.blocked) ||
+        result.moved && current.dest == C.position())
         current.has_value = false;
-    }
 }
 
 } // namespace