From 006d4ee3d0dc823b13942c057b1e560c285aac0a Mon Sep 17 00:00:00 2001 From: Almamu Date: Tue, 7 May 2024 02:55:10 +0200 Subject: [PATCH] chore: move wallpaper types to their own folder --- CMakeLists.txt | 24 +++++++++---------- main.cpp | 2 +- .../Application/CWallpaperApplication.cpp | 2 +- src/WallpaperEngine/Core/CObject.cpp | 2 +- src/WallpaperEngine/Core/CProject.cpp | 6 ++--- src/WallpaperEngine/Core/Objects/CEffect.cpp | 2 +- src/WallpaperEngine/Core/Objects/CImage.cpp | 2 +- .../Core/{ => Wallpapers}/CScene.cpp | 2 +- .../Core/{ => Wallpapers}/CScene.h | 6 ++--- .../Core/{ => Wallpapers}/CVideo.cpp | 0 .../Core/{ => Wallpapers}/CVideo.h | 4 ++-- .../Core/{ => Wallpapers}/CWeb.cpp | 0 .../Core/{ => Wallpapers}/CWeb.h | 4 ++-- src/WallpaperEngine/Render/CCamera.h | 2 +- src/WallpaperEngine/Render/CObject.h | 2 +- src/WallpaperEngine/Render/CRenderContext.cpp | 2 +- src/WallpaperEngine/Render/CWallpaper.cpp | 6 ++--- src/WallpaperEngine/Render/CWallpaper.h | 4 ++-- src/WallpaperEngine/Render/Objects/CImage.h | 2 +- .../Render/{ => Wallpapers}/CScene.cpp | 0 .../Render/{ => Wallpapers}/CScene.h | 4 ++-- .../Render/{ => Wallpapers}/CVideo.cpp | 0 .../Render/{ => Wallpapers}/CVideo.h | 2 +- .../Render/{ => Wallpapers}/CWeb.cpp | 0 .../Render/{ => Wallpapers}/CWeb.h | 6 ++--- src/common.h | 2 +- 26 files changed, 44 insertions(+), 44 deletions(-) rename src/WallpaperEngine/Core/{ => Wallpapers}/CScene.cpp (99%) rename src/WallpaperEngine/Core/{ => Wallpapers}/CScene.h (95%) rename src/WallpaperEngine/Core/{ => Wallpapers}/CVideo.cpp (100%) rename src/WallpaperEngine/Core/{ => Wallpapers}/CVideo.h (85%) rename src/WallpaperEngine/Core/{ => Wallpapers}/CWeb.cpp (100%) rename src/WallpaperEngine/Core/{ => Wallpapers}/CWeb.h (88%) rename src/WallpaperEngine/Render/{ => Wallpapers}/CScene.cpp (100%) rename src/WallpaperEngine/Render/{ => Wallpapers}/CScene.h (92%) rename src/WallpaperEngine/Render/{ => Wallpapers}/CVideo.cpp (100%) rename src/WallpaperEngine/Render/{ => Wallpapers}/CVideo.h (94%) rename src/WallpaperEngine/Render/{ => Wallpapers}/CWeb.cpp (100%) rename src/WallpaperEngine/Render/{ => Wallpapers}/CWeb.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 226e032..efc831a 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/main.cpp b/main.cpp index de9a24b..a7e7399 100644 --- a/main.cpp +++ b/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; diff --git a/src/WallpaperEngine/Application/CWallpaperApplication.cpp b/src/WallpaperEngine/Application/CWallpaperApplication.cpp index 9442f58..ff11bd7 100644 --- a/src/WallpaperEngine/Application/CWallpaperApplication.cpp +++ b/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" diff --git a/src/WallpaperEngine/Core/CObject.cpp b/src/WallpaperEngine/Core/CObject.cpp index b5e77ef..c3ef188 100644 --- a/src/WallpaperEngine/Core/CObject.cpp +++ b/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 #include "WallpaperEngine/Assets/CContainer.h" diff --git a/src/WallpaperEngine/Core/CProject.cpp b/src/WallpaperEngine/Core/CProject.cpp index bf78582..5c4dd37 100644 --- a/src/WallpaperEngine/Core/CProject.cpp +++ b/src/WallpaperEngine/Core/CProject.cpp @@ -3,9 +3,9 @@ #include #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; diff --git a/src/WallpaperEngine/Core/Objects/CEffect.cpp b/src/WallpaperEngine/Core/Objects/CEffect.cpp index de93e7c..08ee743 100644 --- a/src/WallpaperEngine/Core/Objects/CEffect.cpp +++ b/src/WallpaperEngine/Core/Objects/CEffect.cpp @@ -5,12 +5,12 @@ #include #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" diff --git a/src/WallpaperEngine/Core/Objects/CImage.cpp b/src/WallpaperEngine/Core/Objects/CImage.cpp index 4ec48b8..689c7d6 100644 --- a/src/WallpaperEngine/Core/Objects/CImage.cpp +++ b/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 #include "WallpaperEngine/FileSystem/FileSystem.h" diff --git a/src/WallpaperEngine/Core/CScene.cpp b/src/WallpaperEngine/Core/Wallpapers/CScene.cpp similarity index 99% rename from src/WallpaperEngine/Core/CScene.cpp rename to src/WallpaperEngine/Core/Wallpapers/CScene.cpp index dc9eb9d..e7cce34 100644 --- a/src/WallpaperEngine/Core/CScene.cpp +++ b/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" diff --git a/src/WallpaperEngine/Core/CScene.h b/src/WallpaperEngine/Core/Wallpapers/CScene.h similarity index 95% rename from src/WallpaperEngine/Core/CScene.h rename to src/WallpaperEngine/Core/Wallpapers/CScene.h index 05610cd..3062596 100644 --- a/src/WallpaperEngine/Core/CScene.h +++ b/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" diff --git a/src/WallpaperEngine/Core/CVideo.cpp b/src/WallpaperEngine/Core/Wallpapers/CVideo.cpp similarity index 100% rename from src/WallpaperEngine/Core/CVideo.cpp rename to src/WallpaperEngine/Core/Wallpapers/CVideo.cpp diff --git a/src/WallpaperEngine/Core/CVideo.h b/src/WallpaperEngine/Core/Wallpapers/CVideo.h similarity index 85% rename from src/WallpaperEngine/Core/CVideo.h rename to src/WallpaperEngine/Core/Wallpapers/CVideo.h index d217fa6..a2ace06 100644 --- a/src/WallpaperEngine/Core/CVideo.h +++ b/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 diff --git a/src/WallpaperEngine/Core/CWeb.cpp b/src/WallpaperEngine/Core/Wallpapers/CWeb.cpp similarity index 100% rename from src/WallpaperEngine/Core/CWeb.cpp rename to src/WallpaperEngine/Core/Wallpapers/CWeb.cpp diff --git a/src/WallpaperEngine/Core/CWeb.h b/src/WallpaperEngine/Core/Wallpapers/CWeb.h similarity index 88% rename from src/WallpaperEngine/Core/CWeb.h rename to src/WallpaperEngine/Core/Wallpapers/CWeb.h index ad8ab97..ffeda01 100644 --- a/src/WallpaperEngine/Core/CWeb.h +++ b/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" diff --git a/src/WallpaperEngine/Render/CCamera.h b/src/WallpaperEngine/Render/CCamera.h index 86be65f..c23cc31 100644 --- a/src/WallpaperEngine/Render/CCamera.h +++ b/src/WallpaperEngine/Render/CCamera.h @@ -1,6 +1,6 @@ #pragma once -#include "CScene.h" +#include "WallpaperEngine/Render/Wallpapers/CScene.h" #include #include #include diff --git a/src/WallpaperEngine/Render/CObject.h b/src/WallpaperEngine/Render/CObject.h index 6c233a5..77b0130 100644 --- a/src/WallpaperEngine/Render/CObject.h +++ b/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; diff --git a/src/WallpaperEngine/Render/CRenderContext.cpp b/src/WallpaperEngine/Render/CRenderContext.cpp index 9e98f03..e98c84a 100644 --- a/src/WallpaperEngine/Render/CRenderContext.cpp +++ b/src/WallpaperEngine/Render/CRenderContext.cpp @@ -4,8 +4,8 @@ #include #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, diff --git a/src/WallpaperEngine/Render/CWallpaper.cpp b/src/WallpaperEngine/Render/CWallpaper.cpp index b23af7a..3b0e1ac 100644 --- a/src/WallpaperEngine/Render/CWallpaper.cpp +++ b/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 diff --git a/src/WallpaperEngine/Render/CWallpaper.h b/src/WallpaperEngine/Render/CWallpaper.h index 2942a0f..79b935e 100644 --- a/src/WallpaperEngine/Render/CWallpaper.h +++ b/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" diff --git a/src/WallpaperEngine/Render/Objects/CImage.h b/src/WallpaperEngine/Render/Objects/CImage.h index 0429920..649be5b 100644 --- a/src/WallpaperEngine/Render/Objects/CImage.h +++ b/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" diff --git a/src/WallpaperEngine/Render/CScene.cpp b/src/WallpaperEngine/Render/Wallpapers/CScene.cpp similarity index 100% rename from src/WallpaperEngine/Render/CScene.cpp rename to src/WallpaperEngine/Render/Wallpapers/CScene.cpp diff --git a/src/WallpaperEngine/Render/CScene.h b/src/WallpaperEngine/Render/Wallpapers/CScene.h similarity index 92% rename from src/WallpaperEngine/Render/CScene.h rename to src/WallpaperEngine/Render/Wallpapers/CScene.h index f0175ed..09d266b 100644 --- a/src/WallpaperEngine/Render/CScene.h +++ b/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" diff --git a/src/WallpaperEngine/Render/CVideo.cpp b/src/WallpaperEngine/Render/Wallpapers/CVideo.cpp similarity index 100% rename from src/WallpaperEngine/Render/CVideo.cpp rename to src/WallpaperEngine/Render/Wallpapers/CVideo.cpp diff --git a/src/WallpaperEngine/Render/CVideo.h b/src/WallpaperEngine/Render/Wallpapers/CVideo.h similarity index 94% rename from src/WallpaperEngine/Render/CVideo.h rename to src/WallpaperEngine/Render/Wallpapers/CVideo.h index 685c602..3f6913b 100644 --- a/src/WallpaperEngine/Render/CVideo.h +++ b/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" diff --git a/src/WallpaperEngine/Render/CWeb.cpp b/src/WallpaperEngine/Render/Wallpapers/CWeb.cpp similarity index 100% rename from src/WallpaperEngine/Render/CWeb.cpp rename to src/WallpaperEngine/Render/Wallpapers/CWeb.cpp diff --git a/src/WallpaperEngine/Render/CWeb.h b/src/WallpaperEngine/Render/Wallpapers/CWeb.h similarity index 98% rename from src/WallpaperEngine/Render/CWeb.h rename to src/WallpaperEngine/Render/Wallpapers/CWeb.h index 6d598ef..ec1ae03 100644 --- a/src/WallpaperEngine/Render/CWeb.h +++ b/src/WallpaperEngine/Render/Wallpapers/CWeb.h @@ -9,10 +9,10 @@ #include #include -#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 { diff --git a/src/common.h b/src/common.h index ef789dc..c0eb7ce 100644 --- a/src/common.h +++ b/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;