griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: Collada Matrixdata Importer tried to fix rotations where nothing was to fix. The matrixdata import is now only doing a matrix decompose and then pplies the decomposed values to 3 trans-, 3 scale- and 4 rot-curves)

Browse Source
This commit is contained in:
Gaia Clary
2018-02-27 17:02:37 +01:00
parent 148e2ace61
commit d1f0bdd337
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/collada/AnimationImporter.cpp
View File

@@ -764,7 +764,6 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
axis = i - 7;
}
if (is_joint)
BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, tm_str);
else
@@ -780,8 +779,8 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
std::vector<float>::iterator it;
float qref[4];
unit_qt(qref);
//float qref[4];
//unit_qt(qref);
// sample values at each frame
for (it = frames.begin(); it != frames.end(); it++) {
@@ -817,17 +816,7 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
}
float rot[4], loc[3], scale[3];
bc_rotate_from_reference_quat(rot, qref, mat);
copy_qt_qt(qref, rot);
#if 0
for (int i = 0 ; i < 4; i++) {
rot[i] = RAD2DEGF(rot[i]);
}
#endif
copy_v3_v3(loc, mat[3]);
mat4_to_size(scale, mat);
mat4_decompose(loc, rot, scale, mat);
// add keys
for (int i = 0; i < totcu; i++) {
@@ -1854,12 +1843,7 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
}
fcurve_is_used(*it);
}
COLLADAFW::Matrix tm(matrix);
dae_matrix_to_mat4(&tm, mat);
std::vector<FCurve *>::iterator it;
unit_converter->dae_matrix_to_mat4_(mat, matrix);
return true;
}
}