diff options
| -rw-r--r-- | src/crepe/api/Animator.h | 7 | ||||
| -rw-r--r-- | src/crepe/system/AnimatorSystem.cpp | 26 | ||||
| -rw-r--r-- | src/crepe/system/InputSystem.cpp | 2 | ||||
| -rw-r--r-- | src/example/rendering_particle.cpp | 35 |
4 files changed, 30 insertions, 40 deletions
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h index 102894d..95539d3 100644 --- a/src/crepe/api/Animator.h +++ b/src/crepe/api/Animator.h @@ -1,5 +1,6 @@ #pragma once +#include "../manager/LoopTimerManager.h" #include "../types.h" #include "Component.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 0a5a417..ec9a445 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -1,8 +1,8 @@ +#include <chrono> + #include "../api/Animator.h" #include "../manager/ComponentManager.h" #include "../manager/LoopTimerManager.h" -#include "util/Log.h" -#include <chrono> #include "AnimatorSystem.h" @@ -14,29 +14,35 @@ void AnimatorSystem::frame_update() { LoopTimerManager & timer = this->mediator.loop_timer; RefVector<Animator> animations = mgr.get_components_by_type<Animator>(); - float elapsed_time = duration_cast<duration<float>>(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<int>(elapsed_time / frame_duration) % total_frames; - - if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) { + if (!ctx.looping && a.frame >= cycle_end) { a.active = false; continue; } - ctx.row = ctx.cycle_start + curr_frame; + 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.h); + a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; } } diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index 91c9c64..be7eda6 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -216,7 +216,7 @@ 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 diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 8be781a..c28d6a0 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -27,7 +27,7 @@ public: Color color(255, 255, 255, 255); - Asset img {"asset/texture/square.png"}; + Asset img {"asset/spritesheet/pokemon_spritesheet.png"}; Sprite & test_sprite = game_object.add_component<Sprite>( img, @@ -36,21 +36,17 @@ public: .flip = Sprite::FlipSettings {false, false}, .sorting_in_layer = 2, .order_in_layer = 2, - .size = {1, 1}, + .size = {1, 0}, .angle_offset = 0, .position_offset = {0, 1}, .world_space = false, } ); - //auto & emitter = game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{}); - Sprite & test_sprite1 = game_object.add_component<Sprite>( - img, - Sprite::Data { - .color = color, - .size = {1, 1}, - .position_offset = {0, -1}, - .world_space = false, + game_object.add_component<Animator>( + test_sprite, ivec2 {56, 56}, uvec2 {4, 4}, + Animator::Data { + .looping = false, } ); @@ -61,25 +57,6 @@ public: .postion_offset = {1000, 1000}, } ); - - game_object.add_component<Text>( - vec2 {1, 1}, vec2 {0, -1}, "ComicSansMS", - Text::Data { - .text_color = Color::RED, - }, - "test TEST" - ); - - game_object - .add_component<Text>( - vec2 {1, 1}, vec2 {0, 1}, "Ariel", - Text::Data { - .text_color = Color::BLACK, - }, - "TEST test" - ) - .world_space - = true; } string get_name() const { return "TestScene"; }; |