diff options
Diffstat (limited to 'src/crepe/system/AnimatorSystem.cpp')
| -rw-r--r-- | src/crepe/system/AnimatorSystem.cpp | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 4c40940..143d5d6 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -1,24 +1,44 @@ -#include <cstdint> +#include <chrono> -#include "api/Animator.h" -#include "facade/SDLContext.h" +#include "../api/Animator.h" +#include "../manager/ComponentManager.h" +#include "../manager/LoopTimerManager.h" #include "AnimatorSystem.h" -#include "ComponentManager.h" using namespace crepe; +using namespace std::chrono; -void AnimatorSystem::update() { - ComponentManager & mgr = this->component_manager; - +void AnimatorSystem::frame_update() { + ComponentManager & mgr = this->mediator.component_manager; + LoopTimerManager & timer = this->mediator.loop_timer; RefVector<Animator> animations = mgr.get_components_by_type<Animator>(); - uint64_t tick = SDLContext::get_instance().get_ticks(); + duration_t elapsed_time = timer.get_delta_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; + if (a.data.fps == 0) continue; + + Animator::Data & ctx = a.data; + + a.elapsed_time += elapsed_time; + duration_t frame_duration = 1000ms / ctx.fps; + + int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end; + if (a.elapsed_time >= frame_duration) { + a.elapsed_time = 0ms; + a.frame++; + if (a.frame == cycle_end) { + a.frame = ctx.cycle_start; + if (!ctx.looping) { + a.active = false; + continue; + } + } + } + + ctx.row = ctx.cycle_start + a.frame; + a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; } } |