Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button-improvement

32 files changed, 600 insertions, 197 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97b21f0..696856c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,10 +9,12 @@ project(crepe C CXX)
 
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
+find_package(SDL2_ttf REQUIRED)
 find_package(SoLoud REQUIRED)
 find_package(GTest REQUIRED)
 find_package(whereami REQUIRED)
 find_library(BERKELEY_DB db)
+find_library(FONTCONFIG_LIB fontconfig)
 
 add_library(crepe SHARED)
 add_executable(test_main EXCLUDE_FROM_ALL)
@@ -24,9 +26,11 @@ target_include_directories(crepe
 target_link_libraries(crepe
 	PRIVATE soloud
 	PUBLIC SDL2
+	PUBLIC SDL2_ttf
 	PUBLIC SDL2_image
 	PUBLIC ${BERKELEY_DB}
 	PUBLIC whereami
+	PUBLIC ${FONTCONFIG_LIB}
 )
 
 add_subdirectory(crepe)
diff --git a/src/crepe/Particle.cpp b/src/crepe/Particle.cpp
index 485a0d4..b340826 100644
--- a/src/crepe/Particle.cpp
+++ b/src/crepe/Particle.cpp
@@ -2,8 +2,8 @@
 
 using namespace crepe;
 
-void Particle::reset(uint32_t lifespan, const vec2 & position, const vec2 & velocity,
-					 double angle) {
+void Particle::reset(unsigned int lifespan, const vec2 & position, const vec2 & velocity,
+					 float angle) {
 	// Initialize the particle state
 	this->time_in_life = 0;
 	this->lifespan = lifespan;
@@ -15,16 +15,17 @@ void Particle::reset(uint32_t lifespan, const vec2 & position, const vec2 & velo
 	this->force_over_time = {0, 0};
 }
 
-void Particle::update() {
+void Particle::update(double dt) {
 	// Deactivate particle if it has exceeded its lifespan
-	if (++time_in_life >= lifespan) {
+	time_in_life += dt;
+	if (time_in_life >= lifespan) {
 		this->active = false;
 		return;
 	}
 
 	// Update velocity based on accumulated force and update position
-	this->velocity += force_over_time;
-	this->position += velocity;
+	this->velocity += force_over_time * dt;
+	this->position += velocity * dt;
 }
 
 void Particle::stop_movement() {
diff --git a/src/crepe/Particle.h b/src/crepe/Particle.h
index d0397c9..ee0cd66 100644
--- a/src/crepe/Particle.h
+++ b/src/crepe/Particle.h
@@ -14,8 +14,6 @@ namespace crepe {
  * can also be reset or stopped.
  */
 class Particle {
-	// TODO: add friend particleSsytem and rendersystem. Unit test will fail.
-
 public:
 	//! Position of the particle in 2D space.
 	vec2 position;
@@ -24,13 +22,13 @@ public:
 	//! Accumulated force affecting the particle over time.
 	vec2 force_over_time;
 	//! Total lifespan of the particle in milliseconds.
-	uint32_t lifespan;
+	float lifespan;
 	//! Active state of the particle; true if it is in use, false otherwise.
 	bool active = false;
 	//! The time the particle has been alive, in milliseconds.
-	uint32_t time_in_life = 0;
+	float time_in_life = 0;
 	//! The angle at which the particle is oriented or moving.
-	double angle = 0;
+	float angle = 0;
 
 	/**
 	 * \brief Resets the particle with new properties.
@@ -43,14 +41,16 @@ public:
 	 * \param velocity  The initial velocity of the particle.
 	 * \param angle     The angle of the particle's trajectory or orientation.
 	 */
-	void reset(uint32_t lifespan, const vec2 & position, const vec2 & velocity, double angle);
+	void reset(unsigned int lifespan, const vec2 & position, const vec2 & velocity,
+			   float angle);
 	/**
 	 * \brief Updates the particle's state.
 	 *
 	 * Advances the particle's position based on its velocity and applies accumulated forces.
 	 * Deactivates the particle if its lifespan has expired.
+	 * \param dt The amount of fixed delta time that has passed.
 	 */
-	void update();
+	void update(double dt);
 	/**
 	 * \brief Stops the particle's movement.
 	 *
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 8f84f06..e8d6f92 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -20,6 +20,7 @@ target_sources(crepe PUBLIC
 	Button.cpp
 	UIObject.cpp
 	AI.cpp
+	Text.cpp
 	Scene.cpp
 )
 
@@ -51,4 +52,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Button.h
 	UIObject.h
 	AI.h
+	Text.h
 )
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index ed1cf38..6b9e3ca 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -76,6 +76,17 @@ struct Config final {
 		 */
 		std::string root_pattern = ".crepe-root";
 	} asset;
+	//! Default font options
+	struct {
+		/**
+		 * \brief Default font size
+		 *
+		 * Using the SDL_ttf library the font size needs to be set when loading the font. 
+		 * This config option is the font size at which all fonts will be loaded initially.
+		 * 
+		 */
+		unsigned int size = 16;
+	} font;
 	//! Configuration for click tolerance.
 	struct {
 		//! The maximum number of pixels the mouse can move between MouseDown and MouseUp events to be considered a click.
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index b5e5ff7..7a78019 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -65,6 +65,7 @@ void LoopManager::fixed_update() {
 	this->get_system<InputSystem>().update();
 	this->event_manager.dispatch_events();
 	this->get_system<ScriptSystem>().update();
+	this->get_system<ParticleSystem>().update();
 	this->get_system<AISystem>().update();
 	this->get_system<PhysicsSystem>().update();
 	this->get_system<CollisionSystem>().update();
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 40e6b38..1d23cbf 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -72,6 +72,8 @@ private:
 	//! Global context
 	Mediator mediator;
 
+	//! SDLContext instance
+	SDLContext sdl_context{mediator};
 	//! Component manager instance
 	ComponentManager component_manager{mediator};
 	//! Scene manager instance
@@ -84,8 +86,6 @@ private:
 	ResourceManager resource_manager{mediator};
 	//! Save manager instance
 	SaveManager save_manager{mediator};
-	//! SDLContext instance
-	SDLContext sdl_context{mediator};
 
 private:
 	/**
diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp
index 90b77a0..4f54bbd 100644
--- a/src/crepe/api/ParticleEmitter.cpp
+++ b/src/crepe/api/ParticleEmitter.cpp
@@ -1,11 +1,14 @@
 #include "ParticleEmitter.h"
+#include "api/Sprite.h"
 
 using namespace crepe;
 
-ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id, const Data & data)
+ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id, const Sprite & sprite,
+								 const Data & data)
 	: Component(game_object_id),
+	  sprite(sprite),
 	  data(data) {
 	for (size_t i = 0; i < this->data.max_particles; i++) {
-		this->data.particles.emplace_back();
+		this->particles.emplace_back();
 	}
 }
diff --git a/src/crepe/api/ParticleEmitter.h b/src/crepe/api/ParticleEmitter.h
index b83fd61..8ac2e72 100644
--- a/src/crepe/api/ParticleEmitter.h
+++ b/src/crepe/api/ParticleEmitter.h
@@ -1,7 +1,11 @@
 #pragma once
 
+#include <cmath>
 #include <vector>
 
+#include "system/ParticleSystem.h"
+#include "system/RenderSystem.h"
+
 #include "Component.h"
 #include "Particle.h"
 #include "types.h"
@@ -26,15 +30,18 @@ public:
 	 */
 	struct Boundary {
 		//! boundary width (midpoint is emitter location)
-		double width = 0.0;
+		float width = INFINITY;
 		//! boundary height (midpoint is emitter location)
-		double height = 0.0;
+		float height = INFINITY;
 		//! boundary offset from particle emitter location
 		vec2 offset;
 		//! reset on exit or stop velocity and set max postion
 		bool reset_on_exit = false;
 	};
 
+	//! sprite reference of displayed sprite
+	const Sprite & sprite;
+
 	/**
 	 * \brief Holds parameters that control particle emission.
 	 *
@@ -42,32 +49,28 @@ public:
 	 * and the sprite used for rendering particles.
 	 */
 	struct Data {
-		//! position of the emitter
-		vec2 position;
+		//! offset of the emitter relative to transform
+		vec2 offset;
 		//! maximum number of particles
-		const unsigned int max_particles = 0;
-		//! rate of particle emission per update (Lowest value = 0.001 any lower is ignored)
-		double emission_rate = 0;
+		const unsigned int max_particles = 256;
+		//! rate of particle emission per second
+		float emission_rate = 50;
 		//! min speed of the particles
-		double min_speed = 0;
+		float min_speed = 100;
 		//! min speed of the particles
-		double max_speed = 0;
+		float max_speed = 100;
 		//! min angle of particle emission
-		double min_angle = 0;
+		float min_angle = 0;
 		//! max angle of particle emission
-		double max_angle = 0;
-		//! begin Lifespan of particle (only visual)
-		double begin_lifespan = 0.0;
-		//! end Lifespan of particle
-		double end_lifespan = 0.0;
+		float max_angle = 0;
+		//! begin Lifespan of particle in seconds (only visual)
+		float begin_lifespan = 0.0;
+		//! end Lifespan of particle in seconds
+		float end_lifespan = 10.0;
 		//! force over time (physics)
 		vec2 force_over_time;
 		//! particle boundary
 		Boundary boundary;
-		//! collection of particles
-		std::vector<Particle> particles;
-		//! sprite reference
-		const Sprite & sprite;
 	};
 
 public:
@@ -75,11 +78,21 @@ public:
 	 * \param game_object_id  Identifier for the game object using this emitter.
 	 * \param data            Configuration data defining particle properties.
 	 */
-	ParticleEmitter(game_object_id_t game_object_id, const Data & data);
+	ParticleEmitter(game_object_id_t game_object_id, const Sprite & sprite, const Data & data);
 
 public:
 	//! Configuration data for particle emission settings.
 	Data data;
+
+private:
+	//! Only ParticleSystem can move and read particles
+	friend ParticleSystem;
+	//! Only RenderSystem can read particles
+	friend RenderSystem;
+	//! Saves time left over from last update event.
+	float spawn_accumulator = 0;
+	//! collection of particles
+	std::vector<Particle> particles;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index d4eaae9..583c04f 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -31,7 +31,7 @@ const keyboard_state_t & Script::get_keyboard_state() const {
 	return sdl_context.get_keyboard_state();
 }
 
-bool Script::get_key_state(Keycode key) const {
+bool Script::get_key_state(Keycode key) const noexcept {
 	try {
 		return this->get_keyboard_state().at(key);
 	} catch (...) {
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index b5d3dd2..65306cd 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -150,7 +150,7 @@ protected:
 	 * \return Keycode state (true if pressed, false if not pressed).
 	 * 
 	 */
-	bool get_key_state(Keycode key) const;
+	bool get_key_state(Keycode key) const noexcept;
 	//! \}
 
 private:
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
new file mode 100644
index 0000000..54a4370
--- /dev/null
+++ b/src/crepe/api/Text.cpp
@@ -0,0 +1,12 @@
+#include "../facade/FontFacade.h"
+
+#include "Text.h"
+
+using namespace crepe;
+
+Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		   const std::string & font_family, const Data & data, const std::string & text)
+	: UIObject(id, dimensions, offset),
+	  text(text),
+	  data(data),
+	  font_family(font_family) {}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
new file mode 100644
index 0000000..c30dc80
--- /dev/null
+++ b/src/crepe/api/Text.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <optional>
+#include <string>
+
+#include "../Component.h"
+
+#include "Asset.h"
+#include "Color.h"
+#include "UIObject.h"
+
+namespace crepe {
+/**
+ * \brief Text UIObject component for displaying text
+ * 
+ * This class can be used to display text on screen. By setting the font_family to a font already stored on the current device it will automatically be loaded in.
+ */
+class Text : public UIObject {
+public:
+	//! Text data that does not have to be set in the constructor
+	struct Data {
+		/**
+		 *  \brief fontsize for text rendering
+		 * 
+		 * \note this is not the actual font size that is loaded in.
+		 * 
+		 * Since SDL_TTF requires the font size when loading in the font it is not possible to switch the font size.
+		 * The default font size that is loaded is set in the Config.
+		 * Instead this value is used to upscale the font texture which can cause blurring or distorted text when upscaling or downscaling too much.
+		 */
+		unsigned int font_size = 16;
+
+		//! Layer sorting level of the text
+		const int sorting_in_layer = 0;
+
+		//! Order within the sorting text
+		const int order_in_layer = 0;
+
+		//! Label text color.
+		Color text_color = Color::BLACK;
+	};
+
+public:
+	/**
+	 * 
+	 * \param dimensions Width and height of the UIObject.
+	 * \param offset Offset of the UIObject relative to its transform
+	 * \param text The text to be displayed.
+	 * \param font_family The font style name to be displayed.
+	 * \param data Data struct containing extra text parameters.
+	 * \param font Optional font asset that can be passed or left empty.
+	 */
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		 const std::string & font_family, const Data & data, const std::string & text = "");
+
+	//! Label text.
+	std::string text = "";
+	//! font family name
+	std::string font_family = "";
+	//! Font asset variable if this is not set, it will use the font_family to create an asset.
+	std::optional<Asset> font;
+	//! Data instance
+	Data data;
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
index 0598e16..243ae46 100644
--- a/src/crepe/facade/CMakeLists.txt
+++ b/src/crepe/facade/CMakeLists.txt
@@ -4,6 +4,8 @@ target_sources(crepe PUBLIC
 	SoundContext.cpp
 	SDLContext.cpp
 	DB.cpp
+	FontFacade.cpp
+	Font.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -12,5 +14,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SoundContext.h
 	SDLContext.h
 	DB.h
+	FontFacade.h
+	Font.h
 )
 
diff --git a/src/crepe/facade/Font.cpp b/src/crepe/facade/Font.cpp
new file mode 100644
index 0000000..771002f
--- /dev/null
+++ b/src/crepe/facade/Font.cpp
@@ -0,0 +1,21 @@
+#include <SDL2/SDL_ttf.h>
+
+#include "../api/Asset.h"
+#include "../api/Config.h"
+
+#include "Font.h"
+
+using namespace std;
+using namespace crepe;
+
+Font::Font(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
+	const Config & config = Config::get_instance();
+	const std::string FONT_PATH = src.get_path();
+	TTF_Font * loaded_font = TTF_OpenFont(FONT_PATH.c_str(), config.font.size);
+	if (loaded_font == NULL) {
+		throw runtime_error(format("Font: {} (path: {})", TTF_GetError(), FONT_PATH));
+	}
+	this->font = {loaded_font, [](TTF_Font * close_font) { TTF_CloseFont(close_font); }};
+}
+
+TTF_Font * Font::get_font() const { return this->font.get(); }
diff --git a/src/crepe/facade/Font.h b/src/crepe/facade/Font.h
new file mode 100644
index 0000000..b208d96
--- /dev/null
+++ b/src/crepe/facade/Font.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <SDL2/SDL_ttf.h>
+#include <memory>
+
+#include "../Resource.h"
+#include "../api/Config.h"
+
+namespace crepe {
+
+class Asset;
+/**
+ * \brief Resource for managing font creation and destruction
+ *
+ * This class is a wrapper around an SDL_ttf font instance, encapsulating font loading and usage.
+ * It loads a font from an Asset and manages its lifecycle. The font is automatically unloaded
+ * when this object is destroyed.
+ */
+class Font : public Resource {
+
+public:
+	/**
+     * \param src The Asset containing the font file path and metadata to load the font.
+     * \param mediator The Mediator object used for managing the SDL context or related systems.
+     */
+	Font(const Asset & src, Mediator & mediator);
+	/**
+     * \brief Gets the underlying TTF_Font resource.
+     * 
+     * This function returns the raw pointer to the SDL_ttf TTF_Font object that represents
+     * the loaded font. This can be used with SDL_ttf functions to render text.
+     * 
+     * \return The raw TTF_Font object wrapped in a unique pointer.
+     */
+	TTF_Font * get_font() const;
+
+private:
+	//! The SDL_ttf font object with custom deleter.
+	std::unique_ptr<TTF_Font, std::function<void(TTF_Font *)>> font = nullptr;
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
new file mode 100644
index 0000000..87f95ab
--- /dev/null
+++ b/src/crepe/facade/FontFacade.cpp
@@ -0,0 +1,43 @@
+#include <fontconfig/fontconfig.h>
+#include <functional>
+#include <memory>
+#include <stdexcept>
+#include <string>
+
+#include "FontFacade.h"
+
+using namespace std;
+using namespace crepe;
+
+FontFacade::FontFacade() {
+	if (!FcInit()) throw runtime_error("Failed to initialize Fontconfig.");
+}
+
+FontFacade::~FontFacade() { FcFini(); }
+
+Asset FontFacade::get_font_asset(const string & font_family) {
+	FcPattern * raw_pattern
+		= FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
+	if (raw_pattern == NULL) throw runtime_error("Failed to create font pattern.");
+
+	unique_ptr<FcPattern, function<void(FcPattern *)>> pattern{
+		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); }};
+
+	FcConfig * config = FcConfigGetCurrent();
+	if (config == NULL) throw runtime_error("Failed to get current Fontconfig configuration.");
+
+	FcResult result;
+	FcPattern * raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
+	if (raw_matched_pattern == NULL) throw runtime_error("No matching font found.");
+
+	unique_ptr<FcPattern, function<void(FcPattern *)>> matched_pattern
+		= {raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); }};
+
+	FcChar8 * file_path = nullptr;
+	FcResult res = FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path);
+	if (res != FcResultMatch || file_path == NULL)
+		throw runtime_error("Failed to get font file path.");
+
+	string font_file_path = reinterpret_cast<const char *>(file_path);
+	return Asset(font_file_path);
+}
diff --git a/src/crepe/facade/FontFacade.h b/src/crepe/facade/FontFacade.h
new file mode 100644
index 0000000..9761070
--- /dev/null
+++ b/src/crepe/facade/FontFacade.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <memory>
+
+#include "../api/Asset.h"
+
+namespace crepe {
+
+/**
+ * 
+ * \brief Font facade class for converting font family names to absolute file paths
+ * 
+ */
+class FontFacade {
+public:
+	FontFacade();
+	~FontFacade();
+	FontFacade(const FontFacade & other) = delete;
+	FontFacade & operator=(const FontFacade & other) = delete;
+	FontFacade(FontFacade && other) noexcept = delete;
+	FontFacade & operator=(FontFacade && other) noexcept = delete;
+	/**
+	 * 
+	 * \brief Facade function to convert a font_family into an asset.
+	 * 
+	 * This function uses the FontConfig library to convert a font family name (Arial, Inter, Helvetica) and converts it to the font source path.
+	 * This function returns a default font path if the font_family name doesnt exist or cant be found
+	 * \param font_family Name of the font family name.
+	 * \return Asset with filepath to the corresponding font.
+	 */
+	Asset get_font_asset(const std::string & font_family);
+};
+
+} // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 7ccc243..fffbe34 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -6,6 +6,8 @@
 #include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_surface.h>
+#include <SDL2/SDL_ttf.h>
+#include <SDL2/SDL_video.h>
 #include <array>
 #include <cmath>
 #include <cstddef>
@@ -30,6 +32,9 @@ using namespace std;
 
 SDLContext::SDLContext(Mediator & mediator) {
 	dbg_trace();
+	if (TTF_Init() == -1) {
+		throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError()));
+	}
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -71,13 +76,13 @@ SDLContext::~SDLContext() {
 	// thread that SDL_Init() was called on? This has caused problems for me
 	// before.
 	IMG_Quit();
+	TTF_Quit();
 	SDL_Quit();
 }
 
 Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
-	if (!LOOKUP_TABLE.contains(sdl_key)) return Keycode::NONE;
-
-	return LOOKUP_TABLE.at(sdl_key);
+	if (!lookup_table.contains(sdl_key)) return Keycode::NONE;
+	return lookup_table.at(sdl_key);
 }
 
 const keyboard_state_t & SDLContext::get_keyboard_state() {
@@ -408,3 +413,7 @@ void SDLContext::set_color_texture(const Texture & texture, const Color & color)
 	SDL_SetTextureColorMod(texture.get_img(), color.r, color.g, color.b);
 	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
 }
+
+Asset SDLContext::get_font_from_name(const std::string & font_family) {
+	return this->font_facade.get_font_asset(font_family);
+}
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 8f4760e..b687f87 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -17,8 +17,10 @@
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
 #include "api/Transform.h"
+#include "types.h"
 
 #include "EventData.h"
+#include "FontFacade.h"
 
 namespace crepe {
 class Texture;
@@ -242,10 +244,24 @@ private:
 	CameraAuxiliaryData cam_aux_data;
 
 private:
+	//! instance of the font_facade
+	FontFacade font_facade{};
+
+public:
+	/**
+	 * \brief Function to Get asset from font_family
+	 * 
+	 * This function uses the FontFacade function to convert a font_family to an asset.
+	 * 
+	 * \param font_family name of the font style that needs to be used (will return an asset with default font path of the font_family doesnt exist)
+	 * 
+	 * \return asset with the font style absolute path
+	 */
+	Asset get_font_from_name(const std::string & font_family);
 	//! variable to store the state of each key (true = pressed, false = not pressed)
 	keyboard_state_t keyboard_state;
 	//! lookup table for converting SDL_SCANCODES to Keycodes
-	const std::unordered_map<SDL_Scancode, Keycode> LOOKUP_TABLE
+	const std::unordered_map<SDL_Scancode, Keycode> lookup_table
 		= {{SDL_SCANCODE_SPACE, Keycode::SPACE},
 		   {SDL_SCANCODE_APOSTROPHE, Keycode::APOSTROPHE},
 		   {SDL_SCANCODE_COMMA, Keycode::COMMA},
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index b14c52f..35a1d41 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -1,3 +1,4 @@
+#include <chrono>
 #include <cmath>
 #include <cstdlib>
 #include <ctime>
@@ -5,6 +6,7 @@
 #include "../api/ParticleEmitter.h"
 #include "../api/Transform.h"
 #include "../manager/ComponentManager.h"
+#include "../manager/LoopTimerManager.h"
 
 #include "ParticleSystem.h"
 
@@ -12,7 +14,11 @@ using namespace crepe;
 
 void ParticleSystem::update() {
 	// Get all emitters
-	ComponentManager & mgr = this->mediator.component_manager;
+	const Mediator & mediator = this->mediator;
+	LoopTimerManager & loop_timer = mediator.loop_timer;
+	ComponentManager & mgr = mediator.component_manager;
+	float dt = loop_timer.get_scaled_fixed_delta_time().count();
+
 	RefVector<ParticleEmitter> emitters = mgr.get_components_by_type<ParticleEmitter>();
 
 	for (ParticleEmitter & emitter : emitters) {
@@ -21,38 +27,39 @@ void ParticleSystem::update() {
 			= mgr.get_components_by_id<Transform>(emitter.game_object_id).front().get();
 
 		// Emit particles based on emission_rate
-		int updates = calculate_update(this->update_count, emitter.data.emission_rate);
-		for (size_t i = 0; i < updates; i++) {
-			emit_particle(emitter, transform);
+		emitter.spawn_accumulator += emitter.data.emission_rate * dt;
+		while (emitter.spawn_accumulator >= 1.0) {
+			this->emit_particle(emitter, transform);
+			emitter.spawn_accumulator -= 1.0;
 		}
 
 		// Update all particles
-		for (Particle & particle : emitter.data.particles) {
+		for (Particle & particle : emitter.particles) {
 			if (particle.active) {
-				particle.update();
+				particle.update(dt);
 			}
 		}
 
 		// Check if within boundary
-		check_bounds(emitter, transform);
+		this->check_bounds(emitter, transform);
 	}
-
-	this->update_count = (this->update_count + 1) % this->MAX_UPDATE_COUNT;
 }
 
 void ParticleSystem::emit_particle(ParticleEmitter & emitter, const Transform & transform) {
 	constexpr float DEG_TO_RAD = M_PI / 180.0;
 
-	vec2 initial_position = emitter.data.position + transform.position;
-	float random_angle = generate_random_angle(emitter.data.min_angle, emitter.data.max_angle);
+	vec2 initial_position = emitter.data.offset + transform.position;
+	float random_angle
+		= this->generate_random_angle(emitter.data.min_angle, emitter.data.max_angle);
 
-	float random_speed = generate_random_speed(emitter.data.min_speed, emitter.data.max_speed);
+	float random_speed
+		= this->generate_random_speed(emitter.data.min_speed, emitter.data.max_speed);
 	float angle_radians = random_angle * DEG_TO_RAD;
 
 	vec2 velocity
 		= {random_speed * std::cos(angle_radians), random_speed * std::sin(angle_radians)};
 
-	for (Particle & particle : emitter.data.particles) {
+	for (Particle & particle : emitter.particles) {
 		if (!particle.active) {
 			particle.reset(emitter.data.end_lifespan, initial_position, velocity,
 						   random_angle);
@@ -61,66 +68,54 @@ void ParticleSystem::emit_particle(ParticleEmitter & emitter, const Transform &
 	}
 }
 
-int ParticleSystem::calculate_update(int count, double emission) const {
-	double integer_part = std::floor(emission);
-	double fractional_part = emission - integer_part;
-
-	if (fractional_part > 0) {
-		int denominator = static_cast<int>(1.0 / fractional_part);
-		return (count % denominator == 0) ? 1 : 0;
-	}
-
-	return static_cast<int>(emission);
-}
-
 void ParticleSystem::check_bounds(ParticleEmitter & emitter, const Transform & transform) {
-	vec2 offset = emitter.data.boundary.offset + transform.position + emitter.data.position;
-	double half_width = emitter.data.boundary.width / 2.0;
-	double half_height = emitter.data.boundary.height / 2.0;
+	vec2 offset = emitter.data.boundary.offset + transform.position + emitter.data.offset;
+	float half_width = emitter.data.boundary.width / 2.0;
+	float half_height = emitter.data.boundary.height / 2.0;
 
-	const double LEFT = offset.x - half_width;
-	const double RIGHT = offset.x + half_width;
-	const double TOP = offset.y - half_height;
-	const double BOTTOM = offset.y + half_height;
+	float left = offset.x - half_width;
+	float right = offset.x + half_width;
+	float top = offset.y - half_height;
+	float bottom = offset.y + half_height;
 
-	for (Particle & particle : emitter.data.particles) {
+	for (Particle & particle : emitter.particles) {
 		const vec2 & position = particle.position;
-		bool within_bounds = (position.x >= LEFT && position.x <= RIGHT && position.y >= TOP
-							  && position.y <= BOTTOM);
-
+		bool within_bounds = (position.x >= left && position.x <= right && position.y >= top
+							  && position.y <= bottom);
+		//if not within bounds do a reset or stop velocity
 		if (!within_bounds) {
 			if (emitter.data.boundary.reset_on_exit) {
 				particle.active = false;
 			} else {
 				particle.velocity = {0, 0};
-				if (position.x < LEFT) particle.position.x = LEFT;
-				else if (position.x > RIGHT) particle.position.x = RIGHT;
-				if (position.y < TOP) particle.position.y = TOP;
-				else if (position.y > BOTTOM) particle.position.y = BOTTOM;
+				if (position.x < left) particle.position.x = left;
+				else if (position.x > right) particle.position.x = right;
+				if (position.y < top) particle.position.y = top;
+				else if (position.y > bottom) particle.position.y = bottom;
 			}
 		}
 	}
 }
 
-double ParticleSystem::generate_random_angle(double min_angle, double max_angle) const {
+float ParticleSystem::generate_random_angle(float min_angle, float max_angle) const {
 	if (min_angle == max_angle) {
 		return min_angle;
 	} else if (min_angle < max_angle) {
 		return min_angle
-			   + static_cast<double>(std::rand() % static_cast<int>(max_angle - min_angle));
+			   + static_cast<float>(std::rand() % static_cast<int>(max_angle - min_angle));
 	} else {
-		double angle_offset = (360 - min_angle) + max_angle;
-		double random_angle
-			= min_angle + static_cast<double>(std::rand() % static_cast<int>(angle_offset));
+		float angle_offset = (360 - min_angle) + max_angle;
+		float random_angle
+			= min_angle + static_cast<float>(std::rand() % static_cast<int>(angle_offset));
 		return (random_angle >= 360) ? random_angle - 360 : random_angle;
 	}
 }
 
-double ParticleSystem::generate_random_speed(double min_speed, double max_speed) const {
+float ParticleSystem::generate_random_speed(float min_speed, float max_speed) const {
 	if (min_speed == max_speed) {
 		return min_speed;
 	} else {
 		return min_speed
-			   + static_cast<double>(std::rand() % static_cast<int>(max_speed - min_speed));
+			   + static_cast<float>(std::rand() % static_cast<int>(max_speed - min_speed));
 	}
 }
diff --git a/src/crepe/system/ParticleSystem.h b/src/crepe/system/ParticleSystem.h
index 068f01c..154521d 100644
--- a/src/crepe/system/ParticleSystem.h
+++ b/src/crepe/system/ParticleSystem.h
@@ -32,16 +32,6 @@ private:
 	void emit_particle(ParticleEmitter & emitter, const Transform & transform);
 
 	/**
-	 * \brief Calculates the number of times particles should be emitted based on emission rate
-	 * and update count.
-	 *
-	 * \param count Current update count.
-	 * \param emission Emission rate.
-	 * \return The number of particles to emit.
-	 */
-	int calculate_update(int count, double emission) const;
-
-	/**
 	 * \brief Checks whether particles are within the emitter’s boundary, resets or stops
 	 * particles if they exit.
 	 *
@@ -57,7 +47,7 @@ private:
 	 * \param max_angle Maximum emission angle in degrees.
 	 * \return Random angle in degrees.
 	 */
-	double generate_random_angle(double min_angle, double max_angle) const;
+	float generate_random_angle(float min_angle, float max_angle) const;
 
 	/**
 	 * \brief Generates a random speed for particle emission within the specified range.
@@ -66,15 +56,7 @@ private:
 	 * \param max_speed Maximum emission speed.
 	 * \return Random speed.
 	 */
-	double generate_random_speed(double min_speed, double max_speed) const;
-
-private:
-	//! Counter to count updates to determine how many times emit_particle is
-	// called.
-	unsigned int update_count = 0;
-	//! Determines the lowest amount of emission rate (1000 = 0.001 = 1 particle per 1000
-	// updates).
-	static constexpr unsigned int MAX_UPDATE_COUNT = 100;
+	float generate_random_speed(float min_speed, float max_speed) const;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index afd9548..62d42ec 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -2,13 +2,16 @@
 #include <cassert>
 #include <cmath>
 #include <functional>
+#include <optional>
 #include <stdexcept>
 #include <vector>
 
 #include "../api/Camera.h"
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
+#include "../api/Text.h"
 #include "../api/Transform.h"
+#include "../facade/Font.h"
 #include "../facade/SDLContext.h"
 #include "../facade/Texture.h"
 #include "../manager/ComponentManager.h"
@@ -83,11 +86,11 @@ bool RenderSystem::render_particle(const Sprite & sprite, const double & scale)
 	bool rendering_particles = false;
 
 	for (const ParticleEmitter & em : emitters) {
-		if (&em.data.sprite != &sprite) continue;
+		if (&em.sprite != &sprite) continue;
 		rendering_particles = true;
 		if (!em.active) continue;
 
-		for (const Particle & p : em.data.particles) {
+		for (const Particle & p : em.particles) {
 			if (!p.active) continue;
 
 			ctx.draw(SDLContext::RenderContext{
@@ -120,8 +123,14 @@ void RenderSystem::render() {
 	this->update_camera();
 
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
+	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
-
+	RefVector<Text> text_components = mgr.get_components_by_type<Text>();
+	for (Text & text : text_components) {
+		const Transform & transform
+			= mgr.get_components_by_id<Transform>(text.game_object_id).front().get();
+		this->render_text(text, transform);
+	}
 	for (const Sprite & sprite : sorted_sprites) {
 		if (!sprite.active) continue;
 		const Transform & transform
@@ -134,3 +143,18 @@ void RenderSystem::render() {
 		this->render_normal(sprite, transform);
 	}
 }
+void RenderSystem::render_text(Text & text, const Transform & tm) {
+	SDLContext & ctx = this->mediator.sdl_context;
+
+	if (!text.font.has_value()) {
+		text.font.emplace(ctx.get_font_from_name(text.font_family));
+	}
+
+	ResourceManager & resource_manager = this->mediator.resource_manager;
+
+	if (!text.font.has_value()) {
+		return;
+	}
+	const Asset & font_asset = text.font.value();
+	const Font & res = resource_manager.get<Font>(font_asset);
+}
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index fc7b46e..56a0553 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -10,7 +10,7 @@ namespace crepe {
 class Camera;
 class Sprite;
 class Transform;
-
+class Text;
 /**
  * \brief Manages rendering operations for all game objects.
  *
@@ -50,7 +50,13 @@ private:
 	 * \return true if particles have been rendered
 	 */
 	bool render_particle(const Sprite & sprite, const double & scale);
-
+	/**
+	 * \brief Renders all Text components
+	 *
+	 * \param text The text component to be rendered.
+	 * \param tm the Transform component that holds the position,rotation and scale
+	 */
+	void render_text(Text & text, const Transform & tm);
 	/**
 	 * \brief renders a sprite with a Transform component on the screen
 	 *
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 187ed46..f62414e 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -19,4 +19,6 @@ endfunction()
 add_example(rendering_particle)
 add_example(game)
 add_example(button)
+add_example(loadfont)
+add_example(FontExample)
 add_example(AITest)
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
new file mode 100644
index 0000000..6a334b1
--- /dev/null
+++ b/src/example/FontExample.cpp
@@ -0,0 +1,55 @@
+#include <SDL2/SDL_ttf.h>
+#include <chrono>
+#include <crepe/api/Camera.h>
+#include <crepe/api/Config.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/LoopManager.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/Text.h>
+#include <crepe/facade/Font.h>
+#include <crepe/facade/SDLContext.h>
+#include <crepe/manager/EventManager.h>
+#include <crepe/manager/Mediator.h>
+#include <crepe/manager/ResourceManager.h>
+#include <exception>
+#include <iostream>
+#include <memory>
+using namespace crepe;
+using namespace std;
+using namespace std::chrono;
+class TestScript : public Script {
+public:
+	steady_clock::time_point start_time;
+	virtual void init() override { start_time = steady_clock::now(); }
+	virtual void update() override {
+		auto now = steady_clock::now();
+		auto elapsed = duration_cast<seconds>(now - start_time).count();
+
+		if (elapsed >= 5) {
+			Mediator & med = mediator;
+			EventManager & event_mgr = med.event_manager;
+			event_mgr.trigger_event<ShutDownEvent>();
+		}
+	}
+};
+class TestScene : public Scene {
+public:
+	void load_scene() override {
+		GameObject text_object = this->new_object("test", "test", vec2{0, 0}, 0, 1);
+		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "OpenSymbol",
+										Text::Data{});
+		text_object.add_component<BehaviorScript>().set_script<TestScript>();
+		text_object.add_component<Camera>(ivec2{300, 300}, vec2{100, 100}, Camera::Data{});
+	}
+	std::string get_name() const override { return "hey"; }
+};
+int main() {
+	// Config& config = Config::get_instance();
+	// config.log.level = Log::Level::TRACE;
+	LoopManager engine;
+	engine.add_scene<TestScene>();
+	engine.start();
+
+	return 0;
+}
diff --git a/src/example/game.cpp b/src/example/game.cpp
index 61f8760..22effd2 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -1,4 +1,5 @@
 #include "api/CircleCollider.h"
+#include "api/ParticleEmitter.h"
 #include "api/Scene.h"
 #include "manager/ComponentManager.h"
 #include "manager/Mediator.h"
@@ -258,6 +259,25 @@ public:
 								   })
 			.active
 			= false;
+		Asset img5{"asset/texture/square.png"};
+
+		GameObject particle = new_object(
+			"Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1);
+		auto & particle_image = particle.add_component<Sprite>(img5, Sprite::Data{
+																		 .size = {5, 5},
+																	 });
+		auto & test
+			= particle.add_component<ParticleEmitter>(particle_image, ParticleEmitter::Data{
+																		  .offset = {0, 0},
+																		  .max_particles = 256,
+																		  .emission_rate = 1,
+																		  .min_speed = 10,
+																		  .max_speed = 20,
+																		  .min_angle = -20,
+																		  .max_angle = 20,
+																		  .begin_lifespan = 0,
+																		  .end_lifespan = 5,
+																	  });
 	}
 
 	string get_name() const { return "scene1"; }
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
new file mode 100644
index 0000000..e459332
--- /dev/null
+++ b/src/example/loadfont.cpp
@@ -0,0 +1,49 @@
+#include <SDL2/SDL_ttf.h>
+#include <crepe/api/Asset.h>
+#include <crepe/api/Text.h>
+#include <crepe/facade/Font.h>
+#include <crepe/facade/FontFacade.h>
+#include <crepe/facade/SDLContext.h>
+#include <crepe/manager/Mediator.h>
+#include <crepe/manager/ResourceManager.h>
+#include <exception>
+#include <iostream>
+#include <memory>
+#include <optional>
+using namespace crepe;
+int main() {
+
+	// SDLFontContext font_facade;
+	Mediator mediator;
+	FontFacade font_facade{};
+	SDLContext sdl_context{mediator};
+	// ComponentManager component_manager{mediator};
+	ResourceManager resource_manager{mediator};
+	try {
+		// Correct way to create a unique pointer for Text
+		std::unique_ptr<Text> label = std::make_unique<Text>(
+			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{}, "test text");
+		// std::cout << "Path: " << label->font.get_path() << std::endl;
+		Asset asset1 = font_facade.get_font_asset("OpenSymbol");
+		std::cout << asset1.get_path() << std::endl;
+		std::unique_ptr<Text> label2 = std::make_unique<Text>(
+			1, vec2(100, 100), vec2(0, 0), "fsaafdafsdafsdafsdasfdds", Text::Data{});
+		Asset asset = Asset("test test");
+		label->font.emplace(asset);
+		std::cout << label->font.value().get_path() << std::endl;
+		// label2->font = std::make_optional(asset);
+		// std::cout << "Path: " << label2->font.get_path() << std::endl;
+		ResourceManager & resource_mgr = mediator.resource_manager;
+		const Font & res = resource_manager.get<Font>(label->font.value());
+		// TTF_Font * test_font = res.get_font();
+		// if (test_font == NULL) {
+		// 	std::cout << "error with font" << std::endl;
+		// } else {
+		// 	std::cout << "correct font retrieved" << std::endl;
+		// }
+	} catch (const std::exception & e) {
+		std::cout << "Standard exception thrown: " << e.what() << std::endl;
+	}
+
+	return 0;
+}
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 13e625f..add43f4 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -18,28 +18,6 @@
 using namespace crepe;
 using namespace std;
 
-/*
-	auto & test = game_object.add_component<ParticleEmitter>(ParticleEmitter::Data{
-		.position = {0, 0},
-		.max_particles = 10,
-		.emission_rate = 0.1,
-		.min_speed = 6,
-		.max_speed = 20,
-		.min_angle = -20,
-		.max_angle = 20,
-		.begin_lifespan = 0,
-		.end_lifespan = 60,
-		.force_over_time = vec2{0, 0},
-		.boundary{
-			.width = 1000,
-			.height = 1000,
-			.offset = vec2{0, 0},
-			.reset_on_exit = false,
-		},
-		.sprite = test_sprite,
-	});
-	*/
-
 class TestScene : public Scene {
 public:
 	void load_scene() {
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index d893276..2d844d4 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -1,7 +1,11 @@
-#include "system/RenderSystem.h"
 #include <gtest/gtest.h>
+
+#include <crepe/manager/ResourceManager.h>
+#include <crepe/system/RenderSystem.h>
+
 #define protected public
 #define private public
+
 #include "api/KeyCodes.h"
 #include "manager/ComponentManager.h"
 #include "manager/EventManager.h"
@@ -29,6 +33,7 @@ public:
 	SDLContext sdl_context{mediator};
 
 	InputSystem input_system{mediator};
+	ResourceManager resman{mediator};
 	RenderSystem render{mediator};
 	EventManager event_manager{mediator};
 	//GameObject camera;
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 9112a3f..9263e00 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -1,15 +1,18 @@
 #include "api/Asset.h"
-#include <crepe/Particle.h>
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
-#include <crepe/api/ParticleEmitter.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Sprite.h>
 #include <crepe/api/Transform.h>
 #include <crepe/manager/ComponentManager.h>
-#include <crepe/system/ParticleSystem.h>
+#include <crepe/manager/LoopTimerManager.h>
 #include <gtest/gtest.h>
 #include <math.h>
+#define protected public
+#define private public
+#include <crepe/Particle.h>
+#include <crepe/api/ParticleEmitter.h>
+#include <crepe/system/ParticleSystem.h>
 
 using namespace std;
 using namespace std::chrono_literals;
@@ -21,6 +24,7 @@ class ParticlesTest : public ::testing::Test {
 public:
 	ComponentManager component_manager{m};
 	ParticleSystem particle_system{m};
+	LoopTimerManager loop_timer{m};
 
 	void SetUp() override {
 		ComponentManager & mgr = this->component_manager;
@@ -38,25 +42,25 @@ public:
 						.size = {10, 10},
 					});
 
-			game_object.add_component<ParticleEmitter>(ParticleEmitter::Data{
-				.position = {0, 0},
-				.max_particles = 100,
-				.emission_rate = 0,
-				.min_speed = 0,
-				.max_speed = 0,
-				.min_angle = 0,
-				.max_angle = 0,
-				.begin_lifespan = 0,
-				.end_lifespan = 0,
-				.force_over_time = vec2{0, 0},
-				.boundary{
-					.width = 0,
-					.height = 0,
-					.offset = vec2{0, 0},
-					.reset_on_exit = false,
-				},
-				.sprite = test_sprite,
-			});
+			game_object.add_component<ParticleEmitter>(test_sprite,
+													   ParticleEmitter::Data{
+														   .offset = {0, 0},
+														   .max_particles = 100,
+														   .emission_rate = 0,
+														   .min_speed = 0,
+														   .max_speed = 0,
+														   .min_angle = 0,
+														   .max_angle = 0,
+														   .begin_lifespan = 0,
+														   .end_lifespan = 0,
+														   .force_over_time = vec2{0, 0},
+														   .boundary{
+															   .width = 0,
+															   .height = 0,
+															   .offset = vec2{0, 0},
+															   .reset_on_exit = false,
+														   },
+													   });
 		}
 		transforms = mgr.get_components_by_id<Transform>(0);
 		Transform & transform = transforms.front().get();
@@ -66,7 +70,7 @@ public:
 		std::vector<std::reference_wrapper<ParticleEmitter>> rigidbodies
 			= mgr.get_components_by_id<ParticleEmitter>(0);
 		ParticleEmitter & emitter = rigidbodies.front().get();
-		emitter.data.position = {0, 0};
+		emitter.data.offset = {0, 0};
 		emitter.data.emission_rate = 0;
 		emitter.data.min_speed = 0;
 		emitter.data.max_speed = 0;
@@ -76,7 +80,7 @@ public:
 		emitter.data.end_lifespan = 0;
 		emitter.data.force_over_time = vec2{0, 0};
 		emitter.data.boundary = {0, 0, vec2{0, 0}, false};
-		for (auto & particle : emitter.data.particles) {
+		for (auto & particle : emitter.particles) {
 			particle.active = false;
 		}
 	}
@@ -95,19 +99,19 @@ TEST_F(ParticlesTest, spawnParticle) {
 	emitter.data.max_angle = 10;
 	particle_system.update();
 	//check if nothing happend
-	EXPECT_EQ(emitter.data.particles[0].active, false);
-	emitter.data.emission_rate = 1;
+	EXPECT_EQ(emitter.particles[0].active, false);
+	emitter.data.emission_rate = 50;
 	//check particle spawnes
 	particle_system.update();
-	EXPECT_EQ(emitter.data.particles[0].active, true);
+	EXPECT_EQ(emitter.particles[0].active, true);
 	particle_system.update();
-	EXPECT_EQ(emitter.data.particles[1].active, true);
+	EXPECT_EQ(emitter.particles[1].active, true);
 	particle_system.update();
-	EXPECT_EQ(emitter.data.particles[2].active, true);
+	EXPECT_EQ(emitter.particles[2].active, true);
 	particle_system.update();
-	EXPECT_EQ(emitter.data.particles[3].active, true);
+	EXPECT_EQ(emitter.particles[3].active, true);
 
-	for (auto & particle : emitter.data.particles) {
+	for (auto & particle : emitter.particles) {
 		// Check velocity range
 		EXPECT_GE(particle.velocity.x, emitter.data.min_speed);
 		// Speed should be greater than or equal to min_speed
@@ -133,13 +137,13 @@ TEST_F(ParticlesTest, moveParticleHorizontal) {
 	emitter.data.end_lifespan = 100;
 	emitter.data.boundary.height = 100;
 	emitter.data.boundary.width = 100;
-	emitter.data.min_speed = 1;
-	emitter.data.max_speed = 1;
+	emitter.data.min_speed = 50;
+	emitter.data.max_speed = 50;
 	emitter.data.max_angle = 0;
-	emitter.data.emission_rate = 1;
+	emitter.data.emission_rate = 50;
 	for (int a = 1; a < emitter.data.boundary.width / 2; a++) {
 		particle_system.update();
-		EXPECT_EQ(emitter.data.particles[0].position.x, a);
+		EXPECT_EQ(emitter.particles[0].position.x, a);
 	}
 }
 
@@ -150,14 +154,14 @@ TEST_F(ParticlesTest, moveParticleVertical) {
 	emitter.data.end_lifespan = 100;
 	emitter.data.boundary.height = 100;
 	emitter.data.boundary.width = 100;
-	emitter.data.min_speed = 1;
-	emitter.data.max_speed = 1;
+	emitter.data.min_speed = 50;
+	emitter.data.max_speed = 50;
 	emitter.data.min_angle = 90;
 	emitter.data.max_angle = 90;
-	emitter.data.emission_rate = 1;
+	emitter.data.emission_rate = 50;
 	for (int a = 1; a < emitter.data.boundary.width / 2; a++) {
 		particle_system.update();
-		EXPECT_EQ(emitter.data.particles[0].position.y, a);
+		EXPECT_EQ(emitter.particles[0].position.y, a);
 	}
 }
 
@@ -177,7 +181,7 @@ TEST_F(ParticlesTest, boundaryParticleReset) {
 	for (int a = 0; a < emitter.data.boundary.width / 2 + 1; a++) {
 		particle_system.update();
 	}
-	EXPECT_EQ(emitter.data.particles[0].active, false);
+	EXPECT_EQ(emitter.particles[0].active, false);
 }
 
 TEST_F(ParticlesTest, boundaryParticleStop) {
@@ -197,12 +201,12 @@ TEST_F(ParticlesTest, boundaryParticleStop) {
 		particle_system.update();
 	}
 	const double TOLERANCE = 0.01;
-	EXPECT_NEAR(emitter.data.particles[0].velocity.x, 0, TOLERANCE);
-	EXPECT_NEAR(emitter.data.particles[0].velocity.y, 0, TOLERANCE);
-	if (emitter.data.particles[0].velocity.x != 0)
-		EXPECT_NEAR(std::abs(emitter.data.particles[0].position.x),
+	EXPECT_NEAR(emitter.particles[0].velocity.x, 0, TOLERANCE);
+	EXPECT_NEAR(emitter.particles[0].velocity.y, 0, TOLERANCE);
+	if (emitter.particles[0].velocity.x != 0)
+		EXPECT_NEAR(std::abs(emitter.particles[0].position.x),
 					emitter.data.boundary.height / 2, TOLERANCE);
-	if (emitter.data.particles[0].velocity.y != 0)
-		EXPECT_NEAR(std::abs(emitter.data.particles[0].position.y),
-					emitter.data.boundary.width / 2, TOLERANCE);
+	if (emitter.particles[0].velocity.y != 0)
+		EXPECT_NEAR(std::abs(emitter.particles[0].position.y), emitter.data.boundary.width / 2,
+					TOLERANCE);
 }
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index 35f52dc..16736b8 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -219,18 +219,19 @@ TEST_F(DISABLED_ProfilingTest, Profiling_3) {
 					.order_in_layer = 1,
 					.size = {.y = 500},
 				});
-			auto & test = gameobject.add_component<ParticleEmitter>(ParticleEmitter::Data{
-				.max_particles = 10,
-				.emission_rate = 100,
-				.end_lifespan = 100000,
-				.boundary{
-					.width = 1000,
-					.height = 1000,
-					.offset = vec2{0, 0},
-					.reset_on_exit = false,
-				},
-				.sprite = test_sprite,
-			});
+			auto & test = gameobject.add_component<ParticleEmitter>(
+				test_sprite, ParticleEmitter::Data{
+								 .max_particles = 10,
+								 .emission_rate = 100,
+								 .end_lifespan = 100000,
+								 .boundary{
+									 .width = 1000,
+									 .height = 1000,
+									 .offset = vec2{0, 0},
+									 .reset_on_exit = false,
+								 },
+
+							 });
 		}
 		render_sys.update();
 		this->game_object_count++;