diff options
Diffstat (limited to 'src/crepe/system/AnimatorSystem.cpp')
| -rw-r--r-- | src/crepe/system/AnimatorSystem.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 8bb6465..9aede7f 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -1,4 +1,4 @@ -#include <cstdint> + #include "../api/Animator.h" #include "../facade/SDLContext.h" @@ -13,12 +13,27 @@ void AnimatorSystem::update() { RefVector<Animator> animations = mgr.get_components_by_type<Animator>(); - uint64_t tick = SDLContext::get_instance().get_ticks(); + double elapsed_time = this->timer.get_current_time(); + for (Animator & a : animations) { if (!a.active) continue; - // (10 frames per second) - a.curr_row = (tick / 100) % a.row; - a.spritesheet.mask.x = (a.curr_row * a.spritesheet.mask.w) + a.curr_col; - a.spritesheet.mask = a.spritesheet.mask; + + Animator::Data & ctx = a.data; + double frame_duration = 1.0f / ctx.fps; + + int last_frame = ctx.curr_row; + + int cycle_end = (ctx.cycle_end == -1) ? a.row : ctx.cycle_end; + int total_frames = cycle_end - ctx.cycle_start; + + int curr_frame = static_cast<int>(elapsed_time / frame_duration) % total_frames; + + ctx.curr_row = ctx.cycle_start + curr_frame; + a.spritesheet.mask.x = ctx.curr_row * a.spritesheet.mask.w; + a.spritesheet.mask.y = (ctx.curr_col * a.spritesheet.mask.h); + + if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) { + a.active = false; + } } } |