From 0b8d56afe1b4856d2d2016953416cb1455996e9b Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 21 Mar 2025 03:41:10 +0300 Subject: [PATCH] cleanup --- src/engine/Engine.cpp | 2 +- src/engine/Mainloop.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/frontend/screens/MenuScreen.cpp | 2 +- src/graphics/core/DrawContext.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/Skybox.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- src/graphics/ui/GUI.cpp | 2 +- src/graphics/ui/elements/TextBox.cpp | 2 +- src/logic/PlayerController.cpp | 2 +- src/window/detail/GLFWWindow.cpp | 4 +++- src/window/{Window.hpp => display.hpp} | 4 +--- 14 files changed, 16 insertions(+), 16 deletions(-) rename src/window/{Window.hpp => display.hpp} (95%) diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 16aa60de..a9d586d8 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -35,7 +35,7 @@ #include "util/platform.hpp" #include "window/Camera.hpp" #include "window/input.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "world/Level.hpp" #include "Mainloop.hpp" #include "ServerMainloop.hpp" diff --git a/src/engine/Mainloop.cpp b/src/engine/Mainloop.cpp index ecfd17bc..7f734d16 100644 --- a/src/engine/Mainloop.cpp +++ b/src/engine/Mainloop.cpp @@ -4,7 +4,7 @@ #include "debug/Logger.hpp" #include "frontend/screens/MenuScreen.hpp" #include "frontend/screens/LevelScreen.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "world/Level.hpp" static debug::Logger logger("mainloop"); diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index f330b508..56f365a5 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -41,7 +41,7 @@ #include "voxels/GlobalChunks.hpp" #include "window/Camera.hpp" #include "window/input.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "world/Level.hpp" #include "world/World.hpp" #include "debug/Logger.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index c10f40c5..17f89734 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -30,7 +30,7 @@ #include "util/stringutil.hpp" #include "voxels/Chunks.hpp" #include "window/Camera.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "world/Level.hpp" #include "world/World.hpp" diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index 62699488..6af53d35 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -7,7 +7,7 @@ #include "graphics/core/Texture.hpp" #include "assets/Assets.hpp" #include "maths/UVRegion.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "window/Camera.hpp" #include "engine/Engine.hpp" diff --git a/src/graphics/core/DrawContext.cpp b/src/graphics/core/DrawContext.cpp index ef98b24d..b9525a32 100644 --- a/src/graphics/core/DrawContext.cpp +++ b/src/graphics/core/DrawContext.cpp @@ -6,7 +6,7 @@ #include "Batch2D.hpp" #include "Framebuffer.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" static void set_blend_mode(BlendMode mode) { switch (mode) { diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 2be2e368..34632ed7 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -6,7 +6,7 @@ #include "frontend/ContentGfxCache.hpp" #include "voxels/Block.hpp" #include "window/Camera.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "graphics/core/Atlas.hpp" #include "graphics/core/Batch3D.hpp" #include "graphics/core/Framebuffer.hpp" diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index af3a1587..0b987e2d 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -7,7 +7,7 @@ #include "graphics/core/Cubemap.hpp" #include "graphics/core/Framebuffer.hpp" #include "graphics/core/DrawContext.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "window/Camera.hpp" #include "maths/UVRegion.hpp" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 61c3a472..621030c6 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -28,7 +28,7 @@ #include "voxels/Chunk.hpp" #include "voxels/Chunks.hpp" #include "window/Camera.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "world/Level.hpp" #include "world/LevelEvents.hpp" #include "world/World.hpp" diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 3fdba305..b436470a 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -20,7 +20,7 @@ #include "graphics/core/Shader.hpp" #include "gui_util.hpp" #include "window/Camera.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "window/input.hpp" #include diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 99d2937e..567d1446 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -15,7 +15,7 @@ #include "graphics/core/Font.hpp" #include "graphics/ui/markdown.hpp" #include "util/stringutil.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "devtools/actions.hpp" #include "../markdown.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index b157e5e5..12ceae0d 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -23,7 +23,7 @@ #include "voxels/Chunks.hpp" #include "voxels/voxel.hpp" #include "window/Camera.hpp" -#include "window/Window.hpp" +#include "window/display.hpp" #include "window/input.hpp" #include "world/Level.hpp" diff --git a/src/window/detail/GLFWWindow.cpp b/src/window/detail/GLFWWindow.cpp index a291798d..a8a80638 100644 --- a/src/window/detail/GLFWWindow.cpp +++ b/src/window/detail/GLFWWindow.cpp @@ -1,10 +1,12 @@ -#include "window/Window.hpp" +#include "window/display.hpp" #include #include #include #include +#include +#include #include "debug/Logger.hpp" #include "graphics/core/ImageData.hpp" diff --git a/src/window/Window.hpp b/src/window/display.hpp similarity index 95% rename from src/window/Window.hpp rename to src/window/display.hpp index 7b874a9e..a422764b 100644 --- a/src/window/Window.hpp +++ b/src/window/display.hpp @@ -2,8 +2,6 @@ #include #include -#include -#include #include "graphics/core/commons.hpp" #include "typedefs.hpp" @@ -40,7 +38,7 @@ public: virtual void setFramerate(int framerate) = 0; - // TODO: move somewhere + // todo: move somewhere virtual std::unique_ptr takeScreenshot() = 0; const glm::ivec2& getSize() const {