Page MenuHome
Differential D16328 Diff 57159 source/blender/io/collada/AnimationImporter.cpp

Changeset View

Standalone View

View Options

source/blender/io/collada/AnimationImporter.cpp

Show First 20 Lines • Show All 326 Lines • ▼ Show 20 Lines#endif
return true; return true;
} }
void AnimationImporter::read_node_transform(COLLADAFW::Node *node, Object *ob) void AnimationImporter::read_node_transform(COLLADAFW::Node *node, Object *ob)
{ {
float mat[4][4]; float mat[4][4];
TransformReader::get_node_mat(mat, node, &uid_animated_map, ob); TransformReader::get_node_mat(mat, node, &uid_animated_map, ob);
if (ob) { if (ob) {
copy_m4_m4(ob->obmat, mat); copy_m4_m4(ob->object_to_world, mat);
BKE_object_apply_mat4(ob, ob->obmat, false, false); BKE_object_apply_mat4(ob, ob->object_to_world, false, false);
} }
} }
#if 0 #if 0
virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act) virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
{ {
bActionGroup *grp; bActionGroup *grp;
int i; int i;
▲ Show 20 Lines • Show All 1,747 Lines • ▼ Show 20 Lines if (joint_objects.find(node->getUniqueId()) == joint_objects.end()) {
job->rotmode = ROT_MODE_QUAT; job->rotmode = ROT_MODE_QUAT;
float mat[4][4]; float mat[4][4];
get_joint_rest_mat(mat, root, node); get_joint_rest_mat(mat, root, node);
if (par_job) { if (par_job) {
float temp[4][4], ipar[4][4]; float temp[4][4], ipar[4][4];
invert_m4_m4(ipar, par_job->obmat); invert_m4_m4(ipar, par_job->object_to_world);
copy_m4_m4(temp, mat); copy_m4_m4(temp, mat);
mul_m4_m4m4(mat, ipar, temp); mul_m4_m4m4(mat, ipar, temp);
} }
bc_decompose(mat, job->loc, NULL, job->quat, job->scale); bc_decompose(mat, job->loc, NULL, job->quat, job->scale);
if (par_job) { if (par_job) {
job->parent = par_job; job->parent = par_job;
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines