summaryrefslogtreecommitdiffstats
path: root/AssetLoader/src/GLTFLoader.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-05-04 18:42:54 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-05-04 18:42:54 +0000
commit48b2f1f7c4ee3b957970426abbae6138f8e6f390 (patch)
treee8f9e7953cc0dd0af09b8a040ee5a87529a58c87 /AssetLoader/src/GLTFLoader.cpp
parentGLTF loader: fixed loading specular factor (diff)
downloadDiligentTools-48b2f1f7c4ee3b957970426abbae6138f8e6f390.tar.gz
DiligentTools-48b2f1f7c4ee3b957970426abbae6138f8e6f390.zip
GLTF Loader: fixed couple of issues with animation
Diffstat (limited to 'AssetLoader/src/GLTFLoader.cpp')
-rw-r--r--AssetLoader/src/GLTFLoader.cpp5
1 files changed, 2 insertions, 3 deletions
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();
}