From 48b2f1f7c4ee3b957970426abbae6138f8e6f390 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sat, 4 May 2019 11:42:54 -0700
Subject: GLTF Loader: fixed couple of issues with animation

---
 AssetLoader/src/GLTFLoader.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'AssetLoader/src/GLTFLoader.cpp')

diff --git a/AssetLoader/src/GLTFLoader.cpp b/AssetLoader/src/GLTFLoader.cpp
index e32210b..2c9b81b 100644
--- a/AssetLoader/src/GLTFLoader.cpp
+++ b/AssetLoader/src/GLTFLoader.cpp
@@ -149,8 +149,7 @@ void Node::Update()
             for (size_t i = 0; i < numJoints; i++)
             {
                 auto* JointNode = Skin->Joints[i];
-                auto JointMat = JointNode->GetMatrix() * Skin->InverseBindMatrices[i];
-                JointMat = InverseTransform * JointMat;
+                auto JointMat = Skin->InverseBindMatrices[i] * JointNode->GetMatrix() * InverseTransform;
                 Mesh->Transforms.jointMatrix[i] = JointMat;
             }
             Mesh->Transforms.jointcount = static_cast<int>(numJoints);
@@ -1044,7 +1043,7 @@ void Model::LoadFromFile(IRenderDevice* pDevice, IDeviceContext* pContext, const
     for (auto* node : LinearNodes)
     {
         // Assign skins
-        if (node->SkinIndex > -1)
+        if (node->SkinIndex >= 0)
         {
             node->Skin = Skins[node->SkinIndex].get();
         }
-- 
cgit v1.2.3