From f693119c9e102a9b51a1015168ee2a56f2309dd1 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 5 Jan 2025 16:44:25 +0100 Subject: fixed AnimatorSystem bug so that it takes delta time instead of elapsed time, the Animator api has not been changed --- src/crepe/api/Animator.h | 7 +++++++ src/crepe/system/AnimatorSystem.cpp | 23 +++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) (limited to 'src/crepe') diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h index 102894d..efc2f6e 100644 --- a/src/crepe/api/Animator.h +++ b/src/crepe/api/Animator.h @@ -1,6 +1,7 @@ #pragma once #include "../types.h" +#include "../manager/LoopTimerManager.h" #include "Component.h" #include "Sprite.h" @@ -99,6 +100,12 @@ private: //! The maximum number of rows and columns inside the spritesheet const uvec2 grid_size; + // the time elapsed from a frame duration + duration_t elapsed_time = {}; + + // frame counter + unsigned int frame = 0; + //! Uses the spritesheet friend AnimatorSystem; }; diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index e5ab2fa..1a0cde9 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -1,7 +1,8 @@ +#include + #include "../api/Animator.h" #include "../manager/ComponentManager.h" #include "../manager/LoopTimerManager.h" -#include #include "AnimatorSystem.h" @@ -13,27 +14,33 @@ void AnimatorSystem::frame_update() { LoopTimerManager & timer = this->mediator.loop_timer; RefVector animations = mgr.get_components_by_type(); - float elapsed_time = duration_cast>(timer.get_elapsed_time()).count(); + duration_t elapsed_time = timer.get_delta_time(); for (Animator & a : animations) { if (!a.active) continue; if (a.data.fps == 0) continue; Animator::Data & ctx = a.data; - float frame_duration = 1.0f / ctx.fps; - int last_frame = ctx.row; + a.elapsed_time += elapsed_time; + duration_t frame_duration = 1000ms / ctx.fps; + + if (a.elapsed_time <= frame_duration) continue; + + a.elapsed_time = 0ms; + a.frame++; int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end; int total_frames = cycle_end - ctx.cycle_start; + int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames; - int curr_frame = static_cast(elapsed_time / frame_duration) % total_frames; + ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x; + ctx.col = curr_cycle_frame / a.grid_size.x; - ctx.row = ctx.cycle_start + curr_frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - a.spritesheet.mask.y = (ctx.col * a.spritesheet.mask.h); + a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; - if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) { + if (!ctx.looping && a.frame >= cycle_end) { a.active = false; } } -- cgit v1.2.3 From 92dfde9a56f5a607269e8908002a72bec85357bd Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Mon, 6 Jan 2025 10:50:01 +0100 Subject: bug fix --- src/crepe/system/InputSystem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/crepe') diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index 91c9c64..d9c97a3 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -216,8 +216,8 @@ bool InputSystem::is_mouse_inside_button( if (!button.data.world_space) { actual_pos += cam_transform.position; } - vec2 half_dimensions = button.dimensions / 2; - + vec2 half_dimensions = button.dimensions * transform.scale / 2; + return mouse_pos.x >= actual_pos.x - half_dimensions.x && mouse_pos.x <= actual_pos.x + half_dimensions.x && mouse_pos.y >= actual_pos.y - half_dimensions.y -- cgit v1.2.3 From cc2ffe577ad93b126bf9cac6391e678eb54a07f5 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Mon, 6 Jan 2025 10:52:47 +0100 Subject: make format --- src/crepe/system/InputSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crepe') diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index d9c97a3..be7eda6 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -217,7 +217,7 @@ bool InputSystem::is_mouse_inside_button( actual_pos += cam_transform.position; } vec2 half_dimensions = button.dimensions * transform.scale / 2; - + return mouse_pos.x >= actual_pos.x - half_dimensions.x && mouse_pos.x <= actual_pos.x + half_dimensions.x && mouse_pos.y >= actual_pos.y - half_dimensions.y -- cgit v1.2.3 From 958475050c80addf584b6a166649c337c68a879f Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 6 Jan 2025 11:26:23 +0100 Subject: make format with small adjustment system --- src/crepe/api/Animator.h | 2 +- src/crepe/system/AnimatorSystem.cpp | 9 +++++---- src/example/rendering_particle.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/crepe') diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h index efc2f6e..95539d3 100644 --- a/src/crepe/api/Animator.h +++ b/src/crepe/api/Animator.h @@ -1,7 +1,7 @@ #pragma once -#include "../types.h" #include "../manager/LoopTimerManager.h" +#include "../types.h" #include "Component.h" #include "Sprite.h" diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 1a0cde9..ec9a445 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -34,14 +34,15 @@ void AnimatorSystem::frame_update() { int total_frames = cycle_end - ctx.cycle_start; int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames; + if (!ctx.looping && a.frame >= cycle_end) { + a.active = false; + continue; + } + ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x; ctx.col = curr_cycle_frame / a.grid_size.x; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; - - if (!ctx.looping && a.frame >= cycle_end) { - a.active = false; - } } } diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 0082b91..c28d6a0 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -46,7 +46,7 @@ public: game_object.add_component( test_sprite, ivec2 {56, 56}, uvec2 {4, 4}, Animator::Data { - .looping = true, + .looping = false, } ); -- cgit v1.2.3