From 5a95e96bd4215640f4480e3c631e784b146a8c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9au?= <theau.baton@etu.univ-amu.fr>
Date: Sat, 7 Dec 2024 16:36:45 +0100
Subject: [PATCH] Move FrameBufferMerger
---
source/engine/graphics/front/engine/Engine.hpp | 2 +-
.../front/{module => engine}/FrameBufferMerger.cpp | 0
.../front/{module => engine}/FrameBufferMerger.hpp | 8 ++------
3 files changed, 3 insertions(+), 7 deletions(-)
rename source/engine/graphics/front/{module => engine}/FrameBufferMerger.cpp (100%)
rename source/engine/graphics/front/{module => engine}/FrameBufferMerger.hpp (77%)
diff --git a/source/engine/graphics/front/engine/Engine.hpp b/source/engine/graphics/front/engine/Engine.hpp
index 84e6e3e..0a1a427 100644
--- a/source/engine/graphics/front/engine/Engine.hpp
+++ b/source/engine/graphics/front/engine/Engine.hpp
@@ -3,10 +3,10 @@
#include <map>
#include <optional>
-#include <engine/graphics/front/module/FrameBufferMerger.hpp>
#include <engine/graphics/back/cameras/View.hpp>
#include "Layer.hpp"
+#include "FrameBufferMerger.hpp"
namespace megu {
class GraphicEngine {
diff --git a/source/engine/graphics/front/module/FrameBufferMerger.cpp b/source/engine/graphics/front/engine/FrameBufferMerger.cpp
similarity index 100%
rename from source/engine/graphics/front/module/FrameBufferMerger.cpp
rename to source/engine/graphics/front/engine/FrameBufferMerger.cpp
diff --git a/source/engine/graphics/front/module/FrameBufferMerger.hpp b/source/engine/graphics/front/engine/FrameBufferMerger.hpp
similarity index 77%
rename from source/engine/graphics/front/module/FrameBufferMerger.hpp
rename to source/engine/graphics/front/engine/FrameBufferMerger.hpp
index c2caea1..c98ac8d 100644
--- a/source/engine/graphics/front/module/FrameBufferMerger.hpp
+++ b/source/engine/graphics/front/engine/FrameBufferMerger.hpp
@@ -1,15 +1,11 @@
#pragma once
-#include <any>
-
#include <engine/graphics/back/buffers/VertexArray.hpp>
#include <engine/graphics/back/buffers/VerticeBuffer.hpp>
#include <engine/graphics/back/shaders/Program.hpp>
+#include <engine/io/Window.hpp>
-#include <engine/graphics/front/object/Image.hpp>
-#include <engine/graphics/front/engine/Renderer.hpp>
-
-#include "Module.hpp"
+#include "TextureArray.hpp"
namespace megu {
class FrameBufferMerger {
--
GitLab