From 256135a0825a5200338234c8427f9f92953ea9ac Mon Sep 17 00:00:00 2001
From: Almamu <wpengine@alma.mu>
Date: Thu, 11 Sep 2025 21:22:33 +0200
Subject: [PATCH] chore: move render-dependant texture code to render instead
 of assets

---
 CMakeLists.txt                                        | 6 +++---
 src/WallpaperEngine/Application/CApplicationContext.h | 2 +-
 src/WallpaperEngine/Render/CFBO.h                     | 2 +-
 src/WallpaperEngine/{Assets => Render}/CTexture.cpp   | 0
 src/WallpaperEngine/{Assets => Render}/CTexture.h     | 3 ---
 src/WallpaperEngine/Render/CTextureCache.cpp          | 2 +-
 src/WallpaperEngine/Render/CTextureCache.h            | 2 +-
 src/WallpaperEngine/Render/CWallpaperState.cpp        | 2 +-
 src/WallpaperEngine/Render/CWallpaperState.h          | 2 +-
 src/WallpaperEngine/{Assets => Render}/ITexture.h     | 0
 src/WallpaperEngine/Render/Objects/CImage.cpp         | 4 ++--
 src/WallpaperEngine/Render/Objects/CImage.h           | 2 +-
 src/WallpaperEngine/Render/Objects/Effects/CPass.h    | 2 +-
 src/WallpaperEngine/Render/Shaders/CShader.h          | 2 +-
 14 files changed, 14 insertions(+), 17 deletions(-)
 rename src/WallpaperEngine/{Assets => Render}/CTexture.cpp (100%)
 rename src/WallpaperEngine/{Assets => Render}/CTexture.h (97%)
 rename src/WallpaperEngine/{Assets => Render}/ITexture.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1b7755..559ffb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,9 +267,6 @@ add_executable(
     src/WallpaperEngine/Application/CWallpaperApplication.cpp
     src/WallpaperEngine/Application/CWallpaperApplication.h
 
-    src/WallpaperEngine/Assets/ITexture.h
-    src/WallpaperEngine/Assets/CTexture.h
-    src/WallpaperEngine/Assets/CTexture.cpp
     src/WallpaperEngine/Assets/CAssetLoadException.cpp
     src/WallpaperEngine/Assets/CAssetLoadException.h
 
@@ -374,6 +371,9 @@ add_executable(
     src/WallpaperEngine/Render/CCamera.cpp
     src/WallpaperEngine/Render/CObject.h
     src/WallpaperEngine/Render/CObject.cpp
+    src/WallpaperEngine/Render/CTexture.cpp
+    src/WallpaperEngine/Render/CTexture.h
+    src/WallpaperEngine/Render/ITexture.h
 
     src/WallpaperEngine/Render/Objects/CImage.h
     src/WallpaperEngine/Render/Objects/CImage.cpp
diff --git a/src/WallpaperEngine/Application/CApplicationContext.h b/src/WallpaperEngine/Application/CApplicationContext.h
index d67c9fe..0710a38 100644
--- a/src/WallpaperEngine/Application/CApplicationContext.h
+++ b/src/WallpaperEngine/Application/CApplicationContext.h
@@ -9,7 +9,7 @@
 
 #include "CApplicationState.h"
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "../Render/ITexture.h"
 #include "WallpaperEngine/Render/CWallpaperState.h"
 
 #include "WallpaperEngine/Data/Model/Project.h"
diff --git a/src/WallpaperEngine/Render/CFBO.h b/src/WallpaperEngine/Render/CFBO.h
index d8e7165..8463fc9 100644
--- a/src/WallpaperEngine/Render/CFBO.h
+++ b/src/WallpaperEngine/Render/CFBO.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "ITexture.h"
 
 using namespace WallpaperEngine::Assets;
 
diff --git a/src/WallpaperEngine/Assets/CTexture.cpp b/src/WallpaperEngine/Render/CTexture.cpp
similarity index 100%
rename from src/WallpaperEngine/Assets/CTexture.cpp
rename to src/WallpaperEngine/Render/CTexture.cpp
diff --git a/src/WallpaperEngine/Assets/CTexture.h b/src/WallpaperEngine/Render/CTexture.h
similarity index 97%
rename from src/WallpaperEngine/Assets/CTexture.h
rename to src/WallpaperEngine/Render/CTexture.h
index c1a6215..e8fd86b 100644
--- a/src/WallpaperEngine/Assets/CTexture.h
+++ b/src/WallpaperEngine/Render/CTexture.h
@@ -5,10 +5,7 @@
 
 #include <GL/glew.h>
 #include <glm/vec4.hpp>
-#include <map>
 #include <memory>
-#include <stdexcept>
-#include <string>
 #include <vector>
 
 namespace WallpaperEngine::Assets {
diff --git a/src/WallpaperEngine/Render/CTextureCache.cpp b/src/WallpaperEngine/Render/CTextureCache.cpp
index ec33286..b09176f 100644
--- a/src/WallpaperEngine/Render/CTextureCache.cpp
+++ b/src/WallpaperEngine/Render/CTextureCache.cpp
@@ -2,8 +2,8 @@
 
 #include "WallpaperEngine/FileSystem/Container.h"
 
+#include "CTexture.h"
 #include "WallpaperEngine/Assets/CAssetLoadException.h"
-#include "WallpaperEngine/Assets/CTexture.h"
 #include "WallpaperEngine/Render/Helpers/CContextAware.h"
 
 #include "WallpaperEngine/Data/Model/Project.h"
diff --git a/src/WallpaperEngine/Render/CTextureCache.h b/src/WallpaperEngine/Render/CTextureCache.h
index 4af38d9..5d8c406 100644
--- a/src/WallpaperEngine/Render/CTextureCache.h
+++ b/src/WallpaperEngine/Render/CTextureCache.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <memory>
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "ITexture.h"
 #include "WallpaperEngine/Render/CRenderContext.h"
 #include "WallpaperEngine/Render/Helpers/CContextAware.h"
 
diff --git a/src/WallpaperEngine/Render/CWallpaperState.cpp b/src/WallpaperEngine/Render/CWallpaperState.cpp
index 93f5bf2..0244e5b 100644
--- a/src/WallpaperEngine/Render/CWallpaperState.cpp
+++ b/src/WallpaperEngine/Render/CWallpaperState.cpp
@@ -1,5 +1,5 @@
 #include "CWallpaperState.h"
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "ITexture.h"
 #include "WallpaperEngine/Logging/CLog.h"
 #include <algorithm>
 
diff --git a/src/WallpaperEngine/Render/CWallpaperState.h b/src/WallpaperEngine/Render/CWallpaperState.h
index 973f9ec..64ddf63 100644
--- a/src/WallpaperEngine/Render/CWallpaperState.h
+++ b/src/WallpaperEngine/Render/CWallpaperState.h
@@ -4,7 +4,7 @@
 #include <GLFW/glfw3.h>
 #include <glm/vec4.hpp>
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "ITexture.h"
 
 namespace WallpaperEngine::Render {
 using namespace WallpaperEngine::Data::Assets;
diff --git a/src/WallpaperEngine/Assets/ITexture.h b/src/WallpaperEngine/Render/ITexture.h
similarity index 100%
rename from src/WallpaperEngine/Assets/ITexture.h
rename to src/WallpaperEngine/Render/ITexture.h
diff --git a/src/WallpaperEngine/Render/Objects/CImage.cpp b/src/WallpaperEngine/Render/Objects/CImage.cpp
index 397cc9b..fbf6f8d 100644
--- a/src/WallpaperEngine/Render/Objects/CImage.cpp
+++ b/src/WallpaperEngine/Render/Objects/CImage.cpp
@@ -247,6 +247,8 @@ void CImage::setup () {
         );
     }
 
+    auto fboProvider = std::make_shared<CFBOProvider> (this);
+
     // prepare the passes list
     if (!this->getImage ().effects.empty ()) {
         // generate the effects used by this material
@@ -257,8 +259,6 @@ void CImage::setup () {
                 continue;
             }
 
-            auto fboProvider = std::make_shared<CFBOProvider> (this);
-
             // create all the fbos for this effect
             for (const auto& fbo : cur->effect->fbos) {
                 fboProvider->create (*fbo, this->m_texture->getFlags (), this->getSize ());
diff --git a/src/WallpaperEngine/Render/Objects/CImage.h b/src/WallpaperEngine/Render/Objects/CImage.h
index 39a5c18..0a97fe7 100644
--- a/src/WallpaperEngine/Render/Objects/CImage.h
+++ b/src/WallpaperEngine/Render/Objects/CImage.h
@@ -6,7 +6,7 @@
 
 #include "WallpaperEngine/Render/Shaders/CShader.h"
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "../ITexture.h"
 
 #include <glm/vec3.hpp>
 
diff --git a/src/WallpaperEngine/Render/Objects/Effects/CPass.h b/src/WallpaperEngine/Render/Objects/Effects/CPass.h
index 8014457..d64ee02 100644
--- a/src/WallpaperEngine/Render/Objects/Effects/CPass.h
+++ b/src/WallpaperEngine/Render/Objects/Effects/CPass.h
@@ -3,8 +3,8 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <utility>
 
+#include "../../ITexture.h"
 #include "WallpaperEngine/Data/Model/Material.h"
-#include "WallpaperEngine/Assets/ITexture.h"
 #include "WallpaperEngine/Render/CFBO.h"
 #include "WallpaperEngine/Render/CFBOProvider.h"
 #include "WallpaperEngine/Render/Helpers/CContextAware.h"
diff --git a/src/WallpaperEngine/Render/Shaders/CShader.h b/src/WallpaperEngine/Render/Shaders/CShader.h
index 190cde9..563f2f6 100644
--- a/src/WallpaperEngine/Render/Shaders/CShader.h
+++ b/src/WallpaperEngine/Render/Shaders/CShader.h
@@ -4,7 +4,7 @@
 #include <map>
 #include <vector>
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "../ITexture.h"
 #include "WallpaperEngine/Render/Shaders/Variables/CShaderVariable.h"
 
 #include "CShaderUnit.h"