BoneAttachments now working and BlendTrees are created in the AnimationSystem

include/Engine/Rendering/AnimationSystem.h

@@ -9,20 +9,17 @@
 #include "Rendering/Model.h"
 #include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
+#include "Rendering/BlendTree.h"
 
-class AnimationSystem : public PureSystem
+class AnimationSystem : public ImpureSystem
 {
 public:
-    AnimationSystem(SystemParams params)
-        : System(params)
-        , PureSystem("Animation")
-    {
-
-    }
+    AnimationSystem(SystemParams params);
     ~AnimationSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
+    virtual void Update(double dt) override;
 private:
+    void CreateBlendTrees();
+    void UpdateAnimations(double dt);
 
 };
 

include/Engine/Rendering/BlendTree.h

@@ -62,7 +62,7 @@ public:
 
 
     std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
-
+    glm::mat4 GetBoneTransform(int boneID);
 
 
     void PrintTree();
@@ -72,6 +72,8 @@ private:
     Node* m_Root = nullptr;
 
     std::vector<glm::mat4> m_FinalPose;
+    std::map<int, glm::mat4> m_FinalBoneTransforms;
+
     std::vector<glm::mat4> AccumulateFinalPose();
     BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
 

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -8,6 +8,7 @@
 #include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
 #include "Rendering/Skeleton.h"
+#include "Rendering/BlendTree.h"
 
 //Needs to be a higher orderlevel than AnimationSystem
 class BoneAttachmentSystem : public PureSystem

include/Engine/Rendering/ModelJob.h

@@ -125,7 +125,10 @@ struct ModelJob : RenderJob
             if (Skeleton != nullptr) {
                 
                 EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
-                BlendTree = std::shared_ptr<::BlendTree>(new ::BlendTree(entityWrapper, Skeleton));
+
+                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
+                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
+                }
             }
         }
     };

include/Engine/Rendering/Skeleton.h

@@ -6,27 +6,9 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
+#include "../Core/EntityWrapper.h"
 
-//struct Bone
-//{
-//	Bone(std::string name, glm::mat4 offsetMatrix)
-//		: Name(name)
-//		, OffsetMatrix(offsetMatrix)
-//	{ }
-//
-//	~Bone()
-//	{
-//		for (auto kv : Children) {
-//			delete kv.second;
-//		}
-//	}
-//
-//	std::string Name;
-//	glm::mat4 OffsetMatrix;
-//	glm::mat4 LocalMatrix;
-//
-//	std::map<std::string, Bone*> Children;
-//};
+class BlendTree;
 
 class Skeleton
 {
@@ -75,6 +57,8 @@ public:
 
 	std::map<int, Bone*> Bones;
 
+    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+
 	// Attach a new bone to the skeleton
 	// Returns: New bone index
 	int CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix);
@@ -86,13 +70,13 @@ public:
     std::map<int, glm::mat4> BlendPoses(const std::map<int, glm::mat4>& pose1, const std::map<int, glm::mat4>& pose2, float weight);
     std::map<int, glm::mat4> OverridePose(const std::map<int, glm::mat4>& overridePose, const std::map<int, glm::mat4>& targetPose);
     std::map<int, glm::mat4> BlendPoseAdditive(const std::map<int, glm::mat4>& additivePose, const std::map<int, glm::mat4>& targetPose);
-    std::vector<glm::mat4> GetFinalPose(std::map<int, glm::mat4>& boneMatrices);
+    void GetFinalPose(std::map<int, glm::mat4>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
     
     std::map<std::string, Animation> Animations;
 private:
     glm::mat4 GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);
     glm::mat4 GetBonePose(const Bone* bone, const Animation* animation, double time, bool noRootMotion);
-    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix);
+    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix);
     void AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, glm::mat4>& boneMatrices, const Bone* bone);
     void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix);