src: add scaling factor to allocate_frame_time()

1 files changed, 6 insertions, 6 deletions

diff --git a/src/object.cpp b/src/object.cpp
index 9aca4705..1b0aad58 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -269,16 +269,16 @@ void object::move_to(Magnum::Vector2i delta)
     move_to(i, delta, r);
 }
 
-uint32_t object::allocate_frame_time(Ns dt, uint16_t& accum, uint32_t hz)
+uint32_t object::allocate_frame_time(Ns dt, uint16_t& accum, uint32_t hz, float speed)
 {
     fm_assert(hz > 0);
     fm_assert(dt >= Ns{0});
     constexpr auto ns_in_sec = Ns::Type{Ns(1e9)};
     //const auto count = Ns::Type{ns_in_sec / hz} + accum};
-    const auto nsecs = Ns::Type{dt} + accum * ns_in_sec / Ns::Type{65535};
+    const auto ticks = Ns::Type(float(Ns::Type(dt)) * speed) + accum * ns_in_sec / Ns::Type{65535};
     const auto frame_duration = ns_in_sec / hz;
-    const auto frames = (uint32_t)(nsecs / frame_duration);
-    const auto rem = nsecs % frame_duration;
+    const auto frames = (uint32_t)(ticks / frame_duration);
+    const auto rem = (uint32_t)(ticks % frame_duration);
     const auto new_accum_ = rem * Ns::Type{65535} / ns_in_sec;
     const auto new_accum = (uint16_t)Math::clamp(new_accum_, Ns::Type{0}, Ns::Type{65535});
     [[maybe_unused]] const auto old_accum = accum;
@@ -294,12 +294,12 @@ uint32_t object::allocate_frame_time(Ns dt, uint16_t& accum, uint32_t hz)
     return frames;
 }
 
-uint32_t object::allocate_frame_time(Ns dt)
+uint32_t object::allocate_frame_time(Ns dt, float speed)
 {
     fm_assert(atlas);
     auto hz = atlas->info().fps;
     fm_assert(hz > 0);
-    return allocate_frame_time(dt, delta, hz);
+    return allocate_frame_time(dt, delta, hz, speed);
 }
 
 void object::set_bbox_(Vector2b offset_, Vector2b bb_offset_, Vector2ub bb_size_, pass_mode pass_)