Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix smd animation mess

Browse Source 
aiMatrix4x4t<TReal>::FromEulerAnglesXYZ modified to row order
This commit is contained in:
wxyu
2018-11-29 10:48:13 +08:00
parent ef151b4610
commit 8c2e975508
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/SMDLoader.cpp
View File

@@ -558,7 +558,8 @@ void SMDImporter::CreateOutputAnimations()
pRotKeys->mTime = pVecKeys->mTime = (*qq).dTime;
// compute the rotation quaternion from the euler angles
pRotKeys->mValue = aiQuaternion( (*qq).vRot.x, (*qq).vRot.y, (*qq).vRot.z );
// aiQuaternion: The order of the parameters is yzx?
pRotKeys->mValue = aiQuaternion( (*qq).vRot.y, (*qq).vRot.z, (*qq).vRot.x );
pVecKeys->mValue = (*qq).vPos;
++pVecKeys; ++pRotKeys;
@@ -987,7 +988,7 @@ void SMDImporter::ParseSkeletonElement(const char* szCurrent,
mTemp.a4 = vPos.x;
mTemp.b4 = vPos.y;
mTemp.c4 = vPos.z;
key.matrix = key.matrix * mTemp;
key.matrix = mTemp * key.matrix;
}
key.vPos = vPos;
key.vRot = vRot;