From a14fae2f5d7820703de79412709dc682c8fbbfc1 Mon Sep 17 00:00:00 2001
From: Anders Fritz Fischer <Anders.Fischer1@googlemail.com>
Date: Wed, 11 Mar 2026 07:30:24 +0100
Subject: [PATCH 01/10] Remove empty files

---
 src/Game.cpp | 0
 src/Game.h   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/Game.cpp
 delete mode 100644 src/Game.h

diff --git a/src/Game.cpp b/src/Game.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Game.h b/src/Game.h
deleted file mode 100644
index e69de29..0000000

From b7885bd8890dbb1d2b0a7c19f73c96767e087b6b Mon Sep 17 00:00:00 2001
From: Fritzn <Anders.Fischer1@googlemail.com>
Date: Wed, 11 Mar 2026 10:33:38 +0100
Subject: [PATCH 02/10] 25 refactor UI (#26)

* Add UIElement and use it in StartScene

* Refactor EndScene buttons with UIElement

* Code cleanup
---
 include/scenes/EndScene.h   | 22 +++++--------
 include/scenes/GameScene.h  | 27 ++++++----------
 include/scenes/StartScene.h | 25 ++++++---------
 include/ui/Button.h         | 24 +++++++++++++++
 include/ui/UIElement.h      | 16 ++++++++++
 src/scenes/EndScene.cpp     | 61 ++++++++++++++++++++++++++++---------
 src/scenes/GameScene.cpp    | 17 +++++++++--
 src/scenes/SceneManager.cpp |  2 +-
 src/scenes/StartScene.cpp   | 58 ++++++++++++++++++++++++++---------
 src/ui/Button.cpp           | 22 +++++++++++++
 10 files changed, 193 insertions(+), 81 deletions(-)
 create mode 100644 include/ui/Button.h
 create mode 100644 include/ui/UIElement.h
 create mode 100644 src/ui/Button.cpp

diff --git a/include/scenes/EndScene.h b/include/scenes/EndScene.h
index 4d28433..9aee343 100644
--- a/include/scenes/EndScene.h
+++ b/include/scenes/EndScene.h
@@ -1,25 +1,22 @@
 #ifndef MEMORYSDL_ENDSCENE_H
 #define MEMORYSDL_ENDSCENE_H
 #include "scenes/Scene.h"
+
+#include "ui/UIElement.h"
 #include "scenes/SceneManager.h"
 
+#include <vector>
+
 class EndScene : public Scene
 {
 public:
     explicit EndScene(SceneManager &manager, GameContext &context)
         : Scene(context), m_sceneManager(manager)
     {
-        m_uiPlayButtonRect.x = static_cast<float>(m_context.windowWidth) * 0.15f;
-        m_uiPlayButtonRect.y = static_cast<float>(m_context.windowHeight) * 0.75f;
-        m_uiPlayButtonRect.w = static_cast<float>(m_context.texWidth) * 0.5f;
-        m_uiPlayButtonRect.h = static_cast<float>(m_context.texHeight) * 0.5f;
-
-        m_uiQuitButtonRect.x = static_cast<float>(m_context.windowWidth) * 0.75f;
-        m_uiQuitButtonRect.y = static_cast<float>(m_context.windowHeight) * 0.75f;
-        m_uiQuitButtonRect.w = static_cast<float>(m_context.texWidth) * 0.5f;
-        m_uiQuitButtonRect.h = static_cast<float>(m_context.texHeight) * 0.5f;
+        InitUI();
     }
 
+    void InitUI();
     void HandleEvent(const SDL_Event &event) override;
     void Update(float dt) override;
     void Render(SDL_Renderer *renderer) override;
@@ -28,12 +25,7 @@ class EndScene : public Scene
     SceneManager &m_sceneManager;
 
     // UI
-    const char* m_uiPlayButtonText = "PLAY";
-    const char* m_uiQuitButtonText = "QUIT";
-    SDL_FRect m_uiPlayButtonRect{};
-    SDL_FRect m_uiQuitButtonRect{};
-    bool uiPlayPressed = false;
-    bool uiQuitPressed = false;
+    std::vector<std::unique_ptr<UIElement>> m_ui;
 };
 
 #endif //MEMORYSDL_ENDSCENE_H
\ No newline at end of file
diff --git a/include/scenes/GameScene.h b/include/scenes/GameScene.h
index a46751a..55188af 100644
--- a/include/scenes/GameScene.h
+++ b/include/scenes/GameScene.h
@@ -9,24 +9,16 @@ class GameScene : public Scene
 {
 public:
     explicit GameScene(SceneManager &manager, GameContext &context)
-        : Scene(context), m_sceneManager(manager), m_gameState(GameState::Paused), m_numOfCardsMatched(0),
+        : Scene(context), m_sceneManager(manager), m_numOfCardsMatched(0),
           m_cardsSelected(CardSelected::NoCard),
           m_firstCardIdx(-1),
-          m_secondCardIdx(-1), m_resolveCardsAtMs(0),
-          m_attempts(MAX_ATTEMPTS)
+          m_secondCardIdx(-1), m_attempts(MAX_ATTEMPTS),
+          m_resolveCardsAtMs(0)
     {
-        constexpr auto size = static_cast<size_t>(MAX_ATTEMPTS);
-        m_uiHeartRects.resize(size);
-        for (size_t i = 0; i < size; ++i) {
-            m_uiHeartRects[i].x = (static_cast<float>(m_context.windowWidth) * 0.5f + static_cast<float>(
-                                       m_context.texWidth * i) - static_cast<float>(m_context.texWidth * m_attempts) /
-                                   2);
-            m_uiHeartRects[i].y = static_cast<float>(m_context.windowHeight) * 0.001f;
-            m_uiHeartRects[i].w = static_cast<float>(m_context.texWidth);
-            m_uiHeartRects[i].h = static_cast<float>(m_context.texHeight);
-        }
+        Init();
     }
 
+    void Init();
     void HandleEvent(const SDL_Event &event) override;
     void Update(float dt) override;
     void Render(SDL_Renderer *renderer) override;
@@ -34,20 +26,19 @@ class GameScene : public Scene
 private:
     SceneManager &m_sceneManager;
 
-    enum class GameState { Running, Ended, Paused, Starting };
-    GameState m_gameState;
-
+    // State
     enum class CardSelected { NoCard, OneCard, TwoCards };
     size_t m_numOfCardsMatched;
     CardSelected m_cardsSelected;
     int m_firstCardIdx;
     int m_secondCardIdx;
+    int m_attempts;
 
     Uint64 m_resolveCardsAtMs;
     static constexpr Uint64 m_revealDelayMs = 800;
 
-    std::vector<SDL_FRect> m_uiHeartRects;
-    int m_attempts;
+    // UI
+    std::vector<SDL_FRect> m_uiHeartRects; // TODO: refactor to UIElement
 };
 
 #endif //MEMORYSDL_GAMESCENE_H
\ No newline at end of file
diff --git a/include/scenes/StartScene.h b/include/scenes/StartScene.h
index 3d216fe..9254f20 100644
--- a/include/scenes/StartScene.h
+++ b/include/scenes/StartScene.h
@@ -2,7 +2,11 @@
 #define MEMORYSDL_STARTSCENE_H
 #include "scenes/Scene.h"
 
-class SceneManager;
+#include "ui/Button.h"
+#include "scenes/SceneManager.h"
+
+#include <memory>
+#include <vector>
 
 class StartScene : public Scene
 {
@@ -10,17 +14,11 @@ class StartScene : public Scene
     explicit StartScene(SceneManager &manager, GameContext& context)
         : Scene(context), m_sceneManager(manager)
     {
-        m_uiPlayButtonRect.x = static_cast<float>(m_context.windowWidth) * 0.15f;
-        m_uiPlayButtonRect.y = static_cast<float>(m_context.windowHeight) * 0.75f;
-        m_uiPlayButtonRect.w = static_cast<float>(m_context.texWidth) * 0.5f;
-        m_uiPlayButtonRect.h = static_cast<float>(m_context.texHeight) * 0.5f;
-
-        m_uiQuitButtonRect.x = static_cast<float>(m_context.windowWidth) * 0.75f;
-        m_uiQuitButtonRect.y = static_cast<float>(m_context.windowHeight) * 0.75f;
-        m_uiQuitButtonRect.w = static_cast<float>(m_context.texWidth) * 0.5f;
-        m_uiQuitButtonRect.h = static_cast<float>(m_context.texHeight) * 0.5f;
+        InitUI();
     }
 
+    void InitUI();
+
     void HandleEvent(const SDL_Event &event) override;
     void Update(float dt) override {};
     void Render(SDL_Renderer *renderer) override;
@@ -29,12 +27,7 @@ class StartScene : public Scene
     SceneManager &m_sceneManager;
 
     // UI
-    const char* m_uiPlayButtonText = "PLAY";
-    const char* m_uiQuitButtonText = "QUIT";
-    SDL_FRect m_uiPlayButtonRect{};
-    SDL_FRect m_uiQuitButtonRect{};
-    bool uiPlayPressed = false;
-    bool uiQuitPressed = false;
+    std::vector<std::unique_ptr<UIElement>> m_ui;
 };
 
 #endif //MEMORYSDL_STARTSCENE_H
\ No newline at end of file
diff --git a/include/ui/Button.h b/include/ui/Button.h
new file mode 100644
index 0000000..97ac6c8
--- /dev/null
+++ b/include/ui/Button.h
@@ -0,0 +1,24 @@
+#ifndef MEMORYSDL_BUTTON_H
+#define MEMORYSDL_BUTTON_H
+#include "UIElement.h"
+
+#include <functional>
+
+class Button : public UIElement
+{
+public:
+    Button(const SDL_FRect rect, SDL_Texture* texture,
+        std::function<void()> onClick)
+            : m_rect(rect), m_texture(texture), m_onClick(onClick)
+    {}
+
+    void HandleEvent(const SDL_Event& event) override;
+    void Render(SDL_Renderer* renderer) override;
+
+private:
+    SDL_FRect m_rect;
+    SDL_Texture* m_texture;
+    std::function<void()> m_onClick;
+};
+
+#endif //MEMORYSDL_BUTTON_H
\ No newline at end of file
diff --git a/include/ui/UIElement.h b/include/ui/UIElement.h
new file mode 100644
index 0000000..db3a5ce
--- /dev/null
+++ b/include/ui/UIElement.h
@@ -0,0 +1,16 @@
+#ifndef MEMORYSDL_UIELEMENT_H
+#define MEMORYSDL_UIELEMENT_H
+#include "SDL3/SDL_events.h"
+#include "SDL3/SDL_render.h"
+
+class UIElement
+{
+public:
+    virtual ~UIElement() = default;
+
+    virtual void HandleEvent(const SDL_Event& event) = 0;
+    virtual void Update() {};
+    virtual void Render(SDL_Renderer* renderer) = 0;
+};
+
+#endif //MEMORYSDL_UIELEMENT_H
\ No newline at end of file
diff --git a/src/scenes/EndScene.cpp b/src/scenes/EndScene.cpp
index 432db9f..84f13b7 100644
--- a/src/scenes/EndScene.cpp
+++ b/src/scenes/EndScene.cpp
@@ -1,22 +1,56 @@
 #include "scenes/EndScene.h"
 
+#include "ui/Button.h"
 #include "scenes/GameScene.h"
 
-void EndScene::HandleEvent(const SDL_Event &event)
-{
-    if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
-    {
-        SDL_FPoint p {event.button.x, event.button.y};
+#include "memory"
 
-        if (SDL_PointInRectFloat(&p, &m_uiPlayButtonRect))
+void EndScene::InitUI()
+{
+    SDL_FRect tmpButton
         {
+            static_cast<float>(m_context.windowWidth) * 0.15f,
+            static_cast<float>(m_context.windowHeight) * 0.75f,
+            static_cast<float>(m_context.texWidth) * 0.5f,
+            static_cast<float>(m_context.texHeight) * 0.5f
+        };
+    SDL_Texture* play = m_context.assetManager->GetTexture("UI_PlayButton");
+    m_ui.push_back(std::make_unique<Button>(
+        tmpButton,
+        play,
+        [this]() {
             m_context.grid->ShuffleDeck();
             m_context.grid->ResetCardStates();
-            m_sceneManager.RequestSceneChange(std::make_unique<GameScene>(m_sceneManager, m_context));
+            m_sceneManager.RequestSceneChange(
+                std::make_unique<GameScene>(m_sceneManager, m_context));
         }
+    ));
 
-        else if (SDL_PointInRectFloat(&p, &m_uiQuitButtonRect))
+    SDL_FRect tmpButton2 =
+    {
+        static_cast<float>(m_context.windowWidth) * 0.75f,
+        static_cast<float>(m_context.windowHeight) * 0.75f,
+        static_cast<float>(m_context.texWidth) * 0.5f,
+        static_cast<float>(m_context.texHeight) * 0.5f
+    };
+    SDL_Texture* play2 = m_context.assetManager->GetTexture("UI_QuitButton");
+    m_ui.push_back(std::make_unique<Button>(
+        tmpButton2,
+        play2,
+        [this]() {
             m_sceneManager.RequestQuit();
+        }
+    ));
+}
+
+void EndScene::HandleEvent(const SDL_Event &event)
+{
+    if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
+    {
+        for (const auto& element : m_ui)
+        {
+            element->HandleEvent(event);
+        }
     }
 }
 
@@ -39,13 +73,10 @@ void EndScene::Render(SDL_Renderer *renderer)
     SDL_RenderDebugText(m_context.renderer, middle, middle, text);
     SDL_SetRenderScale(m_context.renderer, 1.0f, 1.0f);
 
-    // PlayButton
-    SDL_Texture* play = m_context.assetManager->GetTexture("UI_PlayButton");
-    SDL_RenderTexture(m_context.renderer, play, nullptr, &m_uiPlayButtonRect);
-
-    // QuitButton
-    SDL_Texture* quit = m_context.assetManager->GetTexture("UI_QuitButton");
-    SDL_RenderTexture(m_context.renderer, quit, nullptr, &m_uiQuitButtonRect);
+    for (const auto& element : m_ui)
+    {
+        element->Render(renderer);
+    }
 
     SDL_RenderPresent(m_context.renderer);
 }
diff --git a/src/scenes/GameScene.cpp b/src/scenes/GameScene.cpp
index f79a045..79f3cf2 100644
--- a/src/scenes/GameScene.cpp
+++ b/src/scenes/GameScene.cpp
@@ -5,6 +5,21 @@
 
 #include "SDL3/SDL_timer.h"
 
+void GameScene::Init()
+{
+    constexpr auto size = static_cast<size_t>(MAX_ATTEMPTS);
+    m_uiHeartRects.resize(size);
+    for (size_t i = 0; i < size; ++i)
+    {
+        m_uiHeartRects[i].x = (static_cast<float>(m_context.windowWidth) * 0.5f + static_cast<float>(
+                                   m_context.texWidth * i) - static_cast<float>(m_context.texWidth * m_attempts) /
+                               2);
+        m_uiHeartRects[i].y = static_cast<float>(m_context.windowHeight) * 0.001f;
+        m_uiHeartRects[i].w = static_cast<float>(m_context.texWidth);
+        m_uiHeartRects[i].h = static_cast<float>(m_context.texHeight);
+    }
+}
+
 void GameScene::HandleEvent(const SDL_Event &event)
 {
     if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
@@ -57,7 +72,6 @@ void GameScene::Update(float dt)
 {
     if (m_attempts < 1)
     {
-        m_gameState = GameState::Ended;
         m_sceneManager.RequestSceneChange(std::make_unique<EndScene>(m_sceneManager, m_context));
         return;
     }
@@ -92,7 +106,6 @@ void GameScene::Update(float dt)
 
                 if (m_numOfCardsMatched == m_context.grid->GetSize())
                 {
-                    m_gameState = GameState::Ended;
                     m_sceneManager.RequestSceneChange(std::make_unique<EndScene>(m_sceneManager, m_context));
                 }
             }
diff --git a/src/scenes/SceneManager.cpp b/src/scenes/SceneManager.cpp
index a003c59..9c9adde 100644
--- a/src/scenes/SceneManager.cpp
+++ b/src/scenes/SceneManager.cpp
@@ -2,7 +2,7 @@
 
 void SceneManager::RequestSceneChange(std::unique_ptr<Scene> scene)
 {
-    m_currentScene = std::move(scene);
+    m_nextScene = std::move(scene);
 }
 
 void SceneManager::RequestQuit()
diff --git a/src/scenes/StartScene.cpp b/src/scenes/StartScene.cpp
index 97dccc2..c891278 100644
--- a/src/scenes/StartScene.cpp
+++ b/src/scenes/StartScene.cpp
@@ -8,6 +8,42 @@
 
 #include <memory>
 
+void StartScene::InitUI()
+{
+    SDL_FRect tmpButton
+        {
+            static_cast<float>(m_context.windowWidth) * 0.15f,
+            static_cast<float>(m_context.windowHeight) * 0.75f,
+            static_cast<float>(m_context.texWidth) * 0.5f,
+            static_cast<float>(m_context.texHeight) * 0.5f
+        };
+    SDL_Texture* play = m_context.assetManager->GetTexture("UI_PlayButton");
+    m_ui.push_back(std::make_unique<Button>(
+        tmpButton,
+        play,
+        [this]() {
+            m_sceneManager.RequestSceneChange(
+                std::make_unique<GameScene>(m_sceneManager, m_context));
+        }
+    ));
+
+    SDL_FRect tmpButton2 =
+    {
+        static_cast<float>(m_context.windowWidth) * 0.75f,
+        static_cast<float>(m_context.windowHeight) * 0.75f,
+        static_cast<float>(m_context.texWidth) * 0.5f,
+        static_cast<float>(m_context.texHeight) * 0.5f
+    };
+    SDL_Texture* play2 = m_context.assetManager->GetTexture("UI_QuitButton");
+    m_ui.push_back(std::make_unique<Button>(
+        tmpButton2,
+        play2,
+        [this]() {
+            m_sceneManager.RequestQuit();
+        }
+    ));
+}
+
 void StartScene::HandleEvent(const SDL_Event &event)
 {
     if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
@@ -18,13 +54,10 @@ void StartScene::HandleEvent(const SDL_Event &event)
             m_context.soundSystem->Update();
         }
 #endif
-        const SDL_FPoint &p {event.button.x, event.button.y};
-
-        if (SDL_PointInRectFloat(&p, &m_uiPlayButtonRect))
-            m_sceneManager.RequestSceneChange(std::make_unique<GameScene>(m_sceneManager, m_context));
-
-        else if (SDL_PointInRectFloat(&p, &m_uiQuitButtonRect))
-            m_sceneManager.RequestQuit();
+        for (const auto& element : m_ui)
+        {
+            element->HandleEvent(event);
+        }
     }
 }
 
@@ -42,13 +75,10 @@ void StartScene::Render(SDL_Renderer *renderer)
     SDL_RenderDebugText(renderer, middle, 25.0f, text);
     SDL_SetRenderScale(renderer, 1.0f, 1.0f);
 
-    // PlayButton
-    SDL_Texture* play = m_context.assetManager->GetTexture("UI_PlayButton");
-    SDL_RenderTexture(renderer, play, nullptr, &m_uiPlayButtonRect);
-
-    // QuitButton
-    SDL_Texture* quit = m_context.assetManager->GetTexture("UI_QuitButton");
-    SDL_RenderTexture(renderer, quit, nullptr, &m_uiQuitButtonRect);
+    for (const auto& element : m_ui)
+    {
+        element->Render(renderer);
+    }
 
     SDL_RenderPresent(renderer);
 }
diff --git a/src/ui/Button.cpp b/src/ui/Button.cpp
new file mode 100644
index 0000000..9d754b8
--- /dev/null
+++ b/src/ui/Button.cpp
@@ -0,0 +1,22 @@
+#include "ui/Button.h"
+
+#include "SDL3/SDL_events.h"
+
+void Button::HandleEvent(const SDL_Event& event)
+{
+    if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
+    {
+        const SDL_FPoint mouse_pos{ event.button.x, event.button.y };
+
+        if (SDL_PointInRectFloat(&mouse_pos, &m_rect))
+        {
+            if (m_onClick)
+                m_onClick();
+        }
+    }
+}
+
+void Button::Render(SDL_Renderer *renderer)
+{
+    SDL_RenderTexture(renderer, m_texture, nullptr, &m_rect);
+}

From d48af28b278fb0337cb2bd39767d6ed13dccdba4 Mon Sep 17 00:00:00 2001
From: Fritzn <Anders.Fischer1@googlemail.com>
Date: Fri, 13 Mar 2026 17:09:32 +0100
Subject: [PATCH 03/10] 27 refactor gamescene (#28)

* Move GridLayout from Game to GameScene

* Add Card classes to GameScene

* Bug: Matched cards flip back

* Fix bug: matched cards flip back

* Code cleanup
---
 include/core/Game.h         |  2 -
 include/core/GameContext.h  |  6 +--
 include/game/Card.h         | 38 +++++++++++++++++
 include/game/CardData.h     | 13 ++++++
 include/game/CardDeck.h     | 26 ++++++++++++
 include/scenes/GameScene.h  |  8 ++++
 include/ui/Card.h           | 14 -------
 include/ui/GridLayout.h     | 19 +++------
 src/core/Game.cpp           | 26 ++++--------
 src/game/Card.cpp           | 32 +++++++++++++++
 src/game/CardDeck.cpp       | 24 +++++++++++
 src/scenes/EndScene.cpp     |  2 -
 src/scenes/GameScene.cpp    | 81 +++++++++++++++++++++++--------------
 src/scenes/SceneManager.cpp |  1 +
 src/ui/GridLayout.cpp       | 56 +++++--------------------
 15 files changed, 217 insertions(+), 131 deletions(-)
 create mode 100644 include/game/Card.h
 create mode 100644 include/game/CardData.h
 create mode 100644 include/game/CardDeck.h
 delete mode 100644 include/ui/Card.h
 create mode 100644 src/game/Card.cpp
 create mode 100644 src/game/CardDeck.cpp

diff --git a/include/core/Game.h b/include/core/Game.h
index bfa046a..efc24cd 100644
--- a/include/core/Game.h
+++ b/include/core/Game.h
@@ -7,7 +7,6 @@
 #include <memory>
 
 class AssetManager;
-class GridLayout;
 class SceneManager;
 class SoundSystem;
 
@@ -33,7 +32,6 @@ class Game
 
 	// Systems
 	std::unique_ptr<AssetManager> m_assetManager;
-	std::unique_ptr<GridLayout> m_grid;
 	std::unique_ptr<SoundSystem> m_soundSystem;
 	std::unique_ptr<SceneManager> m_sceneManager;
 
diff --git a/include/core/GameContext.h b/include/core/GameContext.h
index 4151d4d..514c0d4 100644
--- a/include/core/GameContext.h
+++ b/include/core/GameContext.h
@@ -1,6 +1,5 @@
 #ifndef MEMORYSDL_GAMECONTEXT_H
 #define MEMORYSDL_GAMECONTEXT_H
-#include "ui/GridLayout.h"
 #include "systems/AssetManager.h"
 #include "systems/SoundSystem.h"
 
@@ -10,7 +9,6 @@ struct GameContext
 {
     SDL_Renderer *renderer;
     AssetManager *assetManager;
-    GridLayout *grid;
     SoundSystem *soundSystem;
 
     int windowWidth;
@@ -18,9 +16,9 @@ struct GameContext
     int texWidth;
     int texHeight;
 
-    GameContext(SDL_Renderer* r, AssetManager *am, GridLayout *gl, SoundSystem *ss,
+    GameContext(SDL_Renderer* r, AssetManager *am, SoundSystem *ss,
         const int wWidth, const int wHeight, const int tw, const int th)
-        : renderer(r), assetManager(am), grid(gl), soundSystem(ss), windowWidth(wWidth),
+        : renderer(r), assetManager(am), soundSystem(ss), windowWidth(wWidth),
           windowHeight(wHeight), texWidth(tw),
           texHeight(th)
     {}
diff --git a/include/game/Card.h b/include/game/Card.h
new file mode 100644
index 0000000..34f7cff
--- /dev/null
+++ b/include/game/Card.h
@@ -0,0 +1,38 @@
+#pragma once
+#include "game/CardData.h"
+
+#include "SDL3/SDL_rect.h"
+#include "SDL3/SDL_render.h"
+
+class Card
+{
+public:
+	enum class CardState { FaceDown, FaceUp, Matched };
+
+	Card(const CardData& data, const SDL_FRect& rect, SDL_Texture* front, SDL_Texture* back)
+		: m_data(data), m_rect(rect), m_front(front), m_back(back)
+	{}
+
+	void Render(SDL_Renderer* renderer) const;
+	void HandleEvent(const SDL_Event& event);
+
+	bool TryFlip();
+	void SetMatched();
+	void FlipDown();
+
+	[[nodiscard]] bool IsFaceDown() const { return m_state == CardState::FaceDown; }
+	[[nodiscard]] bool IsFaceUp() const { return m_state == CardState::FaceUp; }
+
+	//[[nodiscard]] const char *GetTexName() const { return m_data.frontKey.c_str(); } // NOTE: for testing
+	[[nodiscard]] int GetPairId() const { return m_data.pairId; }
+	[[nodiscard]] SDL_FRect GetRect() const { return m_rect; }
+
+private:
+	CardData m_data;
+	SDL_FRect m_rect;
+
+	SDL_Texture* m_front;
+	SDL_Texture* m_back;
+
+	CardState m_state = CardState::FaceDown;
+};
\ No newline at end of file
diff --git a/include/game/CardData.h b/include/game/CardData.h
new file mode 100644
index 0000000..54878f0
--- /dev/null
+++ b/include/game/CardData.h
@@ -0,0 +1,13 @@
+#ifndef MEMORYSDL_CARDDATA_H
+#define MEMORYSDL_CARDDATA_H
+#include <string>
+
+struct CardData
+{
+    int uniqueId = -1;
+    int pairId = -1;
+    std::string frontKey;
+    float rotation = 0.f;
+};
+
+#endif //MEMORYSDL_CARDDATA_H
\ No newline at end of file
diff --git a/include/game/CardDeck.h b/include/game/CardDeck.h
new file mode 100644
index 0000000..b23e6c5
--- /dev/null
+++ b/include/game/CardDeck.h
@@ -0,0 +1,26 @@
+#ifndef MEMORYSDL_CARDDECK_H
+#define MEMORYSDL_CARDDECK_H
+
+#include "game/Card.h"
+
+#include <random>
+#include <string>
+#include <vector>
+
+class CardDeck
+{
+public:
+    CardDeck() : m_rng(std::random_device{}())
+    {}
+
+    void BuildDeck(const std::vector<std::string>& frontKeys);
+    void ShuffleDeck();
+
+    [[nodiscard]] const std::vector<CardData>& GetCards() const { return m_cards; }
+
+private:
+    std::vector<CardData> m_cards;
+    std::mt19937 m_rng;
+};
+
+#endif //MEMORYSDL_CARDDECK_H
\ No newline at end of file
diff --git a/include/scenes/GameScene.h b/include/scenes/GameScene.h
index 55188af..c1dccab 100644
--- a/include/scenes/GameScene.h
+++ b/include/scenes/GameScene.h
@@ -1,7 +1,11 @@
 #ifndef MEMORYSDL_GAMESCENE_H
 #define MEMORYSDL_GAMESCENE_H
+#include "game/CardDeck.h"
 #include "scenes/Scene.h"
 #include "scenes/SceneManager.h"
+#include "ui/GridLayout.h"
+
+#include <memory>
 
 constexpr auto MAX_ATTEMPTS = 5;
 
@@ -37,7 +41,11 @@ class GameScene : public Scene
     Uint64 m_resolveCardsAtMs;
     static constexpr Uint64 m_revealDelayMs = 800;
 
+    std::unique_ptr<CardDeck> m_deck;
+    std::vector<Card> m_cards;
+
     // UI
+    std::unique_ptr<GridLayout> m_grid;
     std::vector<SDL_FRect> m_uiHeartRects; // TODO: refactor to UIElement
 };
 
diff --git a/include/ui/Card.h b/include/ui/Card.h
deleted file mode 100644
index b338c8a..0000000
--- a/include/ui/Card.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <string>
-
-enum class CardState { FaceDown, FaceUp, Matched };
-
-struct Card
-{
-	int uniqueId = -1;
-	int pairId = -1;
-	CardState state = CardState::FaceDown;
-	std::string frontKey;
-	float rotation = 0.f;
-};
\ No newline at end of file
diff --git a/include/ui/GridLayout.h b/include/ui/GridLayout.h
index fc8623d..95aab29 100644
--- a/include/ui/GridLayout.h
+++ b/include/ui/GridLayout.h
@@ -1,31 +1,24 @@
 #pragma once
 
-#include "ui/Card.h"
-
 #include <SDL3/SDL_rect.h>
 
-#include <map>
-#include <random>
 #include <string>
 #include <vector>
 
-
 class GridLayout
 {
 public:
 	GridLayout(int rows, int columns);
-	~GridLayout();
+	~GridLayout() = default;
 
 	void InitGrid(int width, int height, int texWidth, int texHeight);
+
 	[[nodiscard]] size_t GetSize() const { return m_grid.size(); }
-	void BuildDeck(const std::vector<std::string>& frontKeys);
-	void ShuffleDeck();
-	void ResetCardStates();
+	[[nodiscard]] const std::vector<SDL_FRect>& GetRects() const { return m_grid; }
 
-	std::map<int, SDL_FRect> m_grid;
-	std::vector<Card> m_cards;
 private:
-	std::mt19937 m_rng;
+	std::vector<SDL_FRect> m_grid;
+
 	int m_rows = -1;
 	int m_columns = -1;
-};
\ No newline at end of file
+};
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 5e4a48b..d97545b 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -1,7 +1,6 @@
 //#include "pch.h"
 #include "core/Game.h"
 
-#include "ui/GridLayout.h"
 #include "scenes/SceneManager.h"
 #include "scenes/StartScene.h"
 #include "systems/AssetManager.h"
@@ -21,7 +20,7 @@ constexpr auto TEX_HEIGHT = 32 * 3;
 
 Game::Game(SDL_Window* window, SDL_Renderer* renderer, const int width, const int height)
     : m_window(window), m_renderer(renderer),
-      m_windowWidth(width), m_windowHeight(height), m_gameContext(nullptr, nullptr, nullptr, nullptr, 0, 0, 0, 0)
+      m_windowWidth(width), m_windowHeight(height), m_gameContext(nullptr, nullptr, /*nullptr,*/ nullptr, 0, 0, 0, 0)
 {
 }
 
@@ -32,18 +31,15 @@ Game::~Game()
 
 int Game::Init()
 {
-    const std::vector<std::string> frontCards = { "Card_Skull", "Card_Coffin", "Card_Candle", "Card_Dagger", "Card_Bat", "Card_Door" };
-    
+    const std::vector<std::string> frontCards
+    { "Card_Skull", "Card_Coffin", "Card_Candle", "Card_Dagger", "Card_Bat", "Card_Door" };
+
     m_assetManager = std::make_unique<AssetManager>(m_renderer);
     m_assetManager->LoadTexture("Card_Back");
-    
-    // TESTING:
-    constexpr int numOfCards = 6; // set to number of cards that will be rendered
-    std::vector<std::string> testingCards{};
-    for (int i{}; i < numOfCards; ++i)
+
+    for (const auto& tex : frontCards)
     {
-        m_assetManager->LoadTexture(frontCards[i]);
-        testingCards.push_back(frontCards[i]);
+        m_assetManager->LoadTexture(tex);
     }
     const std::vector<std::string> uiTextures = { "UI_PlayButton", "UI_QuitButton", "UI_Heart"};
     for (const auto& tex : uiTextures)
@@ -51,17 +47,11 @@ int Game::Init()
         m_assetManager->LoadTexture(tex);
     }
 
-    m_grid = std::make_unique<GridLayout>(numOfCards/2, 4);
-    m_grid->BuildDeck(testingCards);
-    m_grid->ShuffleDeck();
-    m_grid->InitGrid(m_windowWidth, m_windowHeight, TEX_WIDTH, TEX_HEIGHT);
-
     m_soundSystem = std::make_unique<SoundSystem>();
     m_soundSystem->Init();
 
     m_gameContext.renderer = m_renderer;
     m_gameContext.assetManager = m_assetManager.get();
-    m_gameContext.grid = m_grid.get();
     m_gameContext.soundSystem = m_soundSystem.get();
     m_gameContext.windowWidth = m_windowWidth;
     m_gameContext.windowHeight = m_windowHeight;
@@ -107,7 +97,7 @@ int Game::Update() const
 void Game::Resize()
 {
     SDL_GetWindowSizeInPixels(m_window, &m_windowWidth, &m_windowHeight);
-    m_grid->InitGrid(m_windowWidth, m_windowHeight, TEX_WIDTH, TEX_HEIGHT);
+    //m_grid->InitGrid(m_windowWidth, m_windowHeight, TEX_WIDTH, TEX_HEIGHT);
 }
 
 void Game::HandleEvent(const SDL_Event &event) const
diff --git a/src/game/Card.cpp b/src/game/Card.cpp
new file mode 100644
index 0000000..9715930
--- /dev/null
+++ b/src/game/Card.cpp
@@ -0,0 +1,32 @@
+#include "game/Card.h"
+
+void Card::Render(SDL_Renderer *renderer) const
+{
+    SDL_Texture* tex;
+    if (m_state == CardState::FaceUp || m_state == CardState::Matched)
+        tex = m_front;
+    else
+        tex = m_back;
+
+    SDL_RenderTexture(renderer, tex, nullptr, &m_rect);
+}
+
+bool Card::TryFlip()
+{
+    if (m_state != CardState::FaceDown)
+        return false;
+
+    m_state = CardState::FaceUp;
+    return true;
+}
+
+void Card::SetMatched()
+{
+    m_state = CardState::Matched;
+}
+
+void Card::FlipDown()
+{
+    if (m_state == CardState::FaceUp)
+        m_state = CardState::FaceDown;
+}
diff --git a/src/game/CardDeck.cpp b/src/game/CardDeck.cpp
new file mode 100644
index 0000000..aa45c88
--- /dev/null
+++ b/src/game/CardDeck.cpp
@@ -0,0 +1,24 @@
+#include "game/CardDeck.h"
+
+#include <algorithm>
+
+// Creates a List of shuffled cards
+void CardDeck::BuildDeck(const std::vector<std::string> &frontKeys)
+{
+    m_cards.clear();
+    m_cards.reserve(frontKeys.size() * 2);
+
+    int pairId = 0;
+    int uniqueId = 0;
+    for (const auto& key : frontKeys)
+    {
+        m_cards.push_back({uniqueId++, pairId, key, 0.0f});
+        m_cards.push_back({uniqueId++, pairId, key, 0.0f});
+        ++pairId;
+    }
+}
+
+void CardDeck::ShuffleDeck()
+{
+    std::ranges::shuffle(m_cards.begin(), m_cards.end(), m_rng);
+}
diff --git a/src/scenes/EndScene.cpp b/src/scenes/EndScene.cpp
index 84f13b7..5574835 100644
--- a/src/scenes/EndScene.cpp
+++ b/src/scenes/EndScene.cpp
@@ -19,8 +19,6 @@ void EndScene::InitUI()
         tmpButton,
         play,
         [this]() {
-            m_context.grid->ShuffleDeck();
-            m_context.grid->ResetCardStates();
             m_sceneManager.RequestSceneChange(
                 std::make_unique<GameScene>(m_sceneManager, m_context));
         }
diff --git a/src/scenes/GameScene.cpp b/src/scenes/GameScene.cpp
index 79f3cf2..47fafd2 100644
--- a/src/scenes/GameScene.cpp
+++ b/src/scenes/GameScene.cpp
@@ -1,12 +1,44 @@
 #include "scenes/GameScene.h"
 
-#include "ui/Card.h"
+#include "game/Card.h"
 #include "scenes/EndScene.h"
+#include "SDL3/SDL_log.h"
 
 #include "SDL3/SDL_timer.h"
 
 void GameScene::Init()
 {
+    // TODO: frontCards exists in Game.cpp and here.
+    // This has to be refactored. This is only for testing now
+    // As long as fronCards is the same in both files, it is ensured which cards are to be loaded
+    const std::vector<std::string> frontCards
+    { "Card_Skull", "Card_Coffin", "Card_Candle", "Card_Dagger", "Card_Bat", "Card_Door" };
+
+    constexpr int numOfCards = 6; // set to number of cards that will be rendered
+    std::vector<std::string> testingCards{};
+    for (int i{}; i < numOfCards; ++i)
+    {
+        testingCards.push_back(frontCards[i]);
+    }
+
+    m_grid = std::make_unique<GridLayout>(numOfCards/2, 4);
+    m_grid->InitGrid(m_context.windowWidth, m_context.windowHeight, m_context.texWidth, m_context.texHeight);
+
+    m_deck = std::make_unique<CardDeck>();
+    m_deck->BuildDeck(testingCards);
+    m_deck->ShuffleDeck();
+
+    auto& cards = m_deck->GetCards();
+    auto& rects = m_grid->GetRects();
+
+    SDL_Texture* back = m_context.assetManager->GetTexture("Card_Back");
+    m_cards.reserve(cards.size());
+    for (size_t i = 0; i <cards.size(); ++i)
+    {
+        SDL_Texture* front = m_context.assetManager->GetTexture(cards.at(i).frontKey);
+        m_cards.emplace_back(cards.at(i), rects.at(i), front, back);
+    }
+
     constexpr auto size = static_cast<size_t>(MAX_ATTEMPTS);
     m_uiHeartRects.resize(size);
     for (size_t i = 0; i < size; ++i)
@@ -30,28 +62,27 @@ void GameScene::HandleEvent(const SDL_Event &event)
 
         const SDL_FPoint p = { event.button.x,event.button.y };
 
-        const int size = static_cast<int>(m_context.grid->GetSize());
+        const int size = static_cast<int>(m_cards.size());
         for (int i = 0; i < size; ++i)
         {
-            Card& card = m_context.grid->m_cards.at(i);
+            Card& card = m_cards.at(i);
 
             // Only HitTest Cards that are face down
-            if (card.state != CardState::FaceDown)
+            if (card.IsFaceUp())
                 continue;
 
-            // Check if Grid was hit
-            const auto& [gx, gy, gw, gh] = m_context.grid->m_grid.at(i);
-            SDL_FRect rc{ gx, gy, gw, gh};
+            SDL_FRect rc = card.GetRect();
             if (!SDL_PointInRectFloat(&p, &rc))
                 continue;
-
+            // SDL_Log("Card clicked-> pos: %d, tex: %s", i, card.GetTexName()); // NOTE: testing
             // Do nothing if the same Card is clicked repeatedly
             if (m_cardsSelected == CardSelected::OneCard && m_firstCardIdx == i)
                 return;
 
             m_context.soundSystem->PlaySfxSound(SoundSystem::SoundId::CardFlip);
 
-            card.state = CardState::FaceUp;
+            if (!card.TryFlip())
+                continue;
 
             // Current Card is the first Card that was clicked
             if (m_cardsSelected == CardSelected::NoCard)
@@ -84,19 +115,19 @@ void GameScene::Update(float dt)
         case CardSelected::TwoCards:
             if (SDL_GetTicks() >= m_resolveCardsAtMs)
             {
-                Card& a = m_context.grid->m_cards.at(m_firstCardIdx);
-                Card& b = m_context.grid->m_cards.at(m_secondCardIdx);
+                auto& a = m_cards[m_firstCardIdx];
+                auto& b = m_cards[m_secondCardIdx];
 
-                if (a.pairId == b.pairId)
+                if (a.GetPairId() == b.GetPairId())
                 {
-                    a.state = CardState::Matched;
-                    b.state = CardState::Matched;
+                    a.SetMatched();
+                    b.SetMatched();
                     m_numOfCardsMatched += 2;
                 }
                 else
                 {
-                    a.state = CardState::FaceDown;
-                    b.state = CardState::FaceDown;
+                    a.FlipDown();
+                    b.FlipDown();
                     m_attempts--;
                 }
 
@@ -104,7 +135,7 @@ void GameScene::Update(float dt)
                 m_secondCardIdx = -1;
                 m_cardsSelected = CardSelected::NoCard;
 
-                if (m_numOfCardsMatched == m_context.grid->GetSize())
+                if (m_numOfCardsMatched == m_grid->GetSize())
                 {
                     m_sceneManager.RequestSceneChange(std::make_unique<EndScene>(m_sceneManager, m_context));
                 }
@@ -118,21 +149,9 @@ void GameScene::Render(SDL_Renderer *renderer)
     SDL_SetRenderDrawColor(m_context.renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
     SDL_RenderClear(m_context.renderer);
 
-    // Iterate over GridLayout and render
-    SDL_Texture* cardBack = m_context.assetManager->GetTexture("Card_Back");
-    SDL_Texture* cardRender{};
-    const int size = static_cast<int>(m_context.grid->GetSize());
-    for (int i = 0; i < size; ++i)
+    for (auto& card : m_cards)
     {
-        auto& card = m_context.grid->m_cards.at(i);
-        auto& rect = m_context.grid->m_grid.at(i);
-
-        if (card.state != CardState::FaceDown)
-            cardRender = m_context.assetManager->GetTexture(card.frontKey);
-        else
-            cardRender = cardBack;
-
-        SDL_RenderTexture(m_context.renderer, cardRender, nullptr, &rect);
+        card.Render(m_context.renderer);
     }
 
     // Render Attempts
diff --git a/src/scenes/SceneManager.cpp b/src/scenes/SceneManager.cpp
index 9c9adde..340868a 100644
--- a/src/scenes/SceneManager.cpp
+++ b/src/scenes/SceneManager.cpp
@@ -25,6 +25,7 @@ void SceneManager::Update(const float dt)
 
         m_currentScene = std::move(m_nextScene);
         m_currentScene->OnEnter();
+        // TODO: return here? does this immediately run the update() of the nextScene beforce currentScene update() returns?
     }
     if (m_currentScene)
         m_currentScene->Update(dt);
diff --git a/src/ui/GridLayout.cpp b/src/ui/GridLayout.cpp
index 8e8eedf..1789692 100644
--- a/src/ui/GridLayout.cpp
+++ b/src/ui/GridLayout.cpp
@@ -1,23 +1,15 @@
 //#include "pch.h"
 #include "ui/GridLayout.h"
 
-#include "ui/Card.h"
-
 #include <SDL3/SDL_rect.h>
 
-#include <algorithm>
-#include <random>
-#include <string>
 #include <vector>
 
 GridLayout::GridLayout(const int rows, const int columns)
-    : m_rng(std::random_device{}()), m_rows(rows), m_columns(columns)
+    : m_rows(rows), m_columns(columns)
 {
 }
 
-GridLayout::~GridLayout()
-= default;
-
 void GridLayout::InitGrid(const int width, const int height, const int texWidth, const int texHeight)
 {
     constexpr float margin = 5.f;
@@ -34,43 +26,13 @@ void GridLayout::InitGrid(const int width, const int height, const int texWidth,
         const int row = i / m_columns;
         const int col = i % m_columns;
 
-        m_grid.insert(
-            { m_cards.at(i).uniqueId, SDL_FRect{
-            startX + static_cast<float>(col) * (static_cast<float>(texWidth) + margin),
-            startY + static_cast<float>(row) * (static_cast<float>(texHeight) + margin),
-            static_cast<float>(texWidth), static_cast<float>(texHeight)
-            } }
+        m_grid.push_back(
+            SDL_FRect
+            {
+                startX + static_cast<float>(col) * (static_cast<float>(texWidth) + margin),
+                startY + static_cast<float>(row) * (static_cast<float>(texHeight) + margin),
+                static_cast<float>(texWidth), static_cast<float>(texHeight)
+            }
         );
     }
-}
-
-// Creates a List of shuffled cards
-void GridLayout::BuildDeck(const std::vector<std::string>& frontKeys)
-{
-    m_cards.clear();
-    m_cards.reserve(frontKeys.size() * 2);
-
-    int pairId = 0;
-    int uniqueId = 0;
-    for (const auto& key : frontKeys)
-    {
-        Card a; a.uniqueId = uniqueId++; a.pairId = pairId; a.frontKey = key;
-        Card b; b.uniqueId = uniqueId++; b.pairId = pairId; b.frontKey = key;
-        m_cards.push_back(a);
-        m_cards.push_back(b);
-        ++pairId;
-    }
-}
-
-void GridLayout::ShuffleDeck()
-{
-    std::ranges::shuffle(m_cards.begin(), m_cards.end(), m_rng);
-}
-
-void GridLayout::ResetCardStates()
-{
-    for (auto& card : m_cards)
-    {
-        card.state = CardState::FaceDown;
-    }
-}
+}
\ No newline at end of file

From e5c504c4fbfec5c19860c011bb933392cbdf03ad Mon Sep 17 00:00:00 2001
From: Anders Fritz Fischer <Anders.Fischer1@googlemail.com>
Date: Sat, 14 Mar 2026 17:29:26 +0100
Subject: [PATCH 04/10] Only build on push to main - new version

---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ff0cb2..2eb96fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,10 +1,8 @@
 name: CMake Build
 
 on:
-  push:
-    branches: [ develop ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main ]
 
 permissions:
   contents: read

From 3b76e91cba0e96de83b508a94c27c142544533e7 Mon Sep 17 00:00:00 2001
From: Fritzn <Anders.Fischer1@googlemail.com>
Date: Tue, 17 Mar 2026 10:11:34 +0100
Subject: [PATCH 05/10] Refactor Rendering attempts into UI Classes (#30)

---
 include/scenes/GameScene.h |  5 ++++-
 include/ui/UIAttempts.h    | 31 +++++++++++++++++++++++++++++++
 include/ui/UIElement.h     |  4 ++--
 include/ui/UIImage.h       | 21 +++++++++++++++++++++
 src/scenes/GameScene.cpp   | 27 +++++++++------------------
 src/ui/UIAttempts.cpp      | 29 +++++++++++++++++++++++++++++
 src/ui/UIImage.cpp         | 12 ++++++++++++
 7 files changed, 108 insertions(+), 21 deletions(-)
 create mode 100644 include/ui/UIAttempts.h
 create mode 100644 include/ui/UIImage.h
 create mode 100644 src/ui/UIAttempts.cpp
 create mode 100644 src/ui/UIImage.cpp

diff --git a/include/scenes/GameScene.h b/include/scenes/GameScene.h
index c1dccab..af4ea52 100644
--- a/include/scenes/GameScene.h
+++ b/include/scenes/GameScene.h
@@ -7,6 +7,9 @@
 
 #include <memory>
 
+#include "ui/UIAttempts.h"
+#include "ui/UIElement.h"
+
 constexpr auto MAX_ATTEMPTS = 5;
 
 class GameScene : public Scene
@@ -46,7 +49,7 @@ class GameScene : public Scene
 
     // UI
     std::unique_ptr<GridLayout> m_grid;
-    std::vector<SDL_FRect> m_uiHeartRects; // TODO: refactor to UIElement
+    std::unique_ptr<UIAttempts> m_uiAttempts;
 };
 
 #endif //MEMORYSDL_GAMESCENE_H
\ No newline at end of file
diff --git a/include/ui/UIAttempts.h b/include/ui/UIAttempts.h
new file mode 100644
index 0000000..15423cf
--- /dev/null
+++ b/include/ui/UIAttempts.h
@@ -0,0 +1,31 @@
+#ifndef MEMORYSDL_UIATTEMPTS_H
+#define MEMORYSDL_UIATTEMPTS_H
+#include "ui/UIImage.h"
+#include "core/GameContext.h"
+
+#include <vector>
+
+
+class UIAttempts
+{
+public:
+    UIAttempts(GameContext& context, SDL_Texture* texture, const int maxAttempts)
+        : m_context(context), m_texture(texture), m_maxAttempts(maxAttempts), m_attempts(maxAttempts)
+    {
+        Init();
+    }
+
+    void Init();
+    void SetAttempts(const int attempts) { m_attempts = attempts; }
+
+    void Render(SDL_Renderer* renderer);
+
+private:
+    GameContext& m_context;
+    SDL_Texture* m_texture;
+    std::vector<UIImage> m_images {};
+    int m_maxAttempts;
+    int m_attempts;
+};
+
+#endif //MEMORYSDL_UIATTEMPTS_H
\ No newline at end of file
diff --git a/include/ui/UIElement.h b/include/ui/UIElement.h
index db3a5ce..d64de62 100644
--- a/include/ui/UIElement.h
+++ b/include/ui/UIElement.h
@@ -8,8 +8,8 @@ class UIElement
 public:
     virtual ~UIElement() = default;
 
-    virtual void HandleEvent(const SDL_Event& event) = 0;
-    virtual void Update() {};
+    virtual void HandleEvent(const SDL_Event& event) {}
+    virtual void Update() {}
     virtual void Render(SDL_Renderer* renderer) = 0;
 };
 
diff --git a/include/ui/UIImage.h b/include/ui/UIImage.h
new file mode 100644
index 0000000..2377599
--- /dev/null
+++ b/include/ui/UIImage.h
@@ -0,0 +1,21 @@
+#ifndef MEMORYSDL_IMAGE_H
+#define MEMORYSDL_IMAGE_H
+#include "UIElement.h"
+
+class UIImage : public UIElement
+{
+public:
+    UIImage(SDL_Texture* texture, const SDL_FRect rect)
+        : m_texture(texture), m_rect(rect)
+    {}
+
+    void SetScale(float scale);
+
+    void Render(SDL_Renderer* renderer) override;
+
+private:
+    SDL_Texture* m_texture;
+    SDL_FRect m_rect{};
+};
+
+#endif //MEMORYSDL_IMAGE_H
\ No newline at end of file
diff --git a/src/scenes/GameScene.cpp b/src/scenes/GameScene.cpp
index 47fafd2..878afbc 100644
--- a/src/scenes/GameScene.cpp
+++ b/src/scenes/GameScene.cpp
@@ -2,8 +2,8 @@
 
 #include "game/Card.h"
 #include "scenes/EndScene.h"
-#include "SDL3/SDL_log.h"
 
+#include "SDL3/SDL_log.h"
 #include "SDL3/SDL_timer.h"
 
 void GameScene::Init()
@@ -39,17 +39,8 @@ void GameScene::Init()
         m_cards.emplace_back(cards.at(i), rects.at(i), front, back);
     }
 
-    constexpr auto size = static_cast<size_t>(MAX_ATTEMPTS);
-    m_uiHeartRects.resize(size);
-    for (size_t i = 0; i < size; ++i)
-    {
-        m_uiHeartRects[i].x = (static_cast<float>(m_context.windowWidth) * 0.5f + static_cast<float>(
-                                   m_context.texWidth * i) - static_cast<float>(m_context.texWidth * m_attempts) /
-                               2);
-        m_uiHeartRects[i].y = static_cast<float>(m_context.windowHeight) * 0.001f;
-        m_uiHeartRects[i].w = static_cast<float>(m_context.texWidth);
-        m_uiHeartRects[i].h = static_cast<float>(m_context.texHeight);
-    }
+    SDL_Texture* heart = m_context.assetManager->GetTexture("UI_Heart");
+    m_uiAttempts = std::make_unique<UIAttempts>(m_context, heart, MAX_ATTEMPTS);
 }
 
 void GameScene::HandleEvent(const SDL_Event &event)
@@ -129,6 +120,8 @@ void GameScene::Update(float dt)
                     a.FlipDown();
                     b.FlipDown();
                     m_attempts--;
+                    // TODO: GameScene and UIAttempts have to have a synced number of attempts. this does not feel good
+                    m_uiAttempts->SetAttempts(m_attempts);
                 }
 
                 m_firstCardIdx = -1;
@@ -149,17 +142,15 @@ void GameScene::Render(SDL_Renderer *renderer)
     SDL_SetRenderDrawColor(m_context.renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
     SDL_RenderClear(m_context.renderer);
 
+    // Game Objects
     for (auto& card : m_cards)
     {
         card.Render(m_context.renderer);
     }
 
-    // Render Attempts
-    const auto tex = m_context.assetManager->GetTexture("UI_Heart");
-    for (int i = 0; i < m_attempts; ++i)
-    {
-        SDL_RenderTexture(m_context.renderer, tex, nullptr, &m_uiHeartRects[i]);
-    }
+    // UI
+    m_uiAttempts->Render(renderer);
+
     // TODO: Render Time
 
     SDL_RenderPresent(m_context.renderer);
diff --git a/src/ui/UIAttempts.cpp b/src/ui/UIAttempts.cpp
new file mode 100644
index 0000000..583ffb2
--- /dev/null
+++ b/src/ui/UIAttempts.cpp
@@ -0,0 +1,29 @@
+#include "ui/UIAttempts.h"
+
+void UIAttempts::Init()
+{
+    const auto size = m_maxAttempts;
+    m_images.reserve(static_cast<size_t>(size));
+    for (int i = 0; i < size; ++i)
+    {
+        const auto middleOfWindow = static_cast<float>(m_context.windowWidth) * 0.5f;
+        const auto offset = static_cast<float>(m_context.texWidth * i);
+        const auto middleOfTexture = static_cast<float>(m_context.texWidth * m_attempts) / 2;
+        constexpr float padding = 0.001f;
+
+        m_images.emplace_back(m_texture, SDL_FRect {
+            (middleOfWindow + offset - middleOfTexture),
+            static_cast<float>(m_context.windowHeight) * padding,
+            static_cast<float>(m_context.texWidth),
+            static_cast<float>(m_context.texHeight)
+        });
+    }
+}
+
+void UIAttempts::Render(SDL_Renderer *renderer)
+{
+    for (int i = 0; i < m_attempts; ++i)
+    {
+        m_images.at(i).Render(renderer);
+    }
+}
diff --git a/src/ui/UIImage.cpp b/src/ui/UIImage.cpp
new file mode 100644
index 0000000..80bfa12
--- /dev/null
+++ b/src/ui/UIImage.cpp
@@ -0,0 +1,12 @@
+#include "ui/UIImage.h"
+
+void UIImage::SetScale(const float scale)
+{
+    m_rect.w *= scale;
+    m_rect.h *= scale;
+}
+
+void UIImage::Render(SDL_Renderer *renderer)
+{
+    SDL_RenderTexture(renderer, m_texture, nullptr, &m_rect);
+}

From 1d2f1ca6b80d534b0de4cf77227fa7e38f65e38e Mon Sep 17 00:00:00 2001
From: Fritzn <Anders.Fischer1@googlemail.com>
Date: Tue, 17 Mar 2026 10:24:40 +0100
Subject: [PATCH 06/10] Add win or lose message in EndScene (#32)

---
 include/scenes/EndScene.h | 6 +++---
 src/scenes/EndScene.cpp   | 6 +++++-
 src/scenes/GameScene.cpp  | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/scenes/EndScene.h b/include/scenes/EndScene.h
index 9aee343..7dceec9 100644
--- a/include/scenes/EndScene.h
+++ b/include/scenes/EndScene.h
@@ -10,8 +10,8 @@
 class EndScene : public Scene
 {
 public:
-    explicit EndScene(SceneManager &manager, GameContext &context)
-        : Scene(context), m_sceneManager(manager)
+    explicit EndScene(SceneManager &manager, GameContext &context, const bool hasPlayerWon)
+        : Scene(context), m_sceneManager(manager), m_hasPlayerWon(hasPlayerWon)
     {
         InitUI();
     }
@@ -23,7 +23,7 @@ class EndScene : public Scene
 
 private:
     SceneManager &m_sceneManager;
-
+    bool m_hasPlayerWon;
     // UI
     std::vector<std::unique_ptr<UIElement>> m_ui;
 };
diff --git a/src/scenes/EndScene.cpp b/src/scenes/EndScene.cpp
index 5574835..c5ee0fa 100644
--- a/src/scenes/EndScene.cpp
+++ b/src/scenes/EndScene.cpp
@@ -66,7 +66,11 @@ void EndScene::Render(SDL_Renderer *renderer)
 
     // Ending title
     SDL_SetRenderScale(m_context.renderer, 5.f, 5.f);
-    const auto text = "GAME ENDED!";
+    auto text = "";
+    if (m_hasPlayerWon)
+        text = "You Won!";
+    else
+        text = "You Lost!";
     const float middle = ((static_cast<float>(m_context.windowWidth) / 2.0f) / 5.f) - (static_cast<float>(SDL_strlen(text)) * 5.f) / 1.25f;
     SDL_RenderDebugText(m_context.renderer, middle, middle, text);
     SDL_SetRenderScale(m_context.renderer, 1.0f, 1.0f);
diff --git a/src/scenes/GameScene.cpp b/src/scenes/GameScene.cpp
index 878afbc..58745bf 100644
--- a/src/scenes/GameScene.cpp
+++ b/src/scenes/GameScene.cpp
@@ -94,7 +94,7 @@ void GameScene::Update(float dt)
 {
     if (m_attempts < 1)
     {
-        m_sceneManager.RequestSceneChange(std::make_unique<EndScene>(m_sceneManager, m_context));
+        m_sceneManager.RequestSceneChange(std::make_unique<EndScene>(m_sceneManager, m_context, false));
         return;
     }
 
@@ -130,7 +130,9 @@ void GameScene::Update(float dt)
 
                 if (m_numOfCardsMatched == m_grid->GetSize())
                 {
-                    m_sceneManager.RequestSceneChange(std::make_unique<EndScene>(m_sceneManager, m_context));
+                    m_sceneManager.RequestSceneChange(
+                        std::make_unique<EndScene>(m_sceneManager, m_context, true)
+                    );
                 }
             }
         default: ;

From cb05b543034c0e7db1df923183e169c25c5c718e Mon Sep 17 00:00:00 2001
From: Anders Fritz Fischer <Anders.Fischer1@googlemail.com>
Date: Tue, 17 Mar 2026 11:28:17 +0100
Subject: [PATCH 07/10] Remove include guards auto generated from CLion

---
 include/core/GameContext.h     |  7 ++-----
 include/game/CardData.h        |  7 ++-----
 include/game/CardDeck.h        |  8 ++------
 include/scenes/EndScene.h      |  7 ++-----
 include/scenes/GameScene.h     |  7 ++-----
 include/scenes/Scene.h         |  7 ++-----
 include/scenes/SceneManager.h  |  7 ++-----
 include/scenes/StartScene.h    |  7 ++-----
 include/systems/AssetManager.h | 14 --------------
 include/ui/Button.h            |  7 ++-----
 include/ui/UIAttempts.h        |  7 ++-----
 include/ui/UIElement.h         |  7 ++-----
 include/ui/UIImage.h           |  7 ++-----
 13 files changed, 24 insertions(+), 75 deletions(-)

diff --git a/include/core/GameContext.h b/include/core/GameContext.h
index 514c0d4..096de28 100644
--- a/include/core/GameContext.h
+++ b/include/core/GameContext.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_GAMECONTEXT_H
-#define MEMORYSDL_GAMECONTEXT_H
+#pragma once
 #include "systems/AssetManager.h"
 #include "systems/SoundSystem.h"
 
@@ -22,6 +21,4 @@ struct GameContext
           windowHeight(wHeight), texWidth(tw),
           texHeight(th)
     {}
-};
-
-#endif //MEMORYSDL_GAMECONTEXT_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/game/CardData.h b/include/game/CardData.h
index 54878f0..cf9c4b3 100644
--- a/include/game/CardData.h
+++ b/include/game/CardData.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_CARDDATA_H
-#define MEMORYSDL_CARDDATA_H
+#pragma once
 #include <string>
 
 struct CardData
@@ -8,6 +7,4 @@ struct CardData
     int pairId = -1;
     std::string frontKey;
     float rotation = 0.f;
-};
-
-#endif //MEMORYSDL_CARDDATA_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/game/CardDeck.h b/include/game/CardDeck.h
index b23e6c5..b4473e1 100644
--- a/include/game/CardDeck.h
+++ b/include/game/CardDeck.h
@@ -1,6 +1,4 @@
-#ifndef MEMORYSDL_CARDDECK_H
-#define MEMORYSDL_CARDDECK_H
-
+#pragma once
 #include "game/Card.h"
 
 #include <random>
@@ -21,6 +19,4 @@ class CardDeck
 private:
     std::vector<CardData> m_cards;
     std::mt19937 m_rng;
-};
-
-#endif //MEMORYSDL_CARDDECK_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/scenes/EndScene.h b/include/scenes/EndScene.h
index 7dceec9..6b45050 100644
--- a/include/scenes/EndScene.h
+++ b/include/scenes/EndScene.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_ENDSCENE_H
-#define MEMORYSDL_ENDSCENE_H
+#pragma once
 #include "scenes/Scene.h"
 
 #include "ui/UIElement.h"
@@ -26,6 +25,4 @@ class EndScene : public Scene
     bool m_hasPlayerWon;
     // UI
     std::vector<std::unique_ptr<UIElement>> m_ui;
-};
-
-#endif //MEMORYSDL_ENDSCENE_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/scenes/GameScene.h b/include/scenes/GameScene.h
index af4ea52..6a6b760 100644
--- a/include/scenes/GameScene.h
+++ b/include/scenes/GameScene.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_GAMESCENE_H
-#define MEMORYSDL_GAMESCENE_H
+#pragma once
 #include "game/CardDeck.h"
 #include "scenes/Scene.h"
 #include "scenes/SceneManager.h"
@@ -50,6 +49,4 @@ class GameScene : public Scene
     // UI
     std::unique_ptr<GridLayout> m_grid;
     std::unique_ptr<UIAttempts> m_uiAttempts;
-};
-
-#endif //MEMORYSDL_GAMESCENE_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/scenes/Scene.h b/include/scenes/Scene.h
index 0ca2cb4..9086eab 100644
--- a/include/scenes/Scene.h
+++ b/include/scenes/Scene.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_SCENE_H
-#define MEMORYSDL_SCENE_H
+#pragma once
 #include "core/GameContext.h"
 
 #include "SDL3/SDL_render.h"
@@ -21,6 +20,4 @@ class Scene
 
 protected:
     GameContext& m_context;
-};
-
-#endif //MEMORYSDL_SCENE_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/scenes/SceneManager.h b/include/scenes/SceneManager.h
index 6054ed0..79a1cf3 100644
--- a/include/scenes/SceneManager.h
+++ b/include/scenes/SceneManager.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_SCENEMANAGER_H
-#define MEMORYSDL_SCENEMANAGER_H
+#pragma once
 #include "scenes/Scene.h"
 
 #include <memory>
@@ -22,6 +21,4 @@ class SceneManager
     std::unique_ptr<Scene> m_nextScene;
 
     bool m_quitRequested = false;
-};
-
-#endif //MEMORYSDL_SCENEMANAGER_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/scenes/StartScene.h b/include/scenes/StartScene.h
index 9254f20..2d20364 100644
--- a/include/scenes/StartScene.h
+++ b/include/scenes/StartScene.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_STARTSCENE_H
-#define MEMORYSDL_STARTSCENE_H
+#pragma once
 #include "scenes/Scene.h"
 
 #include "ui/Button.h"
@@ -28,6 +27,4 @@ class StartScene : public Scene
 
     // UI
     std::vector<std::unique_ptr<UIElement>> m_ui;
-};
-
-#endif //MEMORYSDL_STARTSCENE_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/systems/AssetManager.h b/include/systems/AssetManager.h
index 59f2d1d..f4ef0a7 100644
--- a/include/systems/AssetManager.h
+++ b/include/systems/AssetManager.h
@@ -7,20 +7,6 @@
 
 class AssetManager
 {
-	//enum class TextureID
-	//{
-	//	UI_Heart,
-	//	UI_PlayButton,
-	//	UI_QuitButton,
-	//	Card_Back,
-	//	Card_Bat,
-	//	Card_Candle,
-	//	Card_Coffin,
-	//	Card_Dagger,
-	//	Card_Door,
-	//	Card_Skull
-	//};
-
 public:
 	explicit AssetManager(SDL_Renderer* renderer);
 	~AssetManager();
diff --git a/include/ui/Button.h b/include/ui/Button.h
index 97ac6c8..89f360d 100644
--- a/include/ui/Button.h
+++ b/include/ui/Button.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_BUTTON_H
-#define MEMORYSDL_BUTTON_H
+#pragma once
 #include "UIElement.h"
 
 #include <functional>
@@ -19,6 +18,4 @@ class Button : public UIElement
     SDL_FRect m_rect;
     SDL_Texture* m_texture;
     std::function<void()> m_onClick;
-};
-
-#endif //MEMORYSDL_BUTTON_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/ui/UIAttempts.h b/include/ui/UIAttempts.h
index 15423cf..bb7171c 100644
--- a/include/ui/UIAttempts.h
+++ b/include/ui/UIAttempts.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_UIATTEMPTS_H
-#define MEMORYSDL_UIATTEMPTS_H
+#pragma once
 #include "ui/UIImage.h"
 #include "core/GameContext.h"
 
@@ -26,6 +25,4 @@ class UIAttempts
     std::vector<UIImage> m_images {};
     int m_maxAttempts;
     int m_attempts;
-};
-
-#endif //MEMORYSDL_UIATTEMPTS_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/ui/UIElement.h b/include/ui/UIElement.h
index d64de62..0b3f098 100644
--- a/include/ui/UIElement.h
+++ b/include/ui/UIElement.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_UIELEMENT_H
-#define MEMORYSDL_UIELEMENT_H
+#pragma once
 #include "SDL3/SDL_events.h"
 #include "SDL3/SDL_render.h"
 
@@ -11,6 +10,4 @@ class UIElement
     virtual void HandleEvent(const SDL_Event& event) {}
     virtual void Update() {}
     virtual void Render(SDL_Renderer* renderer) = 0;
-};
-
-#endif //MEMORYSDL_UIELEMENT_H
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/include/ui/UIImage.h b/include/ui/UIImage.h
index 2377599..00c66de 100644
--- a/include/ui/UIImage.h
+++ b/include/ui/UIImage.h
@@ -1,5 +1,4 @@
-#ifndef MEMORYSDL_IMAGE_H
-#define MEMORYSDL_IMAGE_H
+#pragma once
 #include "UIElement.h"
 
 class UIImage : public UIElement
@@ -16,6 +15,4 @@ class UIImage : public UIElement
 private:
     SDL_Texture* m_texture;
     SDL_FRect m_rect{};
-};
-
-#endif //MEMORYSDL_IMAGE_H
\ No newline at end of file
+};
\ No newline at end of file

From bd11f1983773fd8a7bfbd6a5c454dbc01a3b5a47 Mon Sep 17 00:00:00 2001
From: Anders Fritz Fischer <Anders.Fischer1@googlemail.com>
Date: Tue, 17 Mar 2026 11:32:48 +0100
Subject: [PATCH 08/10] Change AppMetadata

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c27a576..84d5562 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,8 +16,8 @@
 #include <memory>
 
 // Use this renderer to draw into this window every frame.
-static SDL_Window* g_window = NULL;
-static SDL_Renderer* g_renderer = NULL;
+static SDL_Window* g_window = nullptr;
+static SDL_Renderer* g_renderer = nullptr;
 
 constexpr auto WINDOW_WIDTH = 640;
 constexpr auto WINDOW_HEIGHT = 480;
@@ -28,7 +28,7 @@ std::unique_ptr<Game> g_game = nullptr;
 // This function runs once at startup.
 SDL_AppResult SDL_AppInit(void** appstate, int argc, char* argv[])
 {
-    SDL_SetAppMetadata("Spooky Memory", GAME_VERSION, "com.example.spookymemory");
+    SDL_SetAppMetadata("MemorySDL", GAME_VERSION, "com.example.MemorySDL");
 
 
     if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) 

From 52c8b3a3cb142343e61810ba7c069cab82f28230 Mon Sep 17 00:00:00 2001
From: Anders Fritz Fischer <Anders.Fischer1@googlemail.com>
Date: Tue, 17 Mar 2026 11:46:51 +0100
Subject: [PATCH 09/10] Update README

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0869c7c..aaad22d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,14 @@
 # Memory in SDL3
-
 ![Screenshot of the game](in_game.png)
 
-This is a simple Memory game with creepy themes.
+This is a simple Memory game with scary themes, developed with Simple DirectMedia Layer (SDL3).
+
+I am building this project to improve my system design and architecture skills. 
 
-It is developed with Simple DirectMedia Layer (SDL3).
+And also for the fun of it, of course.
 
+I deliberately avoided game engines for this project, allowing me implement everything that I want myself. 
+***
 All used assets are made by me.
 
 ## Playing the game

From 889b90de2cdd4f413fbc91cec757fc950510bc76 Mon Sep 17 00:00:00 2001
From: Anders Fritz Fischer <Anders.Fischer1@googlemail.com>
Date: Tue, 17 Mar 2026 11:48:41 +0100
Subject: [PATCH 10/10] Update Game Version

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 84d5562..5e27121 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,7 @@ static SDL_Renderer* g_renderer = nullptr;
 constexpr auto WINDOW_WIDTH = 640;
 constexpr auto WINDOW_HEIGHT = 480;
 
-constexpr auto GAME_VERSION = "0.3";
+constexpr auto GAME_VERSION = "0.4";
 std::unique_ptr<Game> g_game = nullptr;
 
 // This function runs once at startup.