diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/critter.cpp | 13 | ||||
| -rw-r--r-- | src/critter.hpp | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/critter.cpp b/src/critter.cpp index 6f324077..ddb98cb1 100644 --- a/src/critter.cpp +++ b/src/critter.cpp @@ -151,8 +151,9 @@ Vector2 critter::ordinal_offset(Vector2b offset) const void critter::update(size_t i, float dt) { const auto new_r = arrows_to_dir(b_L, b_R, b_U, b_D); - if (new_r == rotation{rotation_COUNT}) + if (new_r == rotation_COUNT) { + offset_frac = {}; delta = 0; return; } @@ -169,7 +170,6 @@ void critter::update(size_t i, float dt) move_vec(rotation_to_vec(_2)), }; - if (r != new_r) if (is_dynamic()) rotate(i, new_r); @@ -181,10 +181,11 @@ void critter::update(size_t i, float dt) for (auto j = 0uz; j < 3; j++) { auto vec = move_vecs[j]; - constexpr auto frac = Vector2(32767); - constexpr auto inv_frac = 1.f / frac; - auto offset_ = vec + Vector2(offset_frac) * inv_frac; - offset_frac = Vector2s(Vector2(std::fmod(offset_[0], 1.f), std::fmod(offset_[1], 1.f)) * frac); + constexpr auto frac = 65535u; + constexpr auto inv_frac = 1.f / (float)frac; + const auto sign_vec = Vector2(sgn(vec[0]), sgn(vec[1])); + auto offset_ = vec + Vector2(offset_frac) * sign_vec * inv_frac; + offset_frac = Vector2us(Vector2(std::fabs(std::fmod(offset_[0], 1.f)), std::fabs(std::fmod(offset_[1], 1.f))) * frac); auto off_i = Vector2i(offset_); if (!off_i.isZero()) if (can_move_to(off_i)) diff --git a/src/critter.hpp b/src/critter.hpp index 34ff9b33..3d7375b0 100644 --- a/src/critter.hpp +++ b/src/critter.hpp @@ -32,7 +32,7 @@ struct critter final : object float depth_offset() const override; String name; - Vector2s offset_frac; + Vector2us offset_frac; bool b_L : 1 = false, b_R : 1 = false, b_U : 1 = false, b_D : 1 = false; bool playable : 1 = false; |