diff --git a/include/Engine/Rendering/Skeleton.h b/include/Engine/Rendering/Skeleton.h index 21e38d6f..124d618b 100644 --- a/include/Engine/Rendering/Skeleton.h +++ b/include/Engine/Rendering/Skeleton.h @@ -104,7 +104,7 @@ public: std::vector GetFrameBones(std::vector animations, bool noRootMotion = false); std::vector GetFrameBones(std::vector animations, AnimationOffset animationOffset, bool noRootMotion = false); - void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, float time, std::map& boneMatrices, const Bone* bone, glm::mat4 parentMatrix); + //void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, float time, std::map& boneMatrices, const Bone* bone, glm::mat4 parentMatrix); void AccumulateBoneTransforms(bool noRootMotion, std::vector animations, std::map& boneMatrices, const Bone* bone, glm::mat4 parentMatrix); void AccumulateBoneTransforms(bool noRootMotion, std::vector animations, AnimationOffset animationOffset, std::map& boneMatrices, const Bone* bone, glm::mat4 parentMatrix); diff --git a/resources/Schema/Entities/AnimationTests2.xml b/resources/Schema/Entities/AnimationTests2.xml index 3c482c61..68f27045 100644 --- a/resources/Schema/Entities/AnimationTests2.xml +++ b/resources/Schema/Entities/AnimationTests2.xml @@ -17,7 +17,7 @@ - Models/DirectionalLightWidget.mesh + Models/Widgets/Lights/DirectionalLightWidget.mesh @@ -31,21 +31,21 @@ Run 0.5 - 0.052207647453917483 + 0.44037772975435119 1 1 - Strafe Right + StrafeRight 0.5 - 0.90342197388335332 - Reload Switch - 0.11766622175243757 + 0.62650761653875175 + ReloadSwitch + 0.88913372073808805 1 - Aim + AimRifle - Models/Characters/Assault/HelloCube.mesh + Models/Characters/Assault/AssaultAnimations.mesh true @@ -53,23 +53,7 @@ - - - - - R_Arm_Weapon_Joint - - - Models/WepTest.mesh - - - - - - - - - + diff --git a/src/Engine/Rendering/Skeleton.cpp b/src/Engine/Rendering/Skeleton.cpp index 7f2f752f..f272f14d 100644 --- a/src/Engine/Rendering/Skeleton.cpp +++ b/src/Engine/Rendering/Skeleton.cpp @@ -80,6 +80,7 @@ std::vector Skeleton::GetFrameBones(std::vector animat } return finalMatrices; } +/* void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, float time, std::map& boneMatrices, const Bone* bone, glm::mat4 parentMatrix) { @@ -153,6 +154,7 @@ void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation* anim AccumulateBoneTransforms(noRootMotion, animation, time, boneMatrices, child, boneMatrix); } } +*/ void Skeleton::AccumulateBoneTransforms(bool noRootMotion, std::vector animations, std::map& boneMatrices, const Bone* bone, glm::mat4 parentMatrix) {