chore: move render-dependant texture code to render instead of assets

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

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"

src/WallpaperEngine/Render/CFBO.h

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "WallpaperEngine/Assets/ITexture.h"
+#include "ITexture.h"
 
 using namespace WallpaperEngine::Assets;
 

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 {

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"

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"
 

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>
 

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;

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 ());

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>
 

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"

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"