summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-02-11 17:53:05 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-02-11 17:59:32 +0100
commitfbb2582a66be0b98166e1f6ac21eb218aefd82e1 (patch)
treee87a7be1b82d544e9692c0fc86dc4eebc8979dc3 /src
parentada0f5e07d1a67d5067d44e48806a25db30c6135 (diff)
src/scenery, save: store dt as 16-bit fixed point
Bump save proto version.
Diffstat (limited to 'src')
-rw-r--r--src/scenery.cpp9
-rw-r--r--src/scenery.hpp2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/scenery.cpp b/src/scenery.cpp
index 89c04eec..848029da 100644
--- a/src/scenery.cpp
+++ b/src/scenery.cpp
@@ -71,10 +71,11 @@ void scenery::update(float dt, const anim_atlas& anim)
const auto nframes = (int)anim.info().nframes;
fm_debug_assert(anim.info().fps > 0 && anim.info().fps <= 0xff);
- delta += dt;
- const float frame_time = 1.f/hz;
- const auto n = int(delta / frame_time);
- delta -= frame_time * n;
+ auto delta_ = int(delta) + int(65535u * dt);
+ delta_ = std::min(65535, delta_);
+ const auto frame_time = int(1.f/hz * 65535);
+ const auto n = (std::uint8_t)std::clamp(delta_ / frame_time, 0, 255);
+ delta = (std::uint16_t)std::clamp(delta_ - frame_time*n, 0, 65535);
fm_debug_assert(delta >= 0);
const std::int8_t dir = closing ? 1 : -1;
const int fr = frame + dir*n;
diff --git a/src/scenery.hpp b/src/scenery.hpp
index 44d2c6b5..7cdc1f4c 100644
--- a/src/scenery.hpp
+++ b/src/scenery.hpp
@@ -32,7 +32,7 @@ struct scenery final
using frame_t = std::uint16_t;
- float delta = 0;
+ std::uint16_t delta = 0;
frame_t frame = 0;
rotation r : 3 = rotation::N;
scenery_type type : 3 = scenery_type::none;