Merge branch 'master' into niels/UI

7 files changed, 156 insertions, 79 deletions

diff --git a/src/crepe/facade/CMakeLists.txt b/src/crepe/facade/CMakeLists.txt
index 4cc53bc..0598e16 100644
--- a/src/crepe/facade/CMakeLists.txt
+++ b/src/crepe/facade/CMakeLists.txt
@@ -1,5 +1,6 @@
 target_sources(crepe PUBLIC
 	Sound.cpp
+	Texture.cpp
 	SoundContext.cpp
 	SDLContext.cpp
 	DB.cpp
@@ -7,6 +8,7 @@ target_sources(crepe PUBLIC
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Sound.h
+	Texture.h
 	SoundContext.h
 	SDLContext.h
 	DB.h
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 7676cfd..6644c51 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -19,23 +19,18 @@
 #include "../api/Color.h"
 #include "../api/Config.h"
 #include "../api/Sprite.h"
-#include "../api/Texture.h"
 #include "../util/Log.h"
+#include "manager/Mediator.h"
 
 #include "SDLContext.h"
+#include "Texture.h"
 #include "types.h"
 
 using namespace crepe;
 using namespace std;
 
-SDLContext & SDLContext::get_instance() {
-	static SDLContext instance;
-	return instance;
-}
-
-SDLContext::SDLContext() {
+SDLContext::SDLContext(Mediator & mediator) {
 	dbg_trace();
-
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
 		throw runtime_error(format("SDLContext: SDL_Init error: {}", SDL_GetError()));
 	}
@@ -63,6 +58,8 @@ SDLContext::SDLContext() {
 	if (!(IMG_Init(img_flags) & img_flags)) {
 		throw runtime_error("SDLContext: SDL_image could not initialize!");
 	}
+
+	mediator.sdl_context = *this;
 }
 
 SDLContext::~SDLContext() {
@@ -222,27 +219,20 @@ 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.mask.x,
-		.y = sprite.mask.y,
-		.w = sprite.mask.w,
-		.h = sprite.mask.h,
-	};
-}
-
 SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 
 	const Sprite::Data & data = ctx.sprite.data;
 
+	float aspect_ratio
+		= (ctx.sprite.aspect_ratio == 0) ? ctx.texture.get_ratio() : ctx.sprite.aspect_ratio;
+
 	vec2 size = data.size;
 	if (data.size.x == 0 && data.size.y != 0) {
-		size.x = data.size.y * ctx.sprite.aspect_ratio;
+		size.x = data.size.y * aspect_ratio;
 	}
 	if (data.size.y == 0 && data.size.x != 0) {
-		size.y = data.size.x / ctx.sprite.aspect_ratio;
+		size.y = data.size.x / aspect_ratio;
 	}
-
 	size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset;
 
 	vec2 screen_pos = (ctx.pos + data.position_offset - cam_aux_data.cam_pos
@@ -259,24 +249,33 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const {
 }
 
 void SDLContext::draw(const RenderContext & ctx) {
-
 	const Sprite::Data & data = ctx.sprite.data;
 	SDL_RendererFlip render_flip
 		= (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x)
 							  | (SDL_FLIP_VERTICAL * data.flip.flip_y));
 
-	SDL_Rect srcrect = this->get_src_rect(ctx.sprite);
+	SDL_Rect srcrect;
+	SDL_Rect * srcrect_ptr = NULL;
+	if (ctx.sprite.mask.w != 0 || ctx.sprite.mask.h != 0) {
+		srcrect.w = ctx.sprite.mask.w;
+		srcrect.h = ctx.sprite.mask.h;
+		srcrect.x = ctx.sprite.mask.x;
+		srcrect.y = ctx.sprite.mask.y;
+		srcrect_ptr = &srcrect;
+	}
+
 	SDL_FRect dstrect = this->get_dst_rect(SDLContext::DestinationRectangleData{
 		.sprite = ctx.sprite,
+		.texture = ctx.texture,
 		.pos = ctx.pos,
 		.img_scale = ctx.scale,
 	});
 
 	double angle = ctx.angle + data.angle_offset;
 
-	this->set_color_texture(ctx.sprite.texture, ctx.sprite.data.color);
-	SDL_RenderCopyExF(this->game_renderer.get(), ctx.sprite.texture.texture.get(), &srcrect,
-					  &dstrect, angle, NULL, render_flip);
+	this->set_color_texture(ctx.texture, ctx.sprite.data.color);
+	SDL_RenderCopyExF(this->game_renderer.get(), ctx.texture.get_img(), srcrect_ptr, &dstrect,
+					  angle, NULL, render_flip);
 }
 
 void SDLContext::update_camera_view(const Camera & cam, const vec2 & new_pos) {
@@ -364,7 +363,7 @@ SDLContext::texture_from_path(const std::string & path) {
 
 ivec2 SDLContext::get_size(const Texture & ctx) {
 	ivec2 size;
-	SDL_QueryTexture(ctx.texture.get(), NULL, NULL, &size.x, &size.y);
+	SDL_QueryTexture(ctx.get_img(), NULL, NULL, &size.x, &size.y);
 	return size;
 }
 
@@ -435,6 +434,6 @@ std::vector<SDLContext::EventData> SDLContext::get_events() {
 	return event_list;
 }
 void SDLContext::set_color_texture(const Texture & texture, const Color & color) {
-	SDL_SetTextureColorMod(texture.texture.get(), color.r, color.g, color.b);
-	SDL_SetTextureAlphaMod(texture.texture.get(), color.a);
+	SDL_SetTextureColorMod(texture.get_img(), color.r, color.g, color.b);
+	SDL_SetTextureAlphaMod(texture.get_img(), color.a);
 }
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 6d50ab0..259d4b5 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -14,14 +14,15 @@
 #include "api/Color.h"
 #include "api/KeyCodes.h"
 #include "api/Sprite.h"
-#include "api/Texture.h"
 #include "api/Transform.h"
+
 #include "types.h"
 
 namespace crepe {
 
-class LoopManager;
-class InputSystem;
+class Texture;
+class Mediator;
+
 /**
  * \class SDLContext
  * \brief Facade for the SDL library
@@ -62,6 +63,7 @@ public:
 	//! rendering data needed to render on screen
 	struct RenderContext {
 		const Sprite & sprite;
+		const Texture & texture;
 		const vec2 & pos;
 		const double & angle;
 		const double & scale;
@@ -91,20 +93,27 @@ public:
 		float scroll_delta = INFINITY;
 		ivec2 rel_mouse_move = {-1, -1};
 	};
-	/**
-	 * \brief Gets the singleton instance of SDLContext.
-	 * \return Reference to the SDLContext instance.
-	 */
-	static SDLContext & get_instance();
 
+public:
 	SDLContext(const SDLContext &) = delete;
 	SDLContext(SDLContext &&) = delete;
 	SDLContext & operator=(const SDLContext &) = delete;
 	SDLContext & operator=(SDLContext &&) = delete;
 
-private:
-	//! will only use get_events
-	friend class InputSystem;
+public:
+	/**
+	 * \brief Constructs an SDLContext instance.
+	 * Initializes SDL, creates a window and renderer.
+	 */
+	SDLContext(Mediator & mediator);
+
+	/**
+	 * \brief Destroys the SDLContext instance.
+	 * Cleans up SDL resources, including the window and renderer.
+	 */
+	~SDLContext();
+
+public:
 	/**
 	 * \brief Retrieves a list of all events from the SDL context.
 	 *
@@ -138,9 +147,7 @@ private:
 	 */
 	MouseButton sdl_to_mousebutton(Uint8 sdl_button);
 
-private:
-	//! Will only use delay
-	friend class LoopTimer;
+public:
 	/**
 	 * \brief Gets the current SDL ticks since the program started.
 	 * \return Current ticks in milliseconds as a constant uint64_t.
@@ -156,23 +163,7 @@ private:
 	 */
 	void delay(int ms) const;
 
-private:
-	/**
-	 * \brief Constructs an SDLContext instance.
-	 * Initializes SDL, creates a window and renderer.
-	 */
-	SDLContext();
-
-	/**
-	 * \brief Destroys the SDLContext instance.
-	 * Cleans up SDL resources, including the window and renderer.
-	 */
-	~SDLContext();
-
-private:
-	//! Will use the funtions: texture_from_path, get_width,get_height.
-	friend class Texture;
-
+public:
 	/**
 	 * \brief Loads a texture from a file path.
 	 * \param path Path to the image file.
@@ -183,14 +174,11 @@ private:
 	/**
 	 * \brief Gets the size of a texture.
 	 * \param texture Reference to the Texture object.
-	 * \return Width and height of the texture as an integer.
+	 * \return Width and height of the texture as an integer in pixels.
 	 */
 	ivec2 get_size(const Texture & ctx);
 
-private:
-	//! Will use draw,clear_screen, present_screen, camera.
-	friend class RenderSystem;
-
+public:
 	/**
 	 * \brief Draws a sprite to the screen using the specified transform and camera.
 	 * \param RenderContext Reference to rendering data to draw
@@ -213,29 +201,19 @@ private:
 	 */
 	void update_camera_view(const Camera & camera, const vec2 & new_pos);
 
-private:
+public:
 	//! the data needed to construct a sdl dst rectangle
 	struct DestinationRectangleData {
 		const Sprite & sprite;
+		const Texture & texture;
 		const vec2 & pos;
 		const double & img_scale;
 	};
-	/**
-	 * \brief calculates the sqaure size of the image
-	 *
-	 * \param sprite Reference to the sprite to calculate the rectangle
-	 * \return sdl rectangle to draw a src image
-	 */
-	SDL_Rect get_src_rect(const Sprite & sprite) const;
 
 	/**
 	 * \brief calculates the sqaure size of the image for destination
 	 *
-	 * \param sprite Reference to the sprite to calculate rectangle
-	 * \param pos the pos in world units
-	 * \param cam the camera of the current scene
-	 * \param cam_pos the current postion of the camera
-	 * \param img_scale the image multiplier for increasing img size
+	 * \param data needed to calculate a destination rectangle
 	 * \return sdl rectangle to draw a dst image to draw on the screen
 	 */
 	SDL_FRect get_dst_rect(const DestinationRectangleData & data) const;
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index ad50637..97e455e 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -6,7 +6,7 @@
 using namespace crepe;
 using namespace std;
 
-Sound::Sound(const Asset & src) : Resource(src) {
+Sound::Sound(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
 	this->sample.load(src.get_path().c_str());
 	dbg_trace();
 }
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index 85d141b..4a5d692 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -8,6 +8,7 @@
 namespace crepe {
 
 class SoundContext;
+class Mediator;
 
 /**
  * \brief Sound resource facade
@@ -17,7 +18,7 @@ class SoundContext;
  */
 class Sound : public Resource {
 public:
-	Sound(const Asset & src);
+	Sound(const Asset & src, Mediator & mediator);
 	~Sound(); // dbg_trace
 
 private:
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
new file mode 100644
index 0000000..b63403d
--- /dev/null
+++ b/src/crepe/facade/Texture.cpp
@@ -0,0 +1,28 @@
+#include "../util/Log.h"
+#include "facade/SDLContext.h"
+#include "manager/Mediator.h"
+
+#include "Resource.h"
+#include "Texture.h"
+#include "types.h"
+
+using namespace crepe;
+using namespace std;
+
+Texture::Texture(const Asset & src, Mediator & mediator) : Resource(src, mediator) {
+	dbg_trace();
+	SDLContext & ctx = mediator.sdl_context;
+	this->texture = ctx.texture_from_path(src.get_path());
+	this->size = ctx.get_size(*this);
+	this->aspect_ratio = static_cast<float>(this->size.x) / this->size.y;
+}
+
+Texture::~Texture() {
+	dbg_trace();
+	this->texture.reset();
+}
+
+const ivec2 & Texture::get_size() const noexcept { return this->size; }
+const float & Texture::get_ratio() const noexcept { return this->aspect_ratio; }
+
+SDL_Texture * Texture::get_img() const noexcept { return this->texture.get(); }
diff --git a/src/crepe/facade/Texture.h b/src/crepe/facade/Texture.h
new file mode 100644
index 0000000..cdacac4
--- /dev/null
+++ b/src/crepe/facade/Texture.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <SDL2/SDL_render.h>
+#include <memory>
+
+#include "../Resource.h"
+
+#include "types.h"
+
+namespace crepe {
+
+class Mediator;
+class Asset;
+
+/**
+ * \class Texture
+ * \brief Manages texture loading and properties.
+ *
+ * The Texture class is responsible for loading an image from a source and providing access to
+ * its dimensions. Textures can be used for rendering.
+ */
+class Texture : public Resource {
+
+public:
+	/**
+	 * \brief Constructs a Texture from an Asset resource.
+	 * \param src Asset with texture data to load.
+	 * \param mediator use the SDLContext reference to load the image
+	 */
+	Texture(const Asset & src, Mediator & mediator);
+
+	/**
+	 * \brief Destroys the Texture instance
+	 */
+	~Texture();
+
+	/**
+	 * \brief get width and height of image in pixels
+	 * \return pixel size width and height
+	 *
+	 */
+	const ivec2 & get_size() const noexcept;
+
+	/**
+	 * \brief aspect_ratio of image
+	 * \return ratio
+	 *
+	 */
+	const float & get_ratio() const noexcept;
+
+	/**
+	 * \brief get the image texture
+	 * \return SDL_Texture
+	 *
+	 */
+	SDL_Texture * get_img() const noexcept;
+
+private:
+	//! The texture of the class from the library
+	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> texture;
+
+	// texture size in pixel
+	ivec2 size;
+
+	//! ratio of image
+	float aspect_ratio;
+};
+
+} // namespace crepe