From 4ce924b1b1322ee4da3ba50d6da856ad13a2190b Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Fri, 22 Nov 2024 16:16:27 +0100
Subject: working scaling image with scaling world to screen

---
 src/crepe/api/Sprite.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 74a55d4..66599c9 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <sys/types.h>
 
 #include "../Component.h"
 
@@ -62,6 +63,13 @@ public:
 	//! Order within the sorting layer
 	uint8_t order_in_layer = 0;
 
+	//! width in world units
+	int width = 0;
+	//! height in world units
+	int height = 0;
+
+	const double aspect_ratio;
+
 public:
 	/**
 	 * \brief Gets the maximum number of instances allowed for this sprite.
-- 
cgit v1.2.3


From 8513b2dad0ec43678f17cca0510db4d1a938279a Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Fri, 22 Nov 2024 17:08:55 +0100
Subject: working moving camera, flip animations, resizing with animations, and
 black bars

---
 src/crepe/api/Animator.cpp         |  5 ++++-
 src/crepe/api/Sprite.h             | 10 ++++++++--
 src/crepe/facade/SDLContext.cpp    | 25 +++++++++++++------------
 src/crepe/facade/SDLContext.h      |  6 +++---
 src/crepe/system/RenderSystem.cpp  |  4 ++--
 src/example/rendering_particle.cpp | 11 ++++++++---
 6 files changed, 38 insertions(+), 23 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index d206428..178b165 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -18,7 +18,10 @@ Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_a
 	animator_rect.h /= col;
 	animator_rect.w /= row;
 	animator_rect.x = 0;
-	animator_rect.y = (col_animator - 1) * animator_rect.h;
+	animator_rect.y = col_animator  * animator_rect.h;
 	this->active = false;
+
+	// need to do this for to get the aspect ratio for a single clipping in the spritesheet
+	this->spritesheet.aspect_ratio = (double)animator_rect.w / (double)animator_rect.h;
 }
 Animator::~Animator() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 66599c9..89f9121 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -68,7 +68,13 @@ public:
 	//! height in world units
 	int height = 0;
 
-	const double aspect_ratio;
+	/**
+	 * \aspect_ratio ratio of the img so that scaling will not become weird
+	 *
+	 * cannot be const because if Animator component is addded then ratio becomes scuffed and
+	 * does it need to be calculated again in the Animator
+	 */
+	double aspect_ratio;
 
 public:
 	/**
@@ -90,7 +96,7 @@ private:
 	friend class AnimatorSystem;
 
 	//! Render area of the sprite this will also be adjusted by the AnimatorSystem if an Animator
-	// object is present in GameObject
+	// object is present in GameObject. this is in sprite pixels
 	Rect sprite_rect;
 };
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index f49539c..29a8195 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -5,11 +5,9 @@
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_surface.h>
 #include <SDL2/SDL_video.h>
-#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <functional>
-#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -109,21 +107,24 @@ SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const {
 		.h = sprite.sprite_rect.h,
 	};
 }
-SDL_Rect SDLContext::get_dst_rect(const Sprite & sprite, const Vector2 & pos,
-								  const Vector2 & scale) const {
+SDL_Rect SDLContext::get_dst_rect(const Sprite & sprite, const Vector2 & pos, const Vector2 & cam_pos,
+								  const double & img_scale, const Vector2 & cam_scale) const {
 
 	int pixel_width, pixel_height;
 
 	if (sprite.sprite_rect.w > sprite.sprite_rect.h) {
-		pixel_width = static_cast<int>(sprite.width * scale.x);
+		pixel_width = static_cast<int>(sprite.width * cam_scale.x);
 		pixel_height = static_cast<int>(pixel_width / sprite.aspect_ratio);
 	} else {
-		pixel_height = static_cast<int>(sprite.height * scale.y);
+		pixel_height = static_cast<int>(sprite.height * cam_scale.y);
 		pixel_width = static_cast<int>(pixel_height * sprite.aspect_ratio);
 	}
 
-	int pixel_x = static_cast<int>((pos.x - pixel_width / 2));
-	int pixel_y = static_cast<int>((pos.y - pixel_height / 2));
+	pixel_width *= img_scale;
+	pixel_height *= img_scale;
+
+	int pixel_x = static_cast<int>((pos.x - cam_pos.x - pixel_width / 2));
+	int pixel_y = static_cast<int>((pos.y - cam_pos.y - pixel_height / 2));
 
 	return SDL_Rect{
 		.x = pixel_x,
@@ -134,27 +135,27 @@ SDL_Rect SDLContext::get_dst_rect(const Sprite & sprite, const Vector2 & pos,
 }
 
 void SDLContext::draw_particle(const Sprite & sprite, const Vector2 & pos,
-							   const double & angle, const Vector2 & scale) {
+							   const double & angle, const Vector2 & cam_pos, const double & img_scale, const Vector2 & cam_scale) {
 
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * sprite.flip.flip_x)
 							  | (SDL_FLIP_VERTICAL * sprite.flip.flip_y));
 
 	SDL_Rect srcrect = this->get_src_rect(sprite);
-	SDL_Rect dstrect = this->get_dst_rect(sprite, pos, scale);
+	SDL_Rect dstrect = this->get_dst_rect(sprite, pos, cam_pos, img_scale, cam_scale);
 
 	SDL_RenderCopyEx(this->game_renderer.get(), sprite.sprite_image->texture.get(), &srcrect,
 					 &dstrect, angle, NULL, render_flip);
 }
 
-void SDLContext::draw(const Sprite & sprite, const Transform & transform, const Vector2 & scale) {
+void SDLContext::draw(const Sprite & sprite, const Transform & transform, const Vector2 & cam_pos, const Vector2 & cam_scale) {
 
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * sprite.flip.flip_x)
 							  | (SDL_FLIP_VERTICAL * sprite.flip.flip_y));
 
 	SDL_Rect srcrect = this->get_src_rect(sprite);
-	SDL_Rect dstrect = this->get_dst_rect(sprite, transform.position, scale);
+	SDL_Rect dstrect = this->get_dst_rect(sprite, transform.position, cam_pos, transform.scale, cam_scale);
 
 	SDL_RenderCopyEx(this->game_renderer.get(), sprite.sprite_image->texture.get(), &srcrect,
 					 &dstrect, transform.rotation, NULL, render_flip);
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 68d1630..04c60cc 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -118,9 +118,9 @@ private:
 	 * \param transform Reference to the Transform for positioning.
 	 * \param camera Reference to the Camera for view adjustments.
 	 */
-	void draw(const Sprite & sprite, const Transform & transform, const Vector2 & scale);
+	void draw(const Sprite & sprite, const Transform & transform, const Vector2 & cam_pos, const Vector2 & cam_scale);
 
-	void draw_particle(const Sprite & sprite, const Vector2 & pos, const double & angle, const Vector2 & scale);
+	void draw_particle(const Sprite & sprite, const Vector2 & pos, const double & angle, const Vector2 & cam_pos,  const double & img_scale, const Vector2 & cam_scale);
 
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
@@ -152,7 +152,7 @@ private:
 	 * on the camera 
 	 * \return sdl rectangle to draw a dst image to draw on the screen
 	 */
-	SDL_Rect get_dst_rect(const Sprite & sprite, const Vector2 & pos, const Vector2 & scale) const;
+	SDL_Rect get_dst_rect(const Sprite & sprite, const Vector2 & pos, const Vector2 & cam_pos, const double & img_scale , const Vector2 & scale) const;
 
 private:
 	//! sdl Window
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index a16fbb5..676ded6 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -72,13 +72,13 @@ bool RenderSystem::render_particle(const Sprite & sprite, const double & scale)
 
 		for (const Particle & p : em.data.particles) {
 			if (!p.active) continue;
-			this->context.draw_particle(sprite, p.position, p.angle, this->scale * scale);
+			this->context.draw_particle(sprite, p.position ,p.angle, this->curr_cam_ref->pos ,scale, this->scale);
 		}
 	}
 	return rendering_particles;
 }
 void RenderSystem::render_normal(const Sprite & sprite, const Transform & tm) {
-	this->context.draw(sprite, tm, this->scale * tm.scale);
+	this->context.draw(sprite, tm , this->curr_cam_ref->pos,this->scale);
 }
 
 void RenderSystem::render() {
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 741c985..6a91c19 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -1,4 +1,6 @@
+#include "api/Animator.h"
 #include "api/Camera.h"
+#include "system/AnimatorSystem.h"
 #include "system/ParticleSystem.h"
 #include <SDL2/SDL_timer.h>
 #include <crepe/ComponentManager.h>
@@ -15,7 +17,6 @@
 #include <crepe/system/RenderSystem.h>
 
 #include <chrono>
-#include <iostream>
 #include <memory>
 
 using namespace crepe;
@@ -23,18 +24,21 @@ using namespace std;
 
 int main(int argc, char * argv[]) {
 	ComponentManager mgr;
-	GameObject game_object = mgr.new_object("", "", Vector2{1000, 500}, 0, 2);
+	GameObject game_object = mgr.new_object("", "", Vector2{1000, 500}, 0, 1);
 	RenderSystem sys{mgr};
 	ParticleSystem psys{mgr};
+	AnimatorSystem asys{mgr};
 
 	Color color(255, 255, 255, 255);
 
 	Sprite & test_sprite = game_object.add_component<Sprite>(
-		make_shared<Texture>("asset/texture/test_ap43.png"), color, FlipSettings{false, false});
+		make_shared<Texture>("asset/spritesheet/spritesheet_test.png"), color, FlipSettings{true, true});
 	test_sprite.order_in_layer = 5;
 	test_sprite.width = 1000;
 	test_sprite.height = 500;
 
+	game_object.add_component<Animator>(test_sprite, 4,1,0).active = true;
+
 
 	/*
 	auto & test = game_object.add_component<ParticleEmitter>(ParticleEmitter::Data{
@@ -71,6 +75,7 @@ int main(int argc, char * argv[]) {
 	auto start = std::chrono::steady_clock::now();
 	while (std::chrono::steady_clock::now() - start < std::chrono::seconds(5)) {
 		psys.update();
+		asys.update();
 		sys.update();
 		SDL_Delay(10);
 	}
-- 
cgit v1.2.3


From 72e605528ebe8347e1457358fe9025c215afe163 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 27 Nov 2024 11:08:50 +0100
Subject: implemented feedback, removed width so that user only can set height.

---
 src/crepe/api/Animator.cpp         |  2 +-
 src/crepe/api/Sprite.cpp           |  1 -
 src/crepe/api/Sprite.h             |  2 --
 src/crepe/facade/SDLContext.cpp    | 13 ++-----------
 src/example/rendering_particle.cpp |  2 +-
 5 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 0043896..b6540cf 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -22,6 +22,6 @@ Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_a
 	this->active = false;
 
 	// need to do this for to get the aspect ratio for a single clipping in the spritesheet
-	this->spritesheet.aspect_ratio = (double) animator_rect.w / (double) animator_rect.h;
+	this->spritesheet.aspect_ratio = static_cast<double>(animator_rect.w) / animator_rect.h;
 }
 Animator::~Animator() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 27f219c..58e0884 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -2,7 +2,6 @@
 #include <memory>
 
 #include "../util/Log.h"
-#include "facade/SDLContext.h"
 
 #include "Component.h"
 #include "Sprite.h"
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 89f9121..7d5f4c3 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -63,8 +63,6 @@ public:
 	//! Order within the sorting layer
 	uint8_t order_in_layer = 0;
 
-	//! width in world units
-	int width = 0;
 	//! height in world units
 	int height = 0;
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 6e22316..abb3cb7 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -112,17 +112,8 @@ SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const {
 SDL_Rect SDLContext::get_dst_rect(const Sprite & sprite, const vec2 & pos, const Camera & cam,
 								  const double & img_scale) const {
 
-	int width, height;
-
-	if (sprite.width > sprite.height) {
-		width = sprite.width;
-		height = sprite.width / sprite.aspect_ratio;
-	} else {
-		height = sprite.height;
-		width = sprite.height * sprite.aspect_ratio;
-	}
-
-	cout << width << " " << height << " " << " " << sprite.aspect_ratio << endl;
+	int width = sprite.height * sprite.aspect_ratio;
+	int height = sprite.height;
 
 	width *= img_scale * cam.zoom;
 	height *= img_scale * cam.zoom;
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 680c0ac..afa064d 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -35,10 +35,10 @@ int main(int argc, char * argv[]) {
 		make_shared<Texture>("asset/texture/test_ap43.png"), color,
 		FlipSettings{true, true});
 	test_sprite.order_in_layer = 5;
-	test_sprite.width = 259;
 	test_sprite.height = 195;
 
 	//game_object.add_component<Animator>(test_sprite, 4, 1, 0).active = true;
+	game_object.add_component<Animator>(test_sprite, 1, 1, 0).active = true;
 
 	/*
 	auto & test = game_object.add_component<ParticleEmitter>(ParticleEmitter::Data{
-- 
cgit v1.2.3


From 7f66cd4a9b609f6bf36d005f5e38ef2a57d1c0d3 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 27 Nov 2024 11:15:02 +0100
Subject: removed shared_ptr from sprite

---
 src/crepe/api/Sprite.cpp           | 9 ++++-----
 src/crepe/api/Sprite.h             | 4 ++--
 src/crepe/facade/SDLContext.cpp    | 4 ++--
 src/example/rendering_particle.cpp | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 58e0884..2c2ca65 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,5 +1,4 @@
 #include <cmath>
-#include <memory>
 
 #include "../util/Log.h"
 
@@ -10,17 +9,17 @@
 using namespace std;
 using namespace crepe;
 
-Sprite::Sprite(game_object_id_t id, const shared_ptr<Texture> image, const Color & color,
+Sprite::Sprite(game_object_id_t id, const Texture & image, const Color & color,
 			   const FlipSettings & flip)
 	: Component(id),
 	  color(color),
 	  flip(flip),
 	  sprite_image(image),
-	  aspect_ratio(static_cast<double>(sprite_image->get_width()) / sprite_image->get_height()) {
+	  aspect_ratio(static_cast<double>(sprite_image.get_width()) / sprite_image.get_height()) {
 	dbg_trace();
 
-	this->sprite_rect.w = sprite_image->get_width();
-	this->sprite_rect.h = sprite_image->get_height();
+	this->sprite_rect.w = sprite_image.get_width();
+	this->sprite_rect.h = sprite_image.get_height();
 }
 
 Sprite::~Sprite() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 7d5f4c3..82dc4a7 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -44,7 +44,7 @@ public:
 	 * \param color Color tint applied to the sprite.
 	 * \param flip Flip settings for horizontal and vertical orientation.
 	 */
-	Sprite(game_object_id_t id, const std::shared_ptr<Texture> image, const Color & color,
+	Sprite(game_object_id_t id, const Texture & image, const Color & color,
 		   const FlipSettings & flip);
 
 	/**
@@ -53,7 +53,7 @@ public:
 	~Sprite();
 
 	//! Texture used for the sprite
-	const std::shared_ptr<Texture> sprite_image;
+	const Texture & sprite_image;
 	//! Color tint of the sprite
 	Color color;
 	//! Flip settings for the sprite
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index abb3cb7..72542e8 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -136,7 +136,7 @@ void SDLContext::draw_particle(const Sprite & sprite, const vec2 & pos, const do
 	SDL_Rect srcrect = this->get_src_rect(sprite);
 	SDL_Rect dstrect = this->get_dst_rect(sprite, pos, cam , img_scale);
 
-	SDL_RenderCopyEx(this->game_renderer.get(), sprite.sprite_image->texture.get(), &srcrect,
+	SDL_RenderCopyEx(this->game_renderer.get(), sprite.sprite_image.texture.get(), &srcrect,
 					 &dstrect, angle, NULL, render_flip);
 }
 
@@ -150,7 +150,7 @@ void SDLContext::draw(const Sprite & sprite, const Transform & transform, const
 	SDL_Rect dstrect
 		= this->get_dst_rect(sprite, transform.position, cam, transform.scale);
 
-	SDL_RenderCopyEx(this->game_renderer.get(), sprite.sprite_image->texture.get(), &srcrect,
+	SDL_RenderCopyEx(this->game_renderer.get(), sprite.sprite_image.texture.get(), &srcrect,
 					 &dstrect, transform.rotation, NULL, render_flip);
 }
 
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index afa064d..3589cad 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -31,8 +31,8 @@ int main(int argc, char * argv[]) {
 
 	Color color(255, 255, 255, 255);
 
-	Sprite & test_sprite = game_object.add_component<Sprite>(
-		make_shared<Texture>("asset/texture/test_ap43.png"), color,
+	auto img = Texture("asset/texture/test_ap43.png");
+	Sprite & test_sprite = game_object.add_component<Sprite>(img, color,
 		FlipSettings{true, true});
 	test_sprite.order_in_layer = 5;
 	test_sprite.height = 195;
-- 
cgit v1.2.3


From ddb5bde6e5dd4d89faf419630086ece66690d6b5 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Wed, 27 Nov 2024 19:57:16 +0100
Subject: implemented feedback. biggest changes are teh camera_ref removed

---
 src/crepe/api/Animator.h           |  5 -----
 src/crepe/api/Camera.cpp           |  8 ++++++--
 src/crepe/api/Camera.h             | 12 ++++++------
 src/crepe/api/Config.h             |  4 +---
 src/crepe/api/Sprite.cpp           |  8 ++++++--
 src/crepe/api/Sprite.h             | 18 +++++++++++-------
 src/crepe/api/Vector2.h            |  1 +
 src/crepe/facade/SDLContext.cpp    |  3 +--
 src/crepe/system/RenderSystem.cpp  | 28 ++++++++++++++++------------
 src/crepe/system/RenderSystem.h    | 13 ++++---------
 src/example/rendering_particle.cpp |  8 +++-----
 11 files changed, 55 insertions(+), 53 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 53f4b91..7a5ef03 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -40,11 +40,6 @@ public:
 	Animator(uint32_t id, Sprite & spritesheet, int row, int col, int col_animate);
 
 	~Animator(); // dbg_trace
-	Animator(const Animator &) = delete;
-	Animator(Animator &&) = delete;
-	Animator & operator=(const Animator &) = delete;
-	Animator & operator=(Animator &&) = delete;
-
 private:
 	//! A reference to the Sprite sheet containing the animation frames.
 	Sprite & spritesheet;
diff --git a/src/crepe/api/Camera.cpp b/src/crepe/api/Camera.cpp
index 5835bdd..4397ac7 100644
--- a/src/crepe/api/Camera.cpp
+++ b/src/crepe/api/Camera.cpp
@@ -6,9 +6,13 @@
 
 using namespace crepe;
 
-Camera::Camera(game_object_id_t id, const Color & bg_color)
+Camera::Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen,
+			   const ivec2 & viewport, const double & zoom)
 	: Component(id),
-	  bg_color(bg_color) {
+	  bg_color(bg_color),
+	  screen(screen),
+	  viewport(viewport),
+	  zoom(zoom) {
 	dbg_trace();
 }
 
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h
index 1505107..2ba37fc 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -21,12 +21,12 @@ public:
 	 * \param id Unique identifier for the camera component.
 	 * \param bg_color Background color for the camera view.
 	 */
-	Camera(game_object_id_t id, const Color & bg_color);
+	Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen, const ivec2 & viewport, const double & zoom);
 	~Camera(); // dbg_trace only
 
 public:
 	//! Background color of the camera view.
-	Color bg_color;
+	const Color bg_color;
 
 	//! offset postion from the game object transform component
 	vec2 offset = {0, 0};
@@ -36,19 +36,19 @@ public:
 	vec2 pos = {0, 0};
 
 	//! screen the display size in pixels ( output resolution )
-	ivec2 screen = {1080, 720};
+	const ivec2 screen = {1080, 720};
 
 	//! viewport is the area of the world visible through the camera (in world units)
-	ivec2 viewport = {500, 1000};
+	const ivec2 viewport = {500, 1000};
 
 	//! Zoom level of the camera view.
-	double zoom = 1.0f;
+	const double zoom = 1.0f;
 
 public:
 	/**
 	 * \brief Gets the maximum number of camera instances allowed.
 	 * \return Maximum instance count as an integer.
 	 */
-	virtual int get_instances_max() const { return 10; }
+	virtual int get_instances_max() const { return 1; }
 };
 } // namespace crepe
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 2723461..9b43cdf 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -66,9 +66,7 @@ public:
 	//! default window settings
 	struct {
 		//TODO make this constexpr because this will never change
-		ivec2 def_size = {1080, 720};
-		vec2 pos = {0, 0};
-		float zoom = 1.0f;
+		const ivec2 def_size = {1080, 720};
 	} win_set;
 
 	//! Asset loading options
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 2c2ca65..21c8377 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -10,16 +10,20 @@ using namespace std;
 using namespace crepe;
 
 Sprite::Sprite(game_object_id_t id, const Texture & image, const Color & color,
-			   const FlipSettings & flip)
+			   const FlipSettings & flip, uint8_t sort_layer, uint8_t order_layer, int height)
 	: Component(id),
 	  color(color),
 	  flip(flip),
 	  sprite_image(image),
-	  aspect_ratio(static_cast<double>(sprite_image.get_width()) / sprite_image.get_height()) {
+	  sorting_in_layer(sort_layer),
+	  order_in_layer(order_layer),
+	  height(height) {
+
 	dbg_trace();
 
 	this->sprite_rect.w = sprite_image.get_width();
 	this->sprite_rect.h = sprite_image.get_height();
+	this->aspect_ratio = static_cast<double>(this->sprite_rect.w) / this->sprite_rect.h;
 }
 
 Sprite::~Sprite() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 82dc4a7..1c40501 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <memory>
-#include <sys/types.h>
-
 #include "../Component.h"
 
 #include "Color.h"
 #include "Texture.h"
+#include <cstdint>
 
 namespace crepe {
 
@@ -43,9 +41,12 @@ public:
 	 * \param image Shared pointer to the texture for this sprite.
 	 * \param color Color tint applied to the sprite.
 	 * \param flip Flip settings for horizontal and vertical orientation.
+	 * \param order_layer decides the sorting in layer of the sprite.
+	 * \param sort_layer decides the order in layer of the sprite.
+	 * \param height the height of the image in game units
 	 */
 	Sprite(game_object_id_t id, const Texture & image, const Color & color,
-		   const FlipSettings & flip);
+		   const FlipSettings & flip, uint8_t sort_layer, uint8_t order_layer, int height);
 
 	/**
 	 * \brief Destroys the Sprite instance.
@@ -54,17 +55,20 @@ public:
 
 	//! Texture used for the sprite
 	const Texture & sprite_image;
+
 	//! Color tint of the sprite
 	Color color;
+
 	//! Flip settings for the sprite
 	FlipSettings flip;
+
 	//! Layer sorting level of the sprite
-	uint8_t sorting_in_layer = 0;
+	const uint8_t sorting_in_layer;
 	//! Order within the sorting layer
-	uint8_t order_in_layer = 0;
+	const uint8_t order_in_layer;
 
 	//! height in world units
-	int height = 0;
+	const int height;
 
 	/**
 	 * \aspect_ratio ratio of the img so that scaling will not become weird
diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h
index 0688fac..2b31d90 100644
--- a/src/crepe/api/Vector2.h
+++ b/src/crepe/api/Vector2.h
@@ -37,6 +37,7 @@ struct Vector2 {
 	//! Divides a scalar value to both components of this vector and updates this vector.
 	Vector2 operator/(const T & other) const;
 
+	//! Divides a scalar value to both components of this vector and updates this vector.
 	Vector2 operator/(T other) const;
 
 	//! Adds another vector to this vector and updates this vector.
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 4887d35..6c6af55 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -8,7 +8,6 @@
 #include <cmath>
 #include <cstddef>
 #include <functional>
-#include <iostream>
 #include <memory>
 #include <stdexcept>
 
@@ -16,10 +15,10 @@
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
 #include "../api/Transform.h"
+#include "../api/Config.h"
 #include "../util/Log.h"
 
 #include "SDLContext.h"
-#include "api/Config.h"
 #include "types.h"
 
 using namespace crepe;
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 9a8c1ba..a1443cd 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -10,6 +10,7 @@
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
 #include "../facade/SDLContext.h"
+#include "api/Camera.h"
 
 #include "RenderSystem.h"
 
@@ -19,7 +20,8 @@ using namespace std;
 void RenderSystem::clear_screen() { this->context.clear_screen(); }
 
 void RenderSystem::present_screen() { this->context.present_screen(); }
-void RenderSystem::update_camera() {
+
+const Camera & RenderSystem::update_camera() {
 	ComponentManager & mgr = this->component_manager;
 
 	RefVector<Camera> cameras = mgr.get_components_by_type<Camera>();
@@ -31,9 +33,10 @@ void RenderSystem::update_camera() {
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(cam.game_object_id).front().get();
 		this->context.set_camera(cam);
-		this->curr_cam_ref = &cam;
-		this->curr_cam_ref->pos = transform.position + this->curr_cam_ref->offset;
+		cam.pos = transform.position + cam.offset;
+		return cam;
 	}
+	throw std::runtime_error("No active cameras in current scene");
 }
 
 bool sorting_comparison(const Sprite & a, const Sprite & b) {
@@ -52,12 +55,12 @@ RefVector<Sprite> RenderSystem::sort(RefVector<Sprite> & objs) const {
 
 void RenderSystem::update() {
 	this->clear_screen();
-	this->update_camera();
 	this->render();
 	this->present_screen();
 }
 
-bool RenderSystem::render_particle(const Sprite & sprite, const double & scale) {
+bool RenderSystem::render_particle(const Sprite & sprite, const Camera & cam,
+								   const double & scale) {
 
 	ComponentManager & mgr = this->component_manager;
 
@@ -73,19 +76,20 @@ bool RenderSystem::render_particle(const Sprite & sprite, const double & scale)
 
 		for (const Particle & p : em.data.particles) {
 			if (!p.active) continue;
-			this->context.draw_particle(sprite, p.position, p.angle, scale,
-										*this->curr_cam_ref);
+			this->context.draw_particle(sprite, p.position, p.angle, scale, cam);
 		}
 	}
 	return rendering_particles;
 }
-void RenderSystem::render_normal(const Sprite & sprite, const Transform & tm) {
-	this->context.draw(sprite, tm, *this->curr_cam_ref);
+void RenderSystem::render_normal(const Sprite & sprite, const Camera & cam,
+								 const Transform & tm) {
+	this->context.draw(sprite, tm, cam);
 }
 
 void RenderSystem::render() {
-
 	ComponentManager & mgr = this->component_manager;
+	const Camera & cam = this->update_camera();
+
 	RefVector<Sprite> sprites = mgr.get_components_by_type<Sprite>();
 	RefVector<Sprite> sorted_sprites = this->sort(sprites);
 
@@ -94,10 +98,10 @@ void RenderSystem::render() {
 		const Transform & transform
 			= mgr.get_components_by_id<Transform>(sprite.game_object_id).front().get();
 
-		bool rendered_particles = this->render_particle(sprite, transform.scale);
+		bool rendered_particles = this->render_particle(sprite, cam, transform.scale);
 
 		if (rendered_particles) continue;
 
-		this->render_normal(sprite, transform);
+		this->render_normal(sprite, cam, transform);
 	}
 }
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 08930b0..264dc4c 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -36,7 +36,7 @@ private:
 	void present_screen();
 
 	//! Updates the active camera used for rendering.
-	void update_camera();
+	const Camera & update_camera();
 
 	//! Renders the whole screen
 	void render();
@@ -48,7 +48,7 @@ private:
 	 * \param tm the Transform component for scale
 	 * \return true if particles have been rendered
 	 */
-	bool render_particle(const Sprite & sprite, const double & scale);
+	bool render_particle(const Sprite & sprite, const Camera & cam, const double & scale);
 
 	/**
 	 * \brief renders a sprite with a Transform component on the screen 
@@ -56,7 +56,7 @@ private:
 	 * \param sprite  the sprite component that holds all the data
 	 * \param tm the Transform component that holds the position,rotation and scale 
 	 */
-	void render_normal(const Sprite & sprite, const Transform & tm);
+	void render_normal(const Sprite & sprite, const Camera & cam, const Transform & tm);
 
 	/**
 	 * \brief sort a vector sprite objects with
@@ -70,17 +70,12 @@ private:
 	 * \todo Include color handling for sprites.
 	 * \todo Add text rendering using SDL_ttf for text components.
 	 * \todo Implement a text component and a button component.
-	 * \todo Ensure each sprite is checked for active status before rendering.
-	 * \todo Sort all layers by order before rendering.
 	 * \todo Consider adding text input functionality.
 	 */
 
 private:
-	//! Pointer to the current active camera for rendering
-	// TODO: needs a better solution
-	Camera * curr_cam_ref = nullptr;
-
 	SDLContext & context = SDLContext::get_instance();
+	
 };
 
 } // namespace crepe
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index ec71260..6e426cf 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -33,9 +33,7 @@ int main(int argc, char * argv[]) {
 
 	auto img = Texture("asset/texture/test_ap43.png");
 	Sprite & test_sprite
-		= game_object.add_component<Sprite>(img, color, FlipSettings{true, true});
-	test_sprite.order_in_layer = 5;
-	test_sprite.height = 195;
+		= game_object.add_component<Sprite>(img, color, FlipSettings{true, true}, 1, 1, 500);
 
 	//game_object.add_component<Animator>(test_sprite, 4, 1, 0).active = true;
 	game_object.add_component<Animator>(test_sprite, 1, 1, 0).active = true;
@@ -62,8 +60,8 @@ int main(int argc, char * argv[]) {
 	});
 	*/
 
-	auto & cam = game_object.add_component<Camera>(Color::WHITE);
-	cam.pos = {0, 0};
+	auto & cam = game_object.add_component<Camera>(Color::WHITE, ivec2{1080, 720},
+												   ivec2{2000, 2000}, 1.0f);
 
 	/*
 	game_object
-- 
cgit v1.2.3


From 14cbc9061ecd7ab1c9e58e5f9ba75a5216e1de2b Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 28 Nov 2024 07:53:24 +0100
Subject: feedback implemented

---
 src/crepe/api/Camera.cpp |  4 +++-
 src/crepe/api/Camera.h   |  4 ++--
 src/crepe/api/Sprite.h   | 10 ----------
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Camera.cpp b/src/crepe/api/Camera.cpp
index 4397ac7..99a0831 100644
--- a/src/crepe/api/Camera.cpp
+++ b/src/crepe/api/Camera.cpp
@@ -1,3 +1,4 @@
+#include "types.h"
 #include "util/Log.h"
 
 #include "Camera.h"
@@ -7,9 +8,10 @@
 using namespace crepe;
 
 Camera::Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen,
-			   const ivec2 & viewport, const double & zoom)
+			   const ivec2 & viewport, const double & zoom, const vec2& offset)
 	: Component(id),
 	  bg_color(bg_color),
+	  offset(offset),
 	  screen(screen),
 	  viewport(viewport),
 	  zoom(zoom) {
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h
index 2ba37fc..8908caa 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -21,7 +21,7 @@ public:
 	 * \param id Unique identifier for the camera component.
 	 * \param bg_color Background color for the camera view.
 	 */
-	Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen, const ivec2 & viewport, const double & zoom);
+	Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen, const ivec2 & viewport, const double & zoom, const vec2 & offset = {0,0});
 	~Camera(); // dbg_trace only
 
 public:
@@ -29,7 +29,7 @@ public:
 	const Color bg_color;
 
 	//! offset postion from the game object transform component
-	vec2 offset = {0, 0};
+	vec2 offset;
 
 	//! pos the postion of the camera in world space this will be filled with
 	//pos = transform + offset
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 1c40501..9644e72 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -77,16 +77,6 @@ public:
 	 * does it need to be calculated again in the Animator
 	 */
 	double aspect_ratio;
-
-public:
-	/**
-	 * \brief Gets the maximum number of instances allowed for this sprite.
-	 * \return Maximum instance count as an integer.
-	 *
-	 * For now is this number randomly picked. I think it will eventually be 1. 
-	 */
-	virtual int get_instances_max() const { return 10; }
-
 private:
 	//! Reads the sprite_rect of sprite
 	friend class SDLContext;
-- 
cgit v1.2.3


From 43695ecee65d63ba89bdab3eb49b5ada0eef399f Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 28 Nov 2024 07:54:04 +0100
Subject: make format

---
 src/crepe/api/Animator.h        | 1 +
 src/crepe/api/Camera.cpp        | 2 +-
 src/crepe/api/Camera.h          | 3 ++-
 src/crepe/api/Sprite.h          | 1 +
 src/crepe/facade/SDLContext.cpp | 2 +-
 src/crepe/system/RenderSystem.h | 1 -
 6 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 7a5ef03..19c9ebd 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -40,6 +40,7 @@ public:
 	Animator(uint32_t id, Sprite & spritesheet, int row, int col, int col_animate);
 
 	~Animator(); // dbg_trace
+
 private:
 	//! A reference to the Sprite sheet containing the animation frames.
 	Sprite & spritesheet;
diff --git a/src/crepe/api/Camera.cpp b/src/crepe/api/Camera.cpp
index 99a0831..0831f45 100644
--- a/src/crepe/api/Camera.cpp
+++ b/src/crepe/api/Camera.cpp
@@ -8,7 +8,7 @@
 using namespace crepe;
 
 Camera::Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen,
-			   const ivec2 & viewport, const double & zoom, const vec2& offset)
+			   const ivec2 & viewport, const double & zoom, const vec2 & offset)
 	: Component(id),
 	  bg_color(bg_color),
 	  offset(offset),
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h
index 8908caa..c7b2d08 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -21,7 +21,8 @@ public:
 	 * \param id Unique identifier for the camera component.
 	 * \param bg_color Background color for the camera view.
 	 */
-	Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen, const ivec2 & viewport, const double & zoom, const vec2 & offset = {0,0});
+	Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen,
+		   const ivec2 & viewport, const double & zoom, const vec2 & offset = {0, 0});
 	~Camera(); // dbg_trace only
 
 public:
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 9644e72..c406b91 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -77,6 +77,7 @@ public:
 	 * does it need to be calculated again in the Animator
 	 */
 	double aspect_ratio;
+
 private:
 	//! Reads the sprite_rect of sprite
 	friend class SDLContext;
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 6c6af55..0d42a4c 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -12,10 +12,10 @@
 #include <stdexcept>
 
 #include "../api/Camera.h"
+#include "../api/Config.h"
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
 #include "../api/Transform.h"
-#include "../api/Config.h"
 #include "../util/Log.h"
 
 #include "SDLContext.h"
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 264dc4c..46ebb92 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -75,7 +75,6 @@ private:
 
 private:
 	SDLContext & context = SDLContext::get_instance();
-	
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 80836bce1294898f3d115ed363edd6d921aa15d5 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 28 Nov 2024 08:21:24 +0100
Subject: adjusted texture and sprite to hold a texture, instead of reference

---
 src/crepe/api/Config.h    |  2 +-
 src/crepe/api/Sprite.cpp  |  5 +++--
 src/crepe/api/Sprite.h    |  4 ++--
 src/crepe/api/Texture.cpp | 11 +++++++++++
 src/crepe/api/Texture.h   |  5 +++++
 5 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 9b43cdf..2525120 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -33,7 +33,7 @@ public:
 		 *
 		 * Only messages with equal or higher priority than this value will be logged.
 		 */
-		Log::Level level = Log::Level::DEBUG;
+		Log::Level level = Log::Level::INFO;
 		/**
 		 * \brief Colored log output
 		 *
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 21c8377..65c6cc3 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <utility>
 
 #include "../util/Log.h"
 
@@ -9,12 +10,12 @@
 using namespace std;
 using namespace crepe;
 
-Sprite::Sprite(game_object_id_t id, const Texture & image, const Color & color,
+Sprite::Sprite(game_object_id_t id, Texture & image, const Color & color,
 			   const FlipSettings & flip, uint8_t sort_layer, uint8_t order_layer, int height)
 	: Component(id),
 	  color(color),
 	  flip(flip),
-	  sprite_image(image),
+	  sprite_image(std::move(image)),
 	  sorting_in_layer(sort_layer),
 	  order_in_layer(order_layer),
 	  height(height) {
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index c406b91..9d75ab6 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -45,7 +45,7 @@ public:
 	 * \param sort_layer decides the order in layer of the sprite.
 	 * \param height the height of the image in game units
 	 */
-	Sprite(game_object_id_t id, const Texture & image, const Color & color,
+	Sprite(game_object_id_t id, Texture & image, const Color & color,
 		   const FlipSettings & flip, uint8_t sort_layer, uint8_t order_layer, int height);
 
 	/**
@@ -54,7 +54,7 @@ public:
 	~Sprite();
 
 	//! Texture used for the sprite
-	const Texture & sprite_image;
+	const Texture sprite_image;
 
 	//! Color tint of the sprite
 	Color color;
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index eeb86e9..576bdc3 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -17,6 +17,17 @@ Texture::~Texture() {
 	this->texture.reset();
 }
 
+Texture::Texture(Texture&& other) noexcept
+    : texture(std::move(other.texture)){
+}
+                                               
+Texture& Texture::operator=(Texture&& other) noexcept {
+    if (this != &other) {
+        texture = std::move(other.texture);
+    }
+    return *this;
+}
+
 void Texture::load(const Asset & res) {
 	SDLContext & ctx = SDLContext::get_instance();
 	this->texture = ctx.texture_from_path(res.get_path());
diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h
index b4f7d07..dc4a6d7 100644
--- a/src/crepe/api/Texture.h
+++ b/src/crepe/api/Texture.h
@@ -35,6 +35,11 @@ public:
 	 */
 	~Texture();
 	// FIXME: this constructor shouldn't be necessary because this class doesn't manage memory
+	
+    Texture(Texture&& other) noexcept;
+    Texture& operator=(Texture&& other) noexcept;
+	Texture(const Texture&) = delete;
+    Texture& operator=(const Texture&) = delete;
 
 	/**
 	 * \brief Gets the width of the texture.
-- 
cgit v1.2.3


From 7508f7b26e73df24e2fcb4296b31d26470fddf76 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 28 Nov 2024 10:20:23 +0100
Subject: adjusted more it should now be finsished

---
 src/crepe/api/Sprite.h             | 24 ++++++++++++------------
 src/crepe/facade/SDLContext.h      | 12 ++++++++++++
 src/crepe/system/RenderSystem.cpp  |  3 +--
 src/crepe/types.h                  | 15 +--------------
 src/example/rendering_particle.cpp |  3 +--
 src/test/ParticleTest.cpp          |  2 +-
 src/test/RenderSystemTest.cpp      | 10 +++++-----
 7 files changed, 33 insertions(+), 36 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 9d75ab6..2d73879 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -8,18 +8,6 @@
 
 namespace crepe {
 
-struct Rect {
-	int w = 0;
-	int h = 0;
-	int x = 0;
-	int y = 0;
-};
-
-struct FlipSettings {
-	bool flip_x = false;
-	bool flip_y = false;
-};
-
 class SDLContext;
 class Animator;
 class AnimatorSystem;
@@ -32,6 +20,12 @@ class AnimatorSystem;
  */
 class Sprite : public Component {
 
+public:
+	struct FlipSettings {
+		bool flip_x = false;
+		bool flip_y = false;
+	};
+
 public:
 	// TODO: Loek comment in github #27 will be looked another time
 	// about shared_ptr Texture
@@ -88,6 +82,12 @@ private:
 	//! Reads the all the variables plus the  sprite_rect
 	friend class AnimatorSystem;
 
+	struct Rect {
+		int w = 0;
+		int h = 0;
+		int x = 0;
+		int y = 0;
+	};
 	//! Render area of the sprite this will also be adjusted by the AnimatorSystem if an Animator
 	// object is present in GameObject. this is in sprite pixels
 	Rect sprite_rect;
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 7907a0f..25f2818 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -16,6 +16,16 @@
 
 namespace crepe {
 
+struct RenderCtx{
+	const Sprite & sprite;
+	const Camera & cam;
+	const vec2 & cam_pos;
+	const vec2 & pos;
+	const double & angle;
+	const double & scale;
+	
+};
+
 // TODO: SDL_Keycode is defined in a header not distributed with crepe, which means this
 // typedef is unusable when crepe is packaged. Wouter will fix this later.
 typedef SDL_Keycode CREPE_KEYCODES;
@@ -29,6 +39,8 @@ typedef SDL_Keycode CREPE_KEYCODES;
  */
 class SDLContext {
 
+
+
 public:
 	/**
 	 * \brief Gets the singleton instance of SDLContext.
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index bfee658..0bef69b 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -9,9 +9,8 @@
 #include "../api/ParticleEmitter.h"
 #include "../api/Sprite.h"
 #include "../api/Transform.h"
+#include "../api/Camera.h"
 #include "../facade/SDLContext.h"
-#include "api/Camera.h"
-#include "types.h"
 
 #include "RenderSystem.h"
 
diff --git a/src/crepe/types.h b/src/crepe/types.h
index aa03f53..69cc526 100644
--- a/src/crepe/types.h
+++ b/src/crepe/types.h
@@ -27,17 +27,4 @@ typedef Vector2<float> vec2;
 //! Default Vector2<double> type
 typedef Vector2<double> dvec2;
 
-class Sprite;
-class Camera;
-
-struct RenderCtx{
-	const Sprite & sprite;
-	const Camera & cam;
-	const vec2 & cam_pos;
-	const vec2 & pos;
-	const double & angle;
-	const double & scale;
-	
-} ;                  
-
-} // namespace crepe
+}; // namespace crepe
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 6e426cf..68dadd7 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -17,7 +17,6 @@
 #include <crepe/types.h>
 
 #include <chrono>
-#include <memory>
 
 using namespace crepe;
 using namespace std;
@@ -33,7 +32,7 @@ int main(int argc, char * argv[]) {
 
 	auto img = Texture("asset/texture/test_ap43.png");
 	Sprite & test_sprite
-		= game_object.add_component<Sprite>(img, color, FlipSettings{true, true}, 1, 1, 500);
+		= game_object.add_component<Sprite>(img, color, Sprite::FlipSettings{true, true}, 1, 1, 500);
 
 	//game_object.add_component<Animator>(test_sprite, 4, 1, 0).active = true;
 	game_object.add_component<Animator>(test_sprite, 1, 1, 0).active = true;
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index ea3652a..1ac058f 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -31,7 +31,7 @@ public:
 			auto s1 = Texture("asset/texture/img.png");
 			Sprite & test_sprite = game_object.add_component<Sprite>(
 				s1, color,
-				FlipSettings{true, true}, 1,1,100);
+				Sprite::FlipSettings{true, true}, 1,1,100);
 
 			game_object.add_component<ParticleEmitter>(ParticleEmitter::Data{
 				.position = {0, 0},
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index 2c4f21c..138aa36 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -35,24 +35,24 @@ public:
 		auto s3 = Texture("asset/texture/img.png");
 		auto s4 = Texture("asset/texture/img.png");
 		auto & sprite1 = entity1.add_component<Sprite>(s1, Color(0, 0, 0, 0),
-													   FlipSettings{false, false}, 5, 5, 100);
+													   Sprite::FlipSettings{false, false}, 5, 5, 100);
 		ASSERT_NE(sprite1.sprite_image.texture.get(), nullptr);
 		EXPECT_EQ(sprite1.order_in_layer, 5);
 		EXPECT_EQ(sprite1.sorting_in_layer, 5);
 		auto & sprite2 = entity2.add_component<Sprite>(s2, Color(0, 0, 0, 0),
-													   FlipSettings{false, false}, 2, 1, 100);
+													   Sprite::FlipSettings{false, false}, 2, 1, 100);
 		ASSERT_NE(sprite2.sprite_image.texture.get(), nullptr);
 		EXPECT_EQ(sprite2.sorting_in_layer, 2);
 		EXPECT_EQ(sprite2.order_in_layer, 1);
 
 		auto & sprite3 = entity3.add_component<Sprite>(s3, Color(0, 0, 0, 0),
-													   FlipSettings{false, false}, 1, 2, 100);
+													   Sprite::FlipSettings{false, false}, 1, 2, 100);
 		ASSERT_NE(sprite3.sprite_image.texture.get(), nullptr);
 		EXPECT_EQ(sprite3.sorting_in_layer, 1);
 		EXPECT_EQ(sprite3.order_in_layer, 2);
 
 		auto & sprite4 = entity4.add_component<Sprite>(s4, Color(0, 0, 0, 0),
-													   FlipSettings{false, false}, 1, 1, 100);
+													   Sprite::FlipSettings{false, false}, 1, 1, 100);
 		ASSERT_NE(sprite4.sprite_image.texture.get(), nullptr);
 		EXPECT_EQ(sprite4.sorting_in_layer, 1);
 		EXPECT_EQ(sprite4.order_in_layer, 1);
@@ -66,7 +66,7 @@ TEST_F(RenderSystemTest, expected_throws) {
 	EXPECT_ANY_THROW({
 		auto test = Texture("");
 		entity1.add_component<Sprite>(test, Color(0, 0, 0, 0),
-									  FlipSettings{false, false},1,1,100);
+									  Sprite::FlipSettings{false, false},1,1,100);
 	});
 
 	// No camera
-- 
cgit v1.2.3


From 1cdaa2aaeb1b6bc71876b462fcc464800ec75732 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 28 Nov 2024 10:23:41 +0100
Subject: sprite had include wrong order

---
 src/crepe/api/Sprite.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index 2d73879..e40ce24 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <cstdint>
+
 #include "../Component.h"
 
 #include "Color.h"
 #include "Texture.h"
-#include <cstdint>
 
 namespace crepe {
 
-- 
cgit v1.2.3


From 9d9c4fc4565f0ef0fc81c8baeef804389f07afc2 Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Thu, 28 Nov 2024 12:53:15 +0100
Subject: implemented loek feedback

---
 src/crepe/api/Animator.cpp          | 12 ++++++------
 src/crepe/api/Camera.cpp            |  4 ++--
 src/crepe/api/Camera.h              |  4 ++--
 src/crepe/api/Color.cpp             |  2 +-
 src/crepe/api/Config.h              |  7 +++++--
 src/crepe/api/Sprite.cpp            |  8 ++++----
 src/crepe/api/Sprite.h              | 14 +++++++-------
 src/crepe/facade/SDLContext.cpp     | 32 ++++++++++++++++----------------
 src/crepe/facade/SDLContext.h       | 19 ++++++++++---------
 src/crepe/system/AnimatorSystem.cpp |  4 ++--
 src/crepe/system/RenderSystem.cpp   | 11 ++++-------
 src/example/rendering_particle.cpp  |  2 +-
 src/test/RenderSystemTest.cpp       |  6 +++---
 13 files changed, 63 insertions(+), 62 deletions(-)

(limited to 'src/crepe/api/Sprite.h')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 2b21c6c..0fdab0e 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -14,14 +14,14 @@ Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_a
 	  col(col) {
 	dbg_trace();
 
-	this->spritesheet.sprite_rect.h /= col;
-	this->spritesheet.sprite_rect.w /= row;
-	this->spritesheet.sprite_rect.x = 0;
-	this->spritesheet.sprite_rect.y = col_animator * this->spritesheet.sprite_rect.h;
+	this->spritesheet.mask.h /= col;
+	this->spritesheet.mask.w /= row;
+	this->spritesheet.mask.x = 0;
+	this->spritesheet.mask.y = col_animator * this->spritesheet.mask.h;
 	this->active = false;
 
 	// need to do this for to get the aspect ratio for a single clipping in the spritesheet
-	this->spritesheet.aspect_ratio = static_cast<double>(this->spritesheet.sprite_rect.w)
-									 / this->spritesheet.sprite_rect.h;
+	this->spritesheet.aspect_ratio = static_cast<double>(this->spritesheet.mask.w)
+									 / this->spritesheet.mask.h;
 }
 Animator::~Animator() { dbg_trace(); }
diff --git a/src/crepe/api/Camera.cpp b/src/crepe/api/Camera.cpp
index 0831f45..39d8ab0 100644
--- a/src/crepe/api/Camera.cpp
+++ b/src/crepe/api/Camera.cpp
@@ -8,12 +8,12 @@
 using namespace crepe;
 
 Camera::Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen,
-			   const ivec2 & viewport, const double & zoom, const vec2 & offset)
+			   const vec2 & viewport_size, const double & zoom, const vec2 & offset)
 	: Component(id),
 	  bg_color(bg_color),
 	  offset(offset),
 	  screen(screen),
-	  viewport(viewport),
+	  viewport_size(viewport_size),
 	  zoom(zoom) {
 	dbg_trace();
 }
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h
index 3682222..2d8fa48 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -22,7 +22,7 @@ public:
 	 * \param bg_color Background color for the camera view.
 	 */
 	Camera(game_object_id_t id, const Color & bg_color, const ivec2 & screen,
-		   const ivec2 & viewport, const double & zoom, const vec2 & offset = {0, 0});
+		   const vec2 & viewport_size, const double & zoom, const vec2 & offset = {0, 0});
 	~Camera(); // dbg_trace only
 
 public:
@@ -36,7 +36,7 @@ public:
 	const ivec2 screen;
 
 	//! viewport is the area of the world visible through the camera (in world units)
-	const ivec2 viewport;
+	const vec2 viewport_size;
 
 	//! Zoom level of the camera view.
 	const double zoom;
diff --git a/src/crepe/api/Color.cpp b/src/crepe/api/Color.cpp
index dc7c15f..29bd77a 100644
--- a/src/crepe/api/Color.cpp
+++ b/src/crepe/api/Color.cpp
@@ -2,7 +2,7 @@
 
 using namespace crepe;
 
-const Color Color::WHITE{0xff, 0xff, 0xff, 0xff};
+const Color Color::WHITE{0xff, 0xff, 0xff};
 const Color Color::RED{0xff, 0x00, 0x00};
 const Color Color::GREEN{0x00, 0xff, 0x00};
 const Color Color::BLUE{0x00, 0x00, 0xff};
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index d73e488..225e9b9 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -2,6 +2,7 @@
 
 #include "../util/Log.h"
 #include "types.h"
+#include <string>
 
 namespace crepe {
 
@@ -66,8 +67,10 @@ public:
 	//! default window settings
 	struct {
 		//TODO make this constexpr because this will never change
-		ivec2 def_size = {1080, 720};
-	} win_set;
+		ivec2 default_size = {1080, 720};
+		std::string window_title = "Jetpack joyride clone";
+
+	} window_settings;
 
 	//! Asset loading options
 	struct {
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 65c6cc3..8647794 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -11,7 +11,7 @@ using namespace std;
 using namespace crepe;
 
 Sprite::Sprite(game_object_id_t id, Texture & image, const Color & color,
-			   const FlipSettings & flip, uint8_t sort_layer, uint8_t order_layer, int height)
+			   const FlipSettings & flip, int sort_layer, int order_layer, int height)
 	: Component(id),
 	  color(color),
 	  flip(flip),
@@ -22,9 +22,9 @@ Sprite::Sprite(game_object_id_t id, Texture & image, const Color & color,
 
 	dbg_trace();
 
-	this->sprite_rect.w = sprite_image.get_width();
-	this->sprite_rect.h = sprite_image.get_height();
-	this->aspect_ratio = static_cast<double>(this->sprite_rect.w) / this->sprite_rect.h;
+	this->mask.w = sprite_image.get_width();
+	this->mask.h = sprite_image.get_height();
+	this->aspect_ratio = static_cast<double>(this->mask.w) / this->mask.h;
 }
 
 Sprite::~Sprite() { dbg_trace(); }
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index e40ce24..a0e90a0 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -41,7 +41,7 @@ public:
 	 * \param height the height of the image in game units
 	 */
 	Sprite(game_object_id_t id, Texture & image, const Color & color,
-		   const FlipSettings & flip, uint8_t sort_layer, uint8_t order_layer, int height);
+		   const FlipSettings & flip, int sort_layer, int order_layer, int height);
 
 	/**
 	 * \brief Destroys the Sprite instance.
@@ -58,9 +58,9 @@ public:
 	FlipSettings flip;
 
 	//! Layer sorting level of the sprite
-	const uint8_t sorting_in_layer;
+	const int sorting_in_layer;
 	//! Order within the sorting layer
-	const uint8_t order_in_layer;
+	const int order_in_layer;
 
 	//! height in world units
 	const int height;
@@ -74,13 +74,13 @@ public:
 	double aspect_ratio;
 
 private:
-	//! Reads the sprite_rect of sprite
+	//! Reads the mask of sprite
 	friend class SDLContext;
 
-	//! Reads the all the variables plus the  sprite_rect
+	//! Reads the all the variables plus the  mask
 	friend class Animator;
 
-	//! Reads the all the variables plus the  sprite_rect
+	//! Reads the all the variables plus the  mask
 	friend class AnimatorSystem;
 
 	struct Rect {
@@ -91,7 +91,7 @@ private:
 	};
 	//! Render area of the sprite this will also be adjusted by the AnimatorSystem if an Animator
 	// object is present in GameObject. this is in sprite pixels
-	Rect sprite_rect;
+	Rect mask;
 };
 
 } // namespace crepe
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 7317a77..9f60285 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -15,7 +15,6 @@
 #include "../api/Config.h"
 #include "../api/Sprite.h"
 #include "../api/Texture.h"
-#include "../api/Transform.h"
 #include "../util/Log.h"
 
 #include "SDLContext.h"
@@ -36,10 +35,10 @@ SDLContext::SDLContext() {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
 
-	auto & cfg = Config::get_instance().win_set;
+	auto & cfg = Config::get_instance().window_settings;
 	SDL_Window * tmp_window
-		= SDL_CreateWindow("Crepe Game Engine", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-						   cfg.def_size.x, cfg.def_size.y, 0);
+		= SDL_CreateWindow(cfg.window_title.c_str(), SDL_WINDOWPOS_CENTERED,
+						   SDL_WINDOWPOS_CENTERED, cfg.default_size.x, cfg.default_size.y, 0);
 	if (!tmp_window) {
 		throw runtime_error(format("SDLContext: SDL_Window error: {}", SDL_GetError()));
 	}
@@ -102,10 +101,10 @@ void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer.get())
 
 SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const {
 	return SDL_Rect{
-		.x = sprite.sprite_rect.x,
-		.y = sprite.sprite_rect.y,
-		.w = sprite.sprite_rect.w,
-		.h = sprite.sprite_rect.h,
+		.x = sprite.mask.x,
+		.y = sprite.mask.y,
+		.w = sprite.mask.w,
+		.h = sprite.mask.h,
 	};
 }
 SDL_Rect SDLContext::get_dst_rect(const Sprite & sprite, const vec2 & pos, const Camera & cam,
@@ -118,14 +117,14 @@ SDL_Rect SDLContext::get_dst_rect(const Sprite & sprite, const vec2 & pos, const
 	height *= img_scale * cam.zoom;
 
 	return SDL_Rect{
-		.x = static_cast<int>((pos.x - cam_pos.x + (cam.viewport.x / 2) - width / 2)),
-		.y = static_cast<int>((pos.y - cam_pos.y + (cam.viewport.y / 2) - height / 2)),
+		.x = static_cast<int>((pos.x - cam_pos.x + (cam.viewport_size.x / 2) - width / 2)),
+		.y = static_cast<int>((pos.y - cam_pos.y + (cam.viewport_size.y / 2) - height / 2)),
 		.w = width,
 		.h = height,
 	};
 }
 
-void SDLContext::draw(const RenderCtx & ctx) {
+void SDLContext::draw(const RenderContext & ctx) {
 
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * ctx.sprite.flip.flip_x)
@@ -149,12 +148,12 @@ void SDLContext::set_camera(const Camera & cam) {
 	}
 
 	double screen_aspect = cam.screen.x / cam.screen.y;
-	double viewport_aspect = cam.viewport.x / cam.viewport.y;
+	double viewport_aspect = cam.viewport_size.x / cam.viewport_size.y;
 
 	SDL_Rect view;
 	// calculate black bars
 	if (screen_aspect > viewport_aspect) {
-		// lettorboxing
+		// letterboxing
 		view.h = cam.screen.y / cam.zoom;
 		view.w = cam.screen.y * viewport_aspect;
 		view.x = (cam.screen.x - view.w) / 2;
@@ -169,7 +168,8 @@ void SDLContext::set_camera(const Camera & cam) {
 	// set drawing area
 	SDL_RenderSetViewport(this->game_renderer.get(), &view);
 
-	SDL_RenderSetLogicalSize(this->game_renderer.get(), cam.viewport.x, cam.viewport.y);
+	SDL_RenderSetLogicalSize(this->game_renderer.get(), static_cast<int>(cam.viewport_size.x),
+							 static_cast<int>(cam.viewport_size.y));
 
 	// set bg color
 	SDL_SetRenderDrawColor(this->game_renderer.get(), cam.bg_color.r, cam.bg_color.g,
@@ -178,8 +178,8 @@ void SDLContext::set_camera(const Camera & cam) {
 	SDL_Rect bg = {
 		.x = 0,
 		.y = 0,
-		.w = cam.viewport.x,
-		.h = cam.viewport.y,
+		.w = static_cast<int>(cam.viewport_size.x),
+		.h = static_cast<int>(cam.viewport_size.y),
 	};
 	// fill bg color
 	SDL_RenderFillRect(this->game_renderer.get(), &bg);
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 5f141be..8b38111 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -16,14 +16,6 @@
 
 namespace crepe {
 
-struct RenderCtx {
-	const Sprite & sprite;
-	const Camera & cam;
-	const vec2 & cam_pos;
-	const vec2 & pos;
-	const double & angle;
-	const double & scale;
-};
 
 // TODO: SDL_Keycode is defined in a header not distributed with crepe, which means this
 // typedef is unusable when crepe is packaged. Wouter will fix this later.
@@ -37,6 +29,15 @@ typedef SDL_Keycode CREPE_KEYCODES;
  * event handling, and rendering to the screen. It is never used directly by the user
  */
 class SDLContext {
+public:
+	struct RenderContext {
+		const Sprite & sprite;
+		const Camera & cam;
+		const vec2 & cam_pos;
+		const vec2 & pos;
+		const double & angle;
+		const double & scale;
+	};
 
 public:
 	/**
@@ -125,7 +126,7 @@ private:
 	 * \brief Draws a sprite to the screen using the specified transform and camera.
 	 * \param RenderCtx Reference to rendering data to draw
 	 */
-	void draw(const RenderCtx & ctx);
+	void draw(const RenderContext & ctx);
 
 	//! Clears the screen, preparing for a new frame.
 	void clear_screen();
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index e5b277f..4c40940 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -18,7 +18,7 @@ void AnimatorSystem::update() {
 		if (!a.active) continue;
 		// (10 frames per second)
 		a.curr_row = (tick / 100) % a.row;
-		a.spritesheet.sprite_rect.x = (a.curr_row * a.spritesheet.sprite_rect.w) + a.curr_col;
-		a.spritesheet.sprite_rect = a.spritesheet.sprite_rect;
+		a.spritesheet.mask.x = (a.curr_row * a.spritesheet.mask.w) + a.curr_col;
+		a.spritesheet.mask = a.spritesheet.mask;
 	}
 }
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 8895f02..c196bb1 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -77,31 +77,28 @@ bool RenderSystem::render_particle(const Sprite & sprite, const Camera & cam,
 		for (const Particle & p : em.data.particles) {
 			if (!p.active) continue;
 
-			RenderCtx ctx{
+			this->context.draw(SDLContext::RenderContext{
 				.sprite = sprite,
 				.cam = cam,
 				.cam_pos = this->cam_pos,
 				.pos = p.position,
 				.angle = p.angle,
 				.scale = scale,
-			};
-			this->context.draw(ctx);
+			});
 		}
 	}
 	return rendering_particles;
 }
 void RenderSystem::render_normal(const Sprite & sprite, const Camera & cam,
 								 const Transform & tm) {
-
-	RenderCtx ctx{
+	this->context.draw(SDLContext::RenderContext{
 		.sprite = sprite,
 		.cam = cam,
 		.cam_pos = this->cam_pos,
 		.pos = tm.position,
 		.angle = tm.rotation,
 		.scale = tm.scale,
-	};
-	this->context.draw(ctx);
+	});
 }
 
 void RenderSystem::render() {
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 8fdbb58..3a12144 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -60,7 +60,7 @@ int main(int argc, char * argv[]) {
 	*/
 
 	auto & cam = game_object.add_component<Camera>(Color::WHITE, ivec2{1080, 720},
-												   ivec2{2000, 2000}, 1.0f);
+												   vec2{2000, 2000}, 1.0f);
 
 	/*
 	game_object
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index e0bd953..bb5b81a 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -113,7 +113,7 @@ TEST_F(RenderSystemTest, sorting_sprites) {
 }
 
 TEST_F(RenderSystemTest, Update) {
-	entity1.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, ivec2{2000, 2000}, 1.0f);
+	entity1.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, vec2{2000, 2000}, 1.0f);
 	{
 		vector<reference_wrapper<Sprite>> sprites = this->mgr.get_components_by_type<Sprite>();
 		ASSERT_EQ(sprites.size(), 4);
@@ -141,7 +141,7 @@ TEST_F(RenderSystemTest, Camera) {
 		EXPECT_NE(cameras.size(), 1);
 	}
 	{
-		entity1.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, ivec2{2000, 2000}, 1.0f);
+		entity1.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, vec2{2000, 2000}, 1.0f);
 		auto cameras = this->mgr.get_components_by_type<Camera>();
 		EXPECT_EQ(cameras.size(), 1);
 	}
@@ -149,7 +149,7 @@ TEST_F(RenderSystemTest, Camera) {
 	//TODO improve with newer version
 }
 TEST_F(RenderSystemTest, Color) {
-	entity1.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, ivec2{2000, 2000}, 1.0f);
+	entity1.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, vec2{2000, 2000}, 1.0f);
 	auto & sprite = this->mgr.get_components_by_id<Sprite>(entity1.id).front().get();
 	ASSERT_NE(sprite.sprite_image.texture.get(), nullptr);
 
-- 
cgit v1.2.3