v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1834 from assimp/issue_1120 

closes https://github.com/assimp/assimp/issues/1120: use euler angles…
pull/1829/head^2
Kim Kulling 2018-03-14 21:54:37 +01:00 committed by GitHub
parent 58e73143fc 5cf6509fb5
commit 9444935ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/FBXConverter.cpp
View File

@ -643,14 +643,14 @@ void Converter::GenerateTransformationNodeChain( const Model& model, std::vector
if ( ok && PreRotation.SquareLength() > zero_epsilon ) { if ( ok && PreRotation.SquareLength() > zero_epsilon ) {
is_complex = true; is_complex = true;
GetRotationMatrix( rot, PreRotation, chain[ TransformationComp_PreRotation ] ); GetRotationMatrix( Model::RotOrder::RotOrder_EulerXYZ, PreRotation, chain[ TransformationComp_PreRotation ] );
} }
const aiVector3D& PostRotation = PropertyGet<aiVector3D>( props, "PostRotation", ok ); const aiVector3D& PostRotation = PropertyGet<aiVector3D>( props, "PostRotation", ok );
if ( ok && PostRotation.SquareLength() > zero_epsilon ) { if ( ok && PostRotation.SquareLength() > zero_epsilon ) {
is_complex = true; is_complex = true;
GetRotationMatrix( rot, PostRotation, chain[ TransformationComp_PostRotation ] ); GetRotationMatrix( Model::RotOrder::RotOrder_EulerXYZ, PostRotation, chain[ TransformationComp_PostRotation ] );
} }
const aiVector3D& RotationPivot = PropertyGet<aiVector3D>( props, "RotationPivot", ok ); const aiVector3D& RotationPivot = PropertyGet<aiVector3D>( props, "RotationPivot", ok );