move rigging to src/animation

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"
 

src/assets/assetload_funcs.cpp

@@ -1,13 +1,11 @@
 #include "assetload_funcs.hpp"
 
-#include <array>
-#include <filesystem>
-#include <iostream>
-#include <stdexcept>
-
+#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 <array>
+#include <filesystem>
+#include <iostream>
+#include <stdexcept>
 
 static debug::Logger logger("assetload-funcs");
 

src/coders/vcm.hpp

@@ -1,13 +1,12 @@
 #pragma once
 
-#include <memory>
+#include "animation/rigging.hpp"
+#include "graphics/commons/Model.hpp"
+
 #include <string>
 #include <optional>
 #include <unordered_map>
 
-#include "graphics/commons/Model.hpp"
-#include "objects/rigging.hpp"
-
 namespace rigging {
     class SkeletonConfig;
 }

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";

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 <glm/ext.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
-#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(

src/graphics/render/NamedSkeletons.cpp

@@ -1,6 +1,6 @@
 #include "NamedSkeletons.hpp"
 
-#include "objects/rigging.hpp"
+#include "animation/rigging.hpp"
 
 using namespace rigging;
 

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"

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"

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 <set>

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 <entt/entity/registry.hpp>

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 <entt/entt.hpp>
 

src/objects/Player.cpp

@@ -1,27 +1,28 @@
 #include "Player.hpp"
 
-#include <algorithm>
 #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 <algorithm>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <utility>
 
-#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;