From f507665c6889f814389674b611970a73a7ee6c3e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 26 Jul 2026 18:55:49 +0300 Subject: [PATCH] move rigging to src/animation --- src/{objects => animation}/rigging.cpp | 0 src/{objects => animation}/rigging.hpp | 0 src/assets/AssetsLoader.cpp | 2 +- src/assets/assetload_funcs.cpp | 22 ++++++------ src/coders/vcm.hpp | 7 ++-- src/content/ContentControl.cpp | 14 ++++---- src/graphics/render/HandsRenderer.cpp | 12 +++---- src/graphics/render/NamedSkeletons.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- .../scripting/lua/libs/lib__skeleton.cpp | 2 +- src/logic/scripting/lua/libs/libentity.cpp | 8 ++--- src/objects/Entities.cpp | 2 +- src/objects/Entity.cpp | 8 ++--- src/objects/Player.cpp | 35 ++++++++++--------- 14 files changed, 58 insertions(+), 58 deletions(-) rename src/{objects => animation}/rigging.cpp (100%) rename src/{objects => animation}/rigging.hpp (100%) diff --git a/src/objects/rigging.cpp b/src/animation/rigging.cpp similarity index 100% rename from src/objects/rigging.cpp rename to src/animation/rigging.cpp diff --git a/src/objects/rigging.hpp b/src/animation/rigging.hpp similarity index 100% rename from src/objects/rigging.hpp rename to src/animation/rigging.hpp diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 23b316e6b..5dfb45b9e 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -1,5 +1,6 @@ #include "AssetsLoader.hpp" +#include "animation/rigging.hpp" #include "assetload_funcs.hpp" #include "Assets.hpp" #include "coders/commons.hpp" @@ -15,7 +16,6 @@ #include "items/ItemDef.hpp" #include "logic/scripting/scripting.hpp" #include "objects/EntityDef.hpp" -#include "objects/rigging.hpp" #include "util/ThreadPool.hpp" #include "voxels/Block.hpp" diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 74a298933..1098c7a51 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -1,13 +1,11 @@ #include "assetload_funcs.hpp" -#include -#include -#include -#include - +#include "animation/rigging.hpp" +#include "Assets.hpp" +#include "AssetsLoader.hpp" #include "audio/audio.hpp" -#include "coders/GLSLExtension.hpp" #include "coders/commons.hpp" +#include "coders/GLSLExtension.hpp" #include "coders/imageio.hpp" #include "coders/json.hpp" #include "coders/obj.hpp" @@ -17,19 +15,21 @@ #include "constants.hpp" #include "debug/Logger.hpp" #include "engine/EnginePaths.hpp" -#include "io/io.hpp" #include "frontend/UiDocument.hpp" +#include "graphics/commons/Model.hpp" #include "graphics/core/Atlas.hpp" #include "graphics/core/Font.hpp" #include "graphics/core/ImageData.hpp" #include "graphics/core/Shader.hpp" #include "graphics/core/Texture.hpp" #include "graphics/core/TextureAnimation.hpp" -#include "graphics/commons/Model.hpp" -#include "objects/rigging.hpp" +#include "io/io.hpp" #include "util/stringutil.hpp" -#include "Assets.hpp" -#include "AssetsLoader.hpp" + +#include +#include +#include +#include static debug::Logger logger("assetload-funcs"); diff --git a/src/coders/vcm.hpp b/src/coders/vcm.hpp index 4f97ea8d3..9c45c2400 100644 --- a/src/coders/vcm.hpp +++ b/src/coders/vcm.hpp @@ -1,13 +1,12 @@ #pragma once -#include +#include "animation/rigging.hpp" +#include "graphics/commons/Model.hpp" + #include #include #include -#include "graphics/commons/Model.hpp" -#include "objects/rigging.hpp" - namespace rigging { class SkeletonConfig; } diff --git a/src/content/ContentControl.cpp b/src/content/ContentControl.cpp index 6daf48dc0..5d74702de 100644 --- a/src/content/ContentControl.cpp +++ b/src/content/ContentControl.cpp @@ -1,16 +1,16 @@ #include "ContentControl.hpp" -#include "io/io.hpp" -#include "engine/EnginePaths.hpp" +#include "animation/rigging.hpp" #include "Content.hpp" -#include "ContentPack.hpp" #include "ContentBuilder.hpp" #include "ContentLoader.hpp" -#include "PacksManager.hpp" -#include "objects/rigging.hpp" -#include "devtools/Project.hpp" -#include "logic/scripting/scripting.hpp" +#include "ContentPack.hpp" #include "core_defs.hpp" +#include "devtools/Project.hpp" +#include "engine/EnginePaths.hpp" +#include "io/io.hpp" +#include "logic/scripting/scripting.hpp" +#include "PacksManager.hpp" static void load_configs(Input* input, const io::path& root) { auto configFolder = root / "config"; diff --git a/src/graphics/render/HandsRenderer.cpp b/src/graphics/render/HandsRenderer.cpp index 8e2f757b2..776365e17 100644 --- a/src/graphics/render/HandsRenderer.cpp +++ b/src/graphics/render/HandsRenderer.cpp @@ -1,14 +1,14 @@ #include "HandsRenderer.hpp" +#include "animation/rigging.hpp" +#include "content/Content.hpp" +#include "graphics/commons/Model.hpp" +#include "ModelBatch.hpp" +#include "window/Camera.hpp" + #include #include -#include "ModelBatch.hpp" -#include "content/Content.hpp" -#include "graphics/commons/Model.hpp" -#include "objects/rigging.hpp" -#include "window/Camera.hpp" - using namespace rigging; HandsRenderer::HandsRenderer( diff --git a/src/graphics/render/NamedSkeletons.cpp b/src/graphics/render/NamedSkeletons.cpp index c30278a9c..c3f681736 100644 --- a/src/graphics/render/NamedSkeletons.cpp +++ b/src/graphics/render/NamedSkeletons.cpp @@ -1,6 +1,6 @@ #include "NamedSkeletons.hpp" -#include "objects/rigging.hpp" +#include "animation/rigging.hpp" using namespace rigging; diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 2e150e1f7..ae19dac76 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -1,5 +1,6 @@ #include "WorldRenderer.hpp" +#include "animation/rigging.hpp" #include "assets/Assets.hpp" #include "assets/assets_util.hpp" #include "content/Content.hpp" @@ -15,7 +16,6 @@ #include "maths/voxmaths.hpp" #include "objects/Entities.hpp" #include "objects/Player.hpp" -#include "objects/rigging.hpp" #include "settings.hpp" #include "voxels/Block.hpp" #include "voxels/Chunk.hpp" diff --git a/src/logic/scripting/lua/libs/lib__skeleton.cpp b/src/logic/scripting/lua/libs/lib__skeleton.cpp index fb70ecbcb..c1cab88db 100644 --- a/src/logic/scripting/lua/libs/lib__skeleton.cpp +++ b/src/logic/scripting/lua/libs/lib__skeleton.cpp @@ -1,6 +1,6 @@ -#include "objects/rigging.hpp" #include "libentity.hpp" +#include "animation/rigging.hpp" #include "engine/Engine.hpp" #include "graphics/render/WorldRenderer.hpp" #include "graphics/render/NamedSkeletons.hpp" diff --git a/src/logic/scripting/lua/libs/libentity.cpp b/src/logic/scripting/lua/libs/libentity.cpp index 110aee123..3d850fdc5 100644 --- a/src/logic/scripting/lua/libs/libentity.cpp +++ b/src/logic/scripting/lua/libs/libentity.cpp @@ -1,20 +1,20 @@ #include "libentity.hpp" +#include "animation/rigging.hpp" #include "assets/Assets.hpp" #include "content/Content.hpp" #include "content/ContentPack.hpp" #include "engine/Engine.hpp" #include "engine/EnginePaths.hpp" #include "objects/Entities.hpp" -#include "objects/EntityDef.hpp" #include "objects/Entity.hpp" -#include "objects/Rigidbody.hpp" +#include "objects/EntityDef.hpp" #include "objects/Player.hpp" -#include "objects/rigging.hpp" +#include "objects/Rigidbody.hpp" #include "physics/Hitbox.hpp" -#include "voxels/Chunks.hpp" #include "voxels/Block.hpp" #include "voxels/blocks_agent.hpp" +#include "voxels/Chunks.hpp" #include "window/Camera.hpp" #include diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index fafd99fe5..9f3e62c72 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -1,6 +1,7 @@ #define VC_ENABLE_REFLECTION #include "Entities.hpp" +#include "animation/rigging.hpp" #include "assets/Assets.hpp" #include "content/Content.hpp" #include "data/dv_util.hpp" @@ -17,7 +18,6 @@ #include "maths/rays.hpp" #include "maths/util.hpp" #include "physics/PhysicsSolver.hpp" -#include "rigging.hpp" #include "world/Level.hpp" #include diff --git a/src/objects/Entity.cpp b/src/objects/Entity.cpp index 6629d2981..9af1ea80b 100644 --- a/src/objects/Entity.cpp +++ b/src/objects/Entity.cpp @@ -1,12 +1,12 @@ #include "Entity.hpp" -#include "Transform.hpp" -#include "Rigidbody.hpp" -#include "ScriptComponents.hpp" +#include "animation/rigging.hpp" #include "Entities.hpp" #include "EntityDef.hpp" -#include "rigging.hpp" #include "logic/scripting/scripting.hpp" +#include "Rigidbody.hpp" +#include "ScriptComponents.hpp" +#include "Transform.hpp" #include diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index c0fe61744..eb9023b0b 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -1,27 +1,28 @@ #include "Player.hpp" -#include #define GLM_ENABLE_EXPERIMENTAL + +#include "animation/rigging.hpp" +#include "content/ContentReport.hpp" +#include "data/dv_util.hpp" +#include "debug/Logger.hpp" +#include "Entities.hpp" +#include "Entity.hpp" +#include "items/Inventory.hpp" +#include "physics/Hitbox.hpp" +#include "physics/PhysicsSolver.hpp" +#include "util/stringutil.hpp" +#include "voxels/Chunks.hpp" +#include "window/Camera.hpp" +#include "world/generator/GeneratorDef.hpp" +#include "world/Level.hpp" +#include "world/World.hpp" + +#include #include #include #include -#include "content/ContentReport.hpp" -#include "items/Inventory.hpp" -#include "Entities.hpp" -#include "Entity.hpp" -#include "rigging.hpp" -#include "physics/Hitbox.hpp" -#include "physics/PhysicsSolver.hpp" -#include "voxels/Chunks.hpp" -#include "window/Camera.hpp" -#include "world/Level.hpp" -#include "world/World.hpp" -#include "world/generator/GeneratorDef.hpp" -#include "data/dv_util.hpp" -#include "debug/Logger.hpp" -#include "util/stringutil.hpp" - static debug::Logger logger("player"); constexpr int SPAWN_ATTEMPTS_PER_UPDATE = 64;