From f43cc93cd23ffc46689502c79a36bf0b63d4d27d Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 10 Aug 2024 01:37:48 +0300 Subject: [PATCH] update project includes format --- src/assets/Assets.hpp | 2 +- src/assets/AssetsLoader.cpp | 26 +++---- src/assets/AssetsLoader.hpp | 6 +- src/assets/assetload_funcs.cpp | 38 +++++----- src/audio/AL/ALAudio.cpp | 2 +- src/audio/AL/ALAudio.hpp | 4 +- src/audio/AL/alutil.cpp | 2 +- src/audio/AL/alutil.hpp | 2 +- src/audio/audio.cpp | 4 +- src/audio/audio.hpp | 2 +- src/coders/GLSLExtension.cpp | 8 +- src/coders/binary_json.cpp | 2 +- src/coders/binary_json.hpp | 2 +- src/coders/byte_utils.hpp | 2 +- src/coders/commons.cpp | 2 +- src/coders/commons.hpp | 4 +- src/coders/gzip.hpp | 2 +- src/coders/imageio.cpp | 2 +- src/coders/json.cpp | 4 +- src/coders/json.hpp | 4 +- src/coders/obj.cpp | 2 +- src/coders/ogg.cpp | 6 +- src/coders/png.cpp | 8 +- src/coders/rle.hpp | 2 +- src/coders/toml.cpp | 8 +- src/coders/toml.hpp | 2 +- src/coders/wav.cpp | 4 +- src/coders/xml.cpp | 2 +- src/constants.hpp | 2 +- src/content/Content.cpp | 10 +-- src/content/Content.hpp | 2 +- src/content/ContentBuilder.cpp | 2 +- src/content/ContentBuilder.hpp | 6 +- src/content/ContentLUT.cpp | 10 +-- src/content/ContentLUT.hpp | 6 +- src/content/ContentLoader.cpp | 24 +++--- src/content/ContentPack.cpp | 8 +- src/content/ContentPack.hpp | 2 +- src/content/PacksManager.cpp | 2 +- src/content/content_fwd.hpp | 2 +- src/core_defs.cpp | 18 ++--- src/data/dynamic.cpp | 2 +- src/data/dynamic_fwd.hpp | 2 +- src/data/setting.cpp | 2 +- src/data/setting.hpp | 4 +- src/engine.cpp | 72 +++++++++--------- src/engine.hpp | 16 ++-- src/files/WorldConverter.cpp | 14 ++-- src/files/WorldConverter.hpp | 6 +- src/files/WorldFiles.cpp | 44 +++++------ src/files/WorldFiles.hpp | 8 +- src/files/WorldRegions.cpp | 12 +-- src/files/WorldRegions.hpp | 10 +-- src/files/engine_paths.cpp | 4 +- src/files/engine_paths.hpp | 2 +- src/files/files.cpp | 12 +-- src/files/files.hpp | 2 +- src/files/settings_io.cpp | 12 +-- src/files/settings_io.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 14 ++-- src/frontend/ContentGfxCache.hpp | 2 +- src/frontend/LevelFrontend.cpp | 20 ++--- src/frontend/UiDocument.cpp | 10 +-- src/frontend/UiDocument.hpp | 2 +- src/frontend/debug_panel.cpp | 44 +++++------ src/frontend/hud.cpp | 78 ++++++++++---------- src/frontend/hud.hpp | 4 +- src/frontend/locale.cpp | 14 ++-- src/frontend/menu.cpp | 26 +++---- src/frontend/menu.hpp | 4 +- src/frontend/screens/LevelScreen.cpp | 52 ++++++------- src/frontend/screens/MenuScreen.cpp | 18 ++--- src/frontend/screens/Screen.cpp | 4 +- src/frontend/screens/Screen.hpp | 2 +- src/graphics/core/Atlas.cpp | 2 +- src/graphics/core/Atlas.hpp | 4 +- src/graphics/core/Batch2D.cpp | 2 +- src/graphics/core/Batch2D.hpp | 2 +- src/graphics/core/Batch3D.cpp | 4 +- src/graphics/core/Batch3D.hpp | 2 +- src/graphics/core/DrawContext.cpp | 2 +- src/graphics/core/DrawContext.hpp | 2 +- src/graphics/core/Font.hpp | 2 +- src/graphics/core/Framebuffer.hpp | 2 +- src/graphics/core/ImageData.hpp | 2 +- src/graphics/core/Mesh.hpp | 2 +- src/graphics/core/Shader.cpp | 2 +- src/graphics/core/Shader.hpp | 2 +- src/graphics/core/Texture.hpp | 4 +- src/graphics/core/TextureAnimation.hpp | 2 +- src/graphics/core/Viewport.hpp | 2 +- src/graphics/render/BlocksPreview.cpp | 28 +++---- src/graphics/render/BlocksPreview.hpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 22 +++--- src/graphics/render/BlocksRenderer.hpp | 4 +- src/graphics/render/ChunksRenderer.cpp | 10 +-- src/graphics/render/ChunksRenderer.hpp | 6 +- src/graphics/render/ModelBatch.cpp | 16 ++-- src/graphics/render/ModelBatch.hpp | 2 +- src/graphics/render/Skybox.cpp | 22 +++--- src/graphics/render/Skybox.hpp | 4 +- src/graphics/render/WorldRenderer.cpp | 62 ++++++++-------- src/graphics/ui/GUI.cpp | 20 ++--- src/graphics/ui/GUI.hpp | 2 +- src/graphics/ui/elements/Button.cpp | 4 +- src/graphics/ui/elements/CheckBox.cpp | 4 +- src/graphics/ui/elements/Container.cpp | 4 +- src/graphics/ui/elements/Image.cpp | 12 +-- src/graphics/ui/elements/InputBindBox.cpp | 6 +- src/graphics/ui/elements/InventoryView.cpp | 48 ++++++------ src/graphics/ui/elements/InventoryView.hpp | 4 +- src/graphics/ui/elements/Label.cpp | 10 +-- src/graphics/ui/elements/Plotter.cpp | 10 +-- src/graphics/ui/elements/Plotter.hpp | 2 +- src/graphics/ui/elements/TextBox.cpp | 14 ++-- src/graphics/ui/elements/TrackBar.cpp | 6 +- src/graphics/ui/elements/TrackBar.hpp | 2 +- src/graphics/ui/elements/UINode.cpp | 2 +- src/graphics/ui/elements/UINode.hpp | 4 +- src/graphics/ui/gui_util.cpp | 8 +- src/graphics/ui/gui_util.hpp | 4 +- src/graphics/ui/gui_xml.cpp | 14 ++-- src/graphics/ui/gui_xml.hpp | 2 +- src/interfaces/Serializable.hpp | 2 +- src/interfaces/Task.hpp | 2 +- src/items/Inventories.cpp | 4 +- src/items/Inventories.hpp | 2 +- src/items/Inventory.cpp | 4 +- src/items/Inventory.hpp | 4 +- src/items/ItemDef.cpp | 2 +- src/items/ItemDef.hpp | 2 +- src/items/ItemStack.cpp | 2 +- src/items/ItemStack.hpp | 4 +- src/lighting/LightSolver.cpp | 10 +-- src/lighting/Lighting.cpp | 14 ++-- src/lighting/Lighting.hpp | 2 +- src/lighting/Lightmap.cpp | 2 +- src/lighting/Lightmap.hpp | 4 +- src/logic/BlocksController.cpp | 24 +++--- src/logic/BlocksController.hpp | 8 +- src/logic/ChunksController.cpp | 28 +++---- src/logic/ChunksController.hpp | 2 +- src/logic/CommandsInterpreter.cpp | 4 +- src/logic/CommandsInterpreter.hpp | 2 +- src/logic/EngineController.cpp | 32 ++++---- src/logic/LevelController.cpp | 16 ++-- src/logic/PlayerController.cpp | 38 +++++----- src/logic/PlayerController.hpp | 2 +- src/logic/scripting/lua/lib__rigidbody.cpp | 2 +- src/logic/scripting/lua/lib__skeleton.cpp | 2 +- src/logic/scripting/lua/libaudio.cpp | 4 +- src/logic/scripting/lua/libblock.cpp | 18 ++--- src/logic/scripting/lua/libcamera.cpp | 6 +- src/logic/scripting/lua/libconsole.cpp | 6 +- src/logic/scripting/lua/libcore.cpp | 24 +++--- src/logic/scripting/lua/libentity.cpp | 18 ++--- src/logic/scripting/lua/libentity.hpp | 8 +- src/logic/scripting/lua/libfile.cpp | 10 +-- src/logic/scripting/lua/libgui.cpp | 34 ++++----- src/logic/scripting/lua/libhud.cpp | 28 +++---- src/logic/scripting/lua/libinput.cpp | 14 ++-- src/logic/scripting/lua/libinventory.cpp | 10 +-- src/logic/scripting/lua/libitem.cpp | 4 +- src/logic/scripting/lua/libjson.cpp | 4 +- src/logic/scripting/lua/libpack.cpp | 14 ++-- src/logic/scripting/lua/libplayer.cpp | 12 +-- src/logic/scripting/lua/libtime.cpp | 4 +- src/logic/scripting/lua/libtoml.cpp | 4 +- src/logic/scripting/lua/libworld.cpp | 12 +-- src/logic/scripting/lua/lua_commons.cpp | 2 +- src/logic/scripting/lua/lua_commons.hpp | 6 +- src/logic/scripting/lua/lua_engine.cpp | 4 +- src/logic/scripting/lua/lua_engine.hpp | 6 +- src/logic/scripting/lua/lua_extensions.cpp | 2 +- src/logic/scripting/lua/lua_util.cpp | 2 +- src/logic/scripting/scripting.cpp | 36 ++++----- src/logic/scripting/scripting.hpp | 6 +- src/logic/scripting/scripting_functional.cpp | 6 +- src/logic/scripting/scripting_functional.hpp | 6 +- src/logic/scripting/scripting_hud.cpp | 10 +-- src/logic/scripting/scripting_hud.hpp | 2 +- src/maths/fastmaths.hpp | 2 +- src/maths/rays.cpp | 2 +- src/maths/rays.hpp | 4 +- src/maths/voxmaths.hpp | 2 +- src/objects/Entities.cpp | 30 ++++---- src/objects/Entities.hpp | 8 +- src/objects/EntityDef.hpp | 6 +- src/objects/Player.cpp | 16 ++-- src/objects/Player.hpp | 10 +-- src/objects/rigging.cpp | 10 +-- src/objects/rigging.hpp | 2 +- src/physics/Hitbox.hpp | 4 +- src/physics/PhysicsSolver.cpp | 8 +- src/physics/PhysicsSolver.hpp | 4 +- src/settings.hpp | 6 +- src/util/BufferPool.hpp | 2 +- src/util/RunnablesList.hpp | 4 +- src/util/ThreadPool.hpp | 6 +- src/util/command_line.cpp | 2 +- src/util/data_io.hpp | 2 +- src/util/platform.cpp | 2 +- src/util/stringutil.hpp | 2 +- src/util/timeutil.hpp | 2 +- src/voxel_engine.cpp | 14 ++-- src/voxels/Block.cpp | 4 +- src/voxels/Block.hpp | 6 +- src/voxels/Chunk.cpp | 6 +- src/voxels/Chunk.hpp | 4 +- src/voxels/Chunks.cpp | 24 +++--- src/voxels/Chunks.hpp | 2 +- src/voxels/ChunksStorage.cpp | 20 ++--- src/voxels/ChunksStorage.hpp | 4 +- src/voxels/DefaultWorldGenerator.cpp | 10 +-- src/voxels/DefaultWorldGenerator.hpp | 2 +- src/voxels/FlatWorldGenerator.cpp | 4 +- src/voxels/FlatWorldGenerator.hpp | 2 +- src/voxels/VoxelsVolume.hpp | 4 +- src/voxels/WorldGenerator.cpp | 2 +- src/voxels/WorldGenerator.hpp | 2 +- src/voxels/voxel.hpp | 2 +- src/window/Events.cpp | 10 +-- src/window/Events.hpp | 2 +- src/window/Window.cpp | 10 +-- src/window/Window.hpp | 2 +- src/window/input.hpp | 2 +- src/world/Level.cpp | 28 +++---- src/world/Level.hpp | 2 +- src/world/LevelEvents.cpp | 2 +- src/world/World.cpp | 22 +++--- src/world/World.hpp | 10 +-- src/world/WorldGenerators.cpp | 6 +- src/world/WorldGenerators.hpp | 2 +- 233 files changed, 1028 insertions(+), 1028 deletions(-) diff --git a/src/assets/Assets.hpp b/src/assets/Assets.hpp index a3b689e7..c6af22ed 100644 --- a/src/assets/Assets.hpp +++ b/src/assets/Assets.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include "graphics/core/TextureAnimation.hpp" class Assets; diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index d4b6d5ed..9a570fc2 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -4,19 +4,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "coders/imageio.hpp" +#include "constants.hpp" +#include "content/Content.hpp" +#include "content/ContentPack.hpp" +#include "data/dynamic.hpp" +#include "debug/Logger.hpp" +#include "files/engine_paths.hpp" +#include "files/files.hpp" +#include "graphics/core/Texture.hpp" +#include "logic/scripting/scripting.hpp" +#include "objects/rigging.hpp" +#include "util/ThreadPool.hpp" +#include "voxels/Block.hpp" #include "Assets.hpp" #include "assetload_funcs.hpp" diff --git a/src/assets/AssetsLoader.hpp b/src/assets/AssetsLoader.hpp index 38db983b..f8b0e7c6 100644 --- a/src/assets/AssetsLoader.hpp +++ b/src/assets/AssetsLoader.hpp @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include "delegates.hpp" +#include "interfaces/Task.hpp" +#include "typedefs.hpp" #include "Assets.hpp" namespace dynamic { diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index e64687e5..97107862 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -4,25 +4,25 @@ #include #include -#include