chore: move wallpaper types to their own folder

CMakeLists.txt

@@ -270,12 +270,12 @@ add_executable(
     src/WallpaperEngine/Render/CWallpaper.cpp
     src/WallpaperEngine/Render/CWallpaperState.h
     src/WallpaperEngine/Render/CWallpaperState.cpp
-    src/WallpaperEngine/Render/CScene.h
-    src/WallpaperEngine/Render/CScene.cpp
-    src/WallpaperEngine/Render/CVideo.h
-    src/WallpaperEngine/Render/CVideo.cpp
-    src/WallpaperEngine/Render/CWeb.h
-    src/WallpaperEngine/Render/CWeb.cpp
+        src/WallpaperEngine/Render/Wallpapers/CScene.h
+        src/WallpaperEngine/Render/Wallpapers/CScene.cpp
+        src/WallpaperEngine/Render/Wallpapers/CVideo.h
+        src/WallpaperEngine/Render/Wallpapers/CVideo.cpp
+        src/WallpaperEngine/Render/Wallpapers/CWeb.h
+        src/WallpaperEngine/Render/Wallpapers/CWeb.cpp
     src/WallpaperEngine/Render/CCamera.h
     src/WallpaperEngine/Render/CCamera.cpp
     src/WallpaperEngine/Render/CObject.h
@@ -311,12 +311,12 @@ add_executable(
     src/WallpaperEngine/Core/CProject.h
     src/WallpaperEngine/Core/CWallpaper.cpp
     src/WallpaperEngine/Core/CWallpaper.h
-    src/WallpaperEngine/Core/CScene.cpp
-    src/WallpaperEngine/Core/CScene.h
-    src/WallpaperEngine/Core/CVideo.cpp
-    src/WallpaperEngine/Core/CVideo.h
-    src/WallpaperEngine/Core/CWeb.cpp
-    src/WallpaperEngine/Core/CWeb.h
+        src/WallpaperEngine/Core/Wallpapers/CScene.cpp
+        src/WallpaperEngine/Core/Wallpapers/CScene.h
+        src/WallpaperEngine/Core/Wallpapers/CVideo.cpp
+        src/WallpaperEngine/Core/Wallpapers/CVideo.h
+        src/WallpaperEngine/Core/Wallpapers/CWeb.cpp
+        src/WallpaperEngine/Core/Wallpapers/CWeb.h
     src/WallpaperEngine/Core/CObject.cpp
     src/WallpaperEngine/Core/CObject.h
 

main.cpp

@@ -3,7 +3,7 @@
 
 #include "WallpaperEngine/Application/CApplicationContext.h"
 #include "WallpaperEngine/Application/CWallpaperApplication.h"
-#include "WallpaperEngine/Core/CWeb.h"
+#include "WallpaperEngine/Core/Wallpapers/CWeb.h"
 #include "common.h"
 
 WallpaperEngine::Application::CWallpaperApplication* appPointer;

src/WallpaperEngine/Application/CWallpaperApplication.cpp

@@ -6,7 +6,7 @@
 #include "WallpaperEngine/Assets/CDirectory.h"
 #include "WallpaperEngine/Assets/CVirtualContainer.h"
 #include "WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h"
-#include "WallpaperEngine/Core/CVideo.h"
+#include "WallpaperEngine/Core/Wallpapers/CVideo.h"
 #include "WallpaperEngine/Input/Drivers/CGLFWMouseInput.h"
 #include "WallpaperEngine/Logging/CLog.h"
 #include "WallpaperEngine/Render/CRenderContext.h"

src/WallpaperEngine/Core/CObject.cpp

@@ -2,11 +2,11 @@
 #include "common.h"
 
 #include "WallpaperEngine/Core/CProject.h"
-#include "WallpaperEngine/Core/CScene.h"
 #include "WallpaperEngine/Core/Objects/CImage.h"
 #include "WallpaperEngine/Core/Objects/CParticle.h"
 #include "WallpaperEngine/Core/Objects/CSound.h"
 #include "WallpaperEngine/Core/UserSettings/CUserSettingBoolean.h"
+#include "WallpaperEngine/Core/Wallpapers/CScene.h"
 #include <utility>
 
 #include "WallpaperEngine/Assets/CContainer.h"

src/WallpaperEngine/Core/CProject.cpp

@@ -3,9 +3,9 @@
 #include <WallpaperEngine/FileSystem/FileSystem.h>
 
 #include "CProject.h"
-#include "CScene.h"
-#include "CVideo.h"
-#include "CWeb.h"
+#include "WallpaperEngine/Core/Wallpapers/CScene.h"
+#include "WallpaperEngine/Core/Wallpapers/CVideo.h"
+#include "WallpaperEngine/Core/Wallpapers/CWeb.h"
 
 using namespace WallpaperEngine::Core;
 using namespace WallpaperEngine::Assets;

src/WallpaperEngine/Core/Objects/CEffect.cpp

@@ -5,12 +5,12 @@
 #include <utility>
 
 #include "WallpaperEngine/Core/CProject.h"
-#include "WallpaperEngine/Core/CScene.h"
 #include "WallpaperEngine/Core/Objects/CImage.h"
 #include "WallpaperEngine/Core/Objects/Effects/Constants/CShaderConstant.h"
 #include "WallpaperEngine/Core/Objects/Effects/Constants/CShaderConstantFloat.h"
 #include "WallpaperEngine/Core/Objects/Effects/Constants/CShaderConstantInteger.h"
 #include "WallpaperEngine/Core/Objects/Effects/Constants/CShaderConstantVector4.h"
+#include "WallpaperEngine/Core/Wallpapers/CScene.h"
 
 #include "WallpaperEngine/Core/UserSettings/CUserSettingBoolean.h"
 

src/WallpaperEngine/Core/Objects/CImage.cpp

@@ -1,10 +1,10 @@
 #include "CImage.h"
 
-#include "WallpaperEngine/Core/CScene.h"
 #include "WallpaperEngine/Core/Objects/Images/CMaterial.h"
 #include "WallpaperEngine/Core/UserSettings/CUserSettingBoolean.h"
 #include "WallpaperEngine/Core/UserSettings/CUserSettingFloat.h"
 #include "WallpaperEngine/Core/UserSettings/CUserSettingVector3.h"
+#include "WallpaperEngine/Core/Wallpapers/CScene.h"
 #include <utility>
 
 #include "WallpaperEngine/FileSystem/FileSystem.h"

src/WallpaperEngine/Core/Wallpapers/CScene.cpp

@@ -1,5 +1,5 @@
 #include "CScene.h"
-#include "CProject.h"
+#include "WallpaperEngine/Core/CProject.h"
 
 #include "WallpaperEngine/Core/UserSettings/CUserSettingBoolean.h"
 #include "WallpaperEngine/Core/UserSettings/CUserSettingFloat.h"

src/WallpaperEngine/Core/Wallpapers/CScene.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "CObject.h"
-#include "CWallpaper.h"
+#include "WallpaperEngine/Core/CObject.h"
+#include "WallpaperEngine/Core/CWallpaper.h"
 
-#include "Core.h"
+#include "WallpaperEngine/Core/Core.h"
 
 #include "WallpaperEngine/Core/Scenes/CCamera.h"
 #include "WallpaperEngine/Core/Scenes/CProjection.h"

src/WallpaperEngine/Core/Wallpapers/CVideo.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CWallpaper.h"
-#include "Core.h"
+#include "WallpaperEngine/Core/CWallpaper.h"
+#include "WallpaperEngine/Core/Core.h"
 
 extern "C" {
 #include <libavcodec/avcodec.h>

src/WallpaperEngine/Core/Wallpapers/CWeb.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Core.h"
-#include "CWallpaper.h"
+#include "WallpaperEngine/Core/CWallpaper.h"
+#include "WallpaperEngine/Core/Core.h"
 
 // Chromium Embedded Framework
 #include "include/cef_render_handler.h"

src/WallpaperEngine/Render/CCamera.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CScene.h"
+#include "WallpaperEngine/Render/Wallpapers/CScene.h"
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>

src/WallpaperEngine/Render/CObject.h

@@ -5,7 +5,7 @@
 #include "WallpaperEngine/Core/CObject.h"
 #include "WallpaperEngine/Render/Helpers/CContextAware.h"
 
-#include "CScene.h"
+#include "WallpaperEngine/Render/Wallpapers/CScene.h"
 
 namespace WallpaperEngine::Render {
 class CScene;

src/WallpaperEngine/Render/CRenderContext.cpp

@@ -4,8 +4,8 @@
 #include <GL/glew.h>
 
 #include "CRenderContext.h"
-#include "CVideo.h"
 #include "CWallpaper.h"
+#include "WallpaperEngine/Render/Wallpapers/CVideo.h"
 
 namespace WallpaperEngine::Render {
 CRenderContext::CRenderContext (Drivers::CVideoDriver& driver, Input::CInputContext& input,

src/WallpaperEngine/Render/CWallpaper.cpp

@@ -1,7 +1,7 @@
 #include "CWallpaper.h"
-#include "CScene.h"
-#include "CVideo.h"
-#include "CWeb.h"
+#include "WallpaperEngine/Render/Wallpapers/CScene.h"
+#include "WallpaperEngine/Render/Wallpapers/CVideo.h"
+#include "WallpaperEngine/Render/Wallpapers/CWeb.h"
 #include "common.h"
 
 #include <glm/glm.hpp>

src/WallpaperEngine/Render/CWallpaper.h

@@ -6,9 +6,9 @@
 #include "WallpaperEngine/Assets/CContainer.h"
 #include "WallpaperEngine/Audio/CAudioContext.h"
 
-#include "WallpaperEngine/Core/CScene.h"
-#include "WallpaperEngine/Core/CVideo.h"
 #include "WallpaperEngine/Core/CWallpaper.h"
+#include "WallpaperEngine/Core/Wallpapers/CScene.h"
+#include "WallpaperEngine/Core/Wallpapers/CVideo.h"
 
 #include "WallpaperEngine/Render/CFBO.h"
 #include "WallpaperEngine/Render/CRenderContext.h"

src/WallpaperEngine/Render/Objects/CImage.h

@@ -3,10 +3,10 @@
 #include "WallpaperEngine/Core/Objects/CImage.h"
 
 #include "WallpaperEngine/Render/CObject.h"
-#include "WallpaperEngine/Render/CScene.h"
 #include "WallpaperEngine/Render/Objects/CEffect.h"
 #include "WallpaperEngine/Render/Objects/Effects/CMaterial.h"
 #include "WallpaperEngine/Render/Objects/Effects/CPass.h"
+#include "WallpaperEngine/Render/Wallpapers/CScene.h"
 
 #include "WallpaperEngine/Render/Shaders/Compiler.h"
 

src/WallpaperEngine/Render/Wallpapers/CScene.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "CCamera.h"
+#include "WallpaperEngine/Render/CCamera.h"
 
-#include "WallpaperEngine/Core/CScene.h"
+#include "WallpaperEngine/Core/Wallpapers/CScene.h"
 
 #include "WallpaperEngine/Render/CWallpaper.h"
 

src/WallpaperEngine/Render/Wallpapers/CVideo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "WallpaperEngine/Core/CVideo.h"
+#include "WallpaperEngine/Core/Wallpapers/CVideo.h"
 
 #include "WallpaperEngine/Audio/CAudioStream.h"
 #include "WallpaperEngine/Render/CWallpaper.h"

src/WallpaperEngine/Render/Wallpapers/CWeb.h

@@ -9,10 +9,10 @@
 #include <memory>
 #include <algorithm>
 
-#include "common.h"
-#include "WallpaperEngine/Core/CWeb.h"
-#include "WallpaperEngine/Render/CWallpaper.h"
 #include "WallpaperEngine/Audio/CAudioStream.h"
+#include "WallpaperEngine/Core/Wallpapers/CWeb.h"
+#include "WallpaperEngine/Render/CWallpaper.h"
+#include "common.h"
 
 namespace WallpaperEngine::Render
 {

src/common.h

@@ -1,7 +1,7 @@
 #pragma once
 
+#include "WallpaperEngine/Core/Wallpapers/CWeb.h"
 #include "WallpaperEngine/Logging/CLog.h"
-#include "WallpaperEngine/Core/CWeb.h"
 
 //global variables are bad
 extern bool g_CEFused;