AdditiveBlend now working, needs cleanup

This commit is contained in:
viktorljung
2016-02-17 14:55:02 +01:00
parent e7118ce8e5
commit db8bc612bd
3 changed files with 79 additions and 115 deletions
+4 -4
View File
@@ -76,9 +76,9 @@ public:
};
struct JointFrameTransform {
glm::vec3 PositionInterp = glm::vec3(0);
glm::quat RotationInterp = glm::quat();
glm::vec3 ScaleInterp = glm::vec3(0);
glm::vec3 Position = glm::vec3(0);
glm::quat Rotation = glm::quat();
glm::vec3 Scale = glm::vec3(0);
float Weight;
};
@@ -108,7 +108,7 @@ public:
void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
glm::mat4 AdditiveBlend(JointFrameTransform addTransform, JointFrameTransform transform);
glm::mat4 AdditiveBlend(glm::mat4 differencePose, glm::mat4 targetPose);
void PrintSkeleton();
void PrintSkeleton(const Bone* parent, int depthCount);