script speed fix

6 files changed, 43 insertions, 45 deletions

diff --git a/game/hud/HudConfig.h b/game/hud/HudConfig.h
index 1d2ed89..5972f0a 100644
--- a/game/hud/HudConfig.h
+++ b/game/hud/HudConfig.h
@@ -24,5 +24,4 @@ static constexpr const char* COINS = "0000";
 static constexpr int COINS_LENGTH = 4;
 static constexpr float COINS_CHAR_WIDTH = 10;
 static constexpr crepe::vec2 COINS_OFFSET = {0,50};
-
 	
\ No newline at end of file
diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp
index c0d927c..69534d9 100644
--- a/game/hud/SpeedScript.cpp
+++ b/game/hud/SpeedScript.cpp
@@ -1,24 +1,31 @@
 #include "SpeedScript.h"
+#include "api/Event.h"
 #include "api/KeyCodes.h"
 #include "manager/LoopTimerManager.h"
 
 using namespace crepe;
 using namespace std;
 
-void SpeedScript::fixed_update(crepe::duration_t dt){
-	LoopTimerManager & lp =  this->get_loop_timer();
-	if(this->get_key_state(Keycode::HOME)){
-		if(toggle)
+void SpeedScript::init() {
+	this->subscribe<KeyPressEvent>([this](const KeyPressEvent & ev) -> bool {
+		if(ev.key != Keycode::HOME) return false;
+		LoopTimerManager & lp =  this->get_loop_timer();
+		this->toggle = !this->toggle;
+		if(this->toggle)
 		{
 			this->timescale = lp.get_time_scale(); 
 			lp.set_time_scale(0);
-			toggle = false;
 		}
 		else {
 			lp.set_time_scale(this->timescale);
-			toggle = true;
 		}
-	}
+
+		return true;
+	});
+}
+
+void SpeedScript::fixed_update(crepe::duration_t dt){
+	LoopTimerManager & lp =  this->get_loop_timer();
 	if(this->get_key_state(Keycode::PAGE_UP)){
 		lp.set_time_scale(lp.get_time_scale()+0.1);
 	}
diff --git a/game/hud/SpeedScript.h b/game/hud/SpeedScript.h
index 1cc4368..8bd7271 100644
--- a/game/hud/SpeedScript.h
+++ b/game/hud/SpeedScript.h
@@ -5,6 +5,7 @@
 
 class SpeedScript : public crepe::Script {
 public:
+	void init() override;
 	void fixed_update(crepe::duration_t dt) override;
 private:
 	crepe::SaveManager* savemgr;
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 <chrono>
+
 #include "../api/Animator.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/LoopTimerManager.h"
-#include <chrono>
 
 #include "AnimatorSystem.h"
 
@@ -13,27 +14,33 @@ 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;
+		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;
 		}
 	}
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 8be781a..0082b91 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 = true,
 			}
 		);
 
@@ -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"; };