From 1880d3bd97524455b72a29603b45de2da8de3f31 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 6 Jan 2025 12:05:51 +0100 Subject: hotfix used a.col which is not permitted --- src/crepe/system/AnimatorSystem.cpp | 13 ++++++------- src/example/rendering_particle.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index ec9a445..1a30502 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -25,23 +25,22 @@ void AnimatorSystem::frame_update() { 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; + if (a.elapsed_time >= frame_duration) { + a.elapsed_time = 0ms; + a.frame++; + } + 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; - + //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; } diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index c28d6a0..e6b31a7 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -43,13 +43,17 @@ public: } ); - game_object.add_component( + auto & anim = game_object.add_component( test_sprite, ivec2 {56, 56}, uvec2 {4, 4}, Animator::Data { - .looping = false, + .looping = 0, } ); + anim.set_anim(1); + anim.pause(); + anim.next_anim(); + auto & cam = game_object.add_component( ivec2 {1280, 720}, vec2 {5, 5}, Camera::Data { -- cgit v1.2.3 From db644d1cb7543faff63379ff5f1e69ea0a703f93 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 6 Jan 2025 12:36:39 +0100 Subject: animator fix -_- --- src/crepe/system/AnimatorSystem.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 1a30502..759d14c 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -26,22 +26,22 @@ void AnimatorSystem::frame_update() { duration_t frame_duration = 1000ms / ctx.fps; 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; - 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; + } + } } - 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; + ctx.row = ctx.cycle_start + a.frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; + //a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; + } } -- cgit v1.2.3 From 58542c5f986a8c96cf4313eb27c88154729fb032 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 12:37:51 +0100 Subject: Make format --- src/crepe/system/AnimatorSystem.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 759d14c..ac1fae2 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -38,10 +38,8 @@ void AnimatorSystem::frame_update() { } } - ctx.row = ctx.cycle_start + a.frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; //a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; - } } -- cgit v1.2.3 From eef88cd5804e88b504d940d8256ec17798da9648 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 12:38:54 +0100 Subject: Deleted comment --- src/crepe/system/AnimatorSystem.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index ac1fae2..143d5d6 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -40,6 +40,5 @@ void AnimatorSystem::frame_update() { ctx.row = ctx.cycle_start + a.frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - //a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; } } -- cgit v1.2.3