Merge branch 'Weapons' into TeamPickCamera

2016-03-04 08:34:27 +01:00
parent 03843774d7 177667eef5
commit 7a2f1ac9fd
39 changed files with 12597 additions and 1139 deletions
@@ -12,7 +12,7 @@
 #include "Rendering/EAutoAnimationBlend.h"
 #include "../Core/EntityWrapper.h"
 #include "Rendering/AutoBlendQueue.h"
-
+#include "../Input/EInputCommand.h"
 #include "imgui/imgui.h"

 class AnimationSystem : public ImpureSystem
@@ -28,7 +28,6 @@ private:

    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
-
    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };

@@ -77,6 +77,9 @@ public:
    std::map<int, Skeleton::PoseData> BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose);
    void GetFinalPose(std::map<int, Skeleton::PoseData>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
    
+    std::vector<glm::mat4> GetTPose();
+
+
    std::map<std::string, Animation> Animations;
 private:
    Skeleton::PoseData GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);