7 files changed, 30 insertions, 15 deletions
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/api/Color.cpp b/src/crepe/api/Color.cpp
index 6858aa8..1374198 100644
--- a/src/crepe/api/Color.cpp
+++ b/src/crepe/api/Color.cpp
@@ -10,3 +10,4 @@ const Color Color::BLACK {0x00, 0x00, 0x00};
 const Color Color::CYAN {0x00, 0xff, 0xff};
 const Color Color::YELLOW {0xff, 0xff, 0x00};
 const Color Color::MAGENTA {0xff, 0x00, 0xff};
+const Color Color::GREY {0x80, 0x80, 0x80};
diff --git a/src/crepe/api/Color.h b/src/crepe/api/Color.h
index 84edb5c..22c0c43 100644
--- a/src/crepe/api/Color.h
+++ b/src/crepe/api/Color.h
@@ -18,6 +18,7 @@ struct Color {
 	static const Color MAGENTA;
 	static const Color YELLOW;
 	static const Color BLACK;
+	static const Color GREY;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 6b9e3ca..9c226a3 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -85,7 +85,7 @@ struct Config final {
 		 * This config option is the font size at which all fonts will be loaded initially.
 		 * 
 		 */
-		unsigned int size = 16;
+		unsigned int size = 500;
 	} font;
 	//! Configuration for click tolerance.
 	struct {
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index cd9786b..0bbe51f 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -56,6 +56,7 @@ void Engine::loop() {
 
 		try {
 			systems.frame_update();
+			this->scene_manager.load_next_scene();
 		} catch (const exception & e) {
 			Log::logf(
 				Log::Level::WARNING, "Uncaught exception in frame update function: {}\n",
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 0a5a417..1a0cde9 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,34 @@ 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;
 
-		if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) {
+		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;
-			continue;
 		}
-
-		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);
 	}
 }
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