From 85239004e3da4cc845245c85b6fae99130921a4e Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Tue, 6 Aug 2024 00:07:33 +0300 Subject: [PATCH] window/ --- src/core_defs.cpp | 6 +++--- src/engine.cpp | 8 ++++---- src/files/WorldFiles.cpp | 2 +- src/files/settings_io.cpp | 4 ++-- src/frontend/hud.cpp | 8 ++++---- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 6 +++--- src/frontend/screens/MenuScreen.cpp | 4 ++-- src/graphics/core/DrawContext.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 4 ++-- src/graphics/render/ModelBatch.cpp | 2 +- src/graphics/render/Skybox.cpp | 4 ++-- src/graphics/render/WorldRenderer.cpp | 4 ++-- src/graphics/ui/GUI.cpp | 8 ++++---- src/graphics/ui/elements/InventoryView.cpp | 4 ++-- src/graphics/ui/elements/TextBox.cpp | 4 ++-- src/graphics/ui/elements/UINode.hpp | 2 +- src/graphics/ui/gui_xml.cpp | 2 +- src/logic/PlayerController.cpp | 8 ++++---- src/logic/scripting/lua/libcamera.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libentity.cpp | 2 +- src/logic/scripting/lua/libinput.cpp | 4 ++-- src/logic/scripting/lua/libplayer.cpp | 2 +- src/logic/scripting/lua/libtime.cpp | 2 +- src/objects/Player.cpp | 4 ++-- src/world/Level.cpp | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/core_defs.cpp b/src/core_defs.cpp index 4f4b2773..0fd648b9 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -5,9 +5,9 @@ #include #include #include -#include "window/Window.hpp" -#include "window/Events.hpp" -#include "window/input.hpp" +#include +#include +#include #include // All in-game definitions (blocks, items, etc..) diff --git a/src/engine.cpp b/src/engine.cpp index f5c1af5d..7bbff33b 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -32,10 +32,10 @@ #include #include #include -#include "window/Camera.hpp" -#include "window/Events.hpp" -#include "window/input.hpp" -#include "window/Window.hpp" +#include +#include +#include +#include #include #include diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 10bff680..68f3b56f 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -28,7 +28,7 @@ #include #include #include -#include "../window/Camera.hpp" +#include #include #define WORLD_FORMAT_MAGIC ".VOXWLD" diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp index 4464a823..c9a7668b 100644 --- a/src/files/settings_io.cpp +++ b/src/files/settings_io.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "../window/Events.hpp" -#include "../window/input.hpp" +#include +#include static debug::Logger logger("settings_io"); diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 6aeb6dae..fccebf00 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -37,10 +37,10 @@ #include #include #include -#include "../window/Camera.hpp" -#include "../window/Events.hpp" -#include "../window/input.hpp" -#include "../window/Window.hpp" +#include +#include +#include +#include #include #include diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 7ea37033..88bc2c0d 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -16,7 +16,7 @@ #include #include #include -#include "../window/Window.hpp" +#include #include #include diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index b979b6ee..c6a20036 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -21,9 +21,9 @@ #include #include #include -#include "../../window/Camera.hpp" -#include "../../window/Events.hpp" -#include "../../window/Window.hpp" +#include +#include +#include #include #include diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index 560704fe..5e96500f 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -6,8 +6,8 @@ #include #include #include -#include "../../window/Window.hpp" -#include "../../window/Camera.hpp" +#include +#include #include MenuScreen::MenuScreen(Engine* engine) : Screen(engine) { diff --git a/src/graphics/core/DrawContext.cpp b/src/graphics/core/DrawContext.cpp index 68b31125..b8bb589f 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 static void set_blend_mode(BlendMode mode) { switch (mode) { diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 8edece36..aaefcd27 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -5,8 +5,8 @@ #include #include #include -#include "../../window/Camera.hpp" -#include "../../window/Window.hpp" +#include +#include #include #include #include diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index 749a2769..673bd671 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../window/Window.hpp" +#include #include #include diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index 1591e5ff..af497396 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "../../window/Window.hpp" -#include "../../window/Camera.hpp" +#include +#include #include #include diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 2c2b4016..71b2faa0 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -25,8 +25,8 @@ #include #include #include -#include "../../window/Camera.hpp" -#include "../../window/Window.hpp" +#include +#include #include #include #include diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 5aefec79..8dec44bd 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -12,10 +12,10 @@ #include #include #include -#include "../../window/Events.hpp" -#include "../../window/Window.hpp" -#include "../../window/input.hpp" -#include "../../window/Camera.hpp" +#include +#include +#include +#include #include #include diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 6940e5e9..7328639f 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -13,8 +13,8 @@ #include #include #include -#include "../../../window/Events.hpp" -#include "../../../window/input.hpp" +#include +#include #include #include #include diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index a27ea028..f41343fe 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -9,8 +9,8 @@ #include #include #include -#include "../../../window/Events.hpp" -#include "../../../window/Window.hpp" +#include +#include using namespace gui; diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp index 7281f0dd..4a8be56d 100644 --- a/src/graphics/ui/elements/UINode.hpp +++ b/src/graphics/ui/elements/UINode.hpp @@ -2,7 +2,7 @@ #define GRAPHICS_UI_ELEMENTS_UINODE_HPP_ #include -#include "../../../window/input.hpp" +#include #include #include diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index 3a017d5c..74cf906c 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -16,7 +16,7 @@ #include #include #include -#include "../../window/Events.hpp" +#include #include #include diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 9daebb8b..499ba7f9 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -18,10 +18,10 @@ #include #include #include -#include "../window/Camera.hpp" -#include "../window/Events.hpp" -#include "../window/Window.hpp" -#include "../window/input.hpp" +#include +#include +#include +#include #include #include "BlocksController.hpp" #include "scripting/scripting.hpp" diff --git a/src/logic/scripting/lua/libcamera.cpp b/src/logic/scripting/lua/libcamera.cpp index 70558f67..b3eff98c 100644 --- a/src/logic/scripting/lua/libcamera.cpp +++ b/src/logic/scripting/lua/libcamera.cpp @@ -1,7 +1,7 @@ #include #include -#include "../../../window/Camera.hpp" +#include #include #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index f5639e56..7a9547d3 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -9,8 +9,8 @@ #include #include #include -#include "../../../window/Events.hpp" -#include "../../../window/Window.hpp" +#include +#include #include #include #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 0070edcd..a4e14476 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "../../../window/Camera.hpp" +#include using namespace scripting; diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp index 68261a02..4ac43642 100644 --- a/src/logic/scripting/lua/libinput.cpp +++ b/src/logic/scripting/lua/libinput.cpp @@ -3,8 +3,8 @@ #include #include #include -#include "../../../window/Events.hpp" -#include "../../../window/input.hpp" +#include +#include #include "api_lua.hpp" namespace scripting { diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libplayer.cpp index 071675f4..fa0b7609 100644 --- a/src/logic/scripting/lua/libplayer.cpp +++ b/src/logic/scripting/lua/libplayer.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../../window/Camera.hpp" +#include #include #include "libentity.hpp" diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libtime.cpp index 5993a133..a4eeb0ab 100644 --- a/src/logic/scripting/lua/libtime.cpp +++ b/src/logic/scripting/lua/libtime.cpp @@ -1,5 +1,5 @@ #include -#include "../../../window/Window.hpp" +#include #include "api_lua.hpp" static int l_time_uptime(lua::State* L) { diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index cfdc75b7..1d34a6a5 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -11,8 +11,8 @@ #include #include #include -#include "../window/Camera.hpp" -#include "../window/Events.hpp" +#include +#include #include const float CROUCH_SPEED_MUL = 0.35f; diff --git a/src/world/Level.cpp b/src/world/Level.cpp index 2688cbda..90e828a3 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -13,7 +13,7 @@ #include #include #include -#include "../window/Camera.hpp" +#include #include "LevelEvents.hpp" #include "World.hpp"