diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/TransformWriter.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/TransformWriter.cpp')
-rw-r--r-- | source/blender/collada/TransformWriter.cpp | 194 |
1 files changed, 97 insertions, 97 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index 7b5356d2dce..8ebf529cc25 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -18,7 +18,6 @@ * \ingroup collada */ - #include "BLI_math.h" #include "BLI_sys_types.h" @@ -26,125 +25,126 @@ #include "TransformWriter.h" -void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[4][4], float parent_mat[4][4], bool limit_precision) +void TransformWriter::add_node_transform(COLLADASW::Node &node, + float mat[4][4], + float parent_mat[4][4], + bool limit_precision) { - float loc[3], rot[3], scale[3]; - float local[4][4]; - - if (parent_mat) { - float invpar[4][4]; - invert_m4_m4(invpar, parent_mat); - mul_m4_m4m4(local, invpar, mat); - } - else { - copy_m4_m4(local, mat); - } - - double dmat[4][4]; - UnitConverter *converter = new UnitConverter(); - converter->mat4_to_dae_double(dmat, local); - delete converter; - - bc_decompose(local, loc, rot, NULL, scale); - - if (node.getType() == COLLADASW::Node::JOINT) { - // XXX Why are joints handled differently ? - node.addMatrix("transform", dmat); - } - else { - add_transform(node, loc, rot, scale); - } + float loc[3], rot[3], scale[3]; + float local[4][4]; + + if (parent_mat) { + float invpar[4][4]; + invert_m4_m4(invpar, parent_mat); + mul_m4_m4m4(local, invpar, mat); + } + else { + copy_m4_m4(local, mat); + } + + double dmat[4][4]; + UnitConverter *converter = new UnitConverter(); + converter->mat4_to_dae_double(dmat, local); + delete converter; + + bc_decompose(local, loc, rot, NULL, scale); + + if (node.getType() == COLLADASW::Node::JOINT) { + // XXX Why are joints handled differently ? + node.addMatrix("transform", dmat); + } + else { + add_transform(node, loc, rot, scale); + } } -void TransformWriter::add_node_transform_ob( - COLLADASW::Node& node, - Object *ob, - BC_export_transformation_type transformation_type, - bool limit_precision) +void TransformWriter::add_node_transform_ob(COLLADASW::Node &node, + Object *ob, + BC_export_transformation_type transformation_type, + bool limit_precision) { #if 0 - float rot[3], loc[3], scale[3]; + float rot[3], loc[3], scale[3]; - if (ob->parent) { - float C[4][4], tmat[4][4], imat[4][4], mat[4][4]; + if (ob->parent) { + float C[4][4], tmat[4][4], imat[4][4], mat[4][4]; - // factor out scale from obmat + // factor out scale from obmat - copy_v3_v3(scale, ob->scale); + copy_v3_v3(scale, ob->scale); - ob->scale[0] = ob->scale[1] = ob->scale[2] = 1.0f; - BKE_object_to_mat4(ob, C); - copy_v3_v3(ob->scale, scale); + ob->scale[0] = ob->scale[1] = ob->scale[2] = 1.0f; + BKE_object_to_mat4(ob, C); + copy_v3_v3(ob->scale, scale); - mul_m4_series(tmat, ob->parent->obmat, ob->parentinv, C); + mul_m4_series(tmat, ob->parent->obmat, ob->parentinv, C); - // calculate local mat + // calculate local mat - invert_m4_m4(imat, ob->parent->obmat); - mul_m4_m4m4(mat, imat, tmat); + invert_m4_m4(imat, ob->parent->obmat); + mul_m4_m4m4(mat, imat, tmat); - // done + // done - mat4_to_eul(rot, mat); - copy_v3_v3(loc, mat[3]); - } - else { - copy_v3_v3(loc, ob->loc); - copy_v3_v3(rot, ob->rot); - copy_v3_v3(scale, ob->scale); - } + mat4_to_eul(rot, mat); + copy_v3_v3(loc, mat[3]); + } + else { + copy_v3_v3(loc, ob->loc); + copy_v3_v3(rot, ob->rot); + copy_v3_v3(scale, ob->scale); + } - add_transform(node, loc, rot, scale); + add_transform(node, loc, rot, scale); #endif - /* Export the local Matrix (relative to the object parent, be it an object, bone or vertex(-tices)) */ - float f_obmat[4][4]; - BKE_object_matrix_local_get(ob, f_obmat); - - switch (transformation_type) { - case BC_TRANSFORMATION_TYPE_MATRIX: - { - UnitConverter converter; - double d_obmat[4][4]; - converter.mat4_to_dae_double(d_obmat, f_obmat); - if (limit_precision) - bc_sanitize_mat(d_obmat, LIMITTED_PRECISION); - node.addMatrix("transform",d_obmat); - break; - } - case BC_TRANSFORMATION_TYPE_TRANSROTLOC: - { - float loc[3], rot[3], scale[3]; - bc_decompose(f_obmat, loc, rot, NULL, scale); - if (limit_precision) { - bc_sanitize_v3(loc, LIMITTED_PRECISION); - bc_sanitize_v3(rot, LIMITTED_PRECISION); - bc_sanitize_v3(scale, LIMITTED_PRECISION); - } - add_transform(node, loc, rot, scale); - break; - } - } - + /* Export the local Matrix (relative to the object parent, be it an object, bone or vertex(-tices)) */ + float f_obmat[4][4]; + BKE_object_matrix_local_get(ob, f_obmat); + + switch (transformation_type) { + case BC_TRANSFORMATION_TYPE_MATRIX: { + UnitConverter converter; + double d_obmat[4][4]; + converter.mat4_to_dae_double(d_obmat, f_obmat); + if (limit_precision) + bc_sanitize_mat(d_obmat, LIMITTED_PRECISION); + node.addMatrix("transform", d_obmat); + break; + } + case BC_TRANSFORMATION_TYPE_TRANSROTLOC: { + float loc[3], rot[3], scale[3]; + bc_decompose(f_obmat, loc, rot, NULL, scale); + if (limit_precision) { + bc_sanitize_v3(loc, LIMITTED_PRECISION); + bc_sanitize_v3(rot, LIMITTED_PRECISION); + bc_sanitize_v3(scale, LIMITTED_PRECISION); + } + add_transform(node, loc, rot, scale); + break; + } + } } -void TransformWriter::add_node_transform_identity(COLLADASW::Node& node) +void TransformWriter::add_node_transform_identity(COLLADASW::Node &node) { - float loc[3] = {0.0f, 0.0f, 0.0f}, scale[3] = {1.0f, 1.0f, 1.0f}, rot[3] = {0.0f, 0.0f, 0.0f}; - add_transform(node, loc, rot, scale); + float loc[3] = {0.0f, 0.0f, 0.0f}, scale[3] = {1.0f, 1.0f, 1.0f}, rot[3] = {0.0f, 0.0f, 0.0f}; + add_transform(node, loc, rot, scale); } -void TransformWriter::add_transform(COLLADASW::Node& node, float loc[3], float rot[3], float scale[3]) +void TransformWriter::add_transform(COLLADASW::Node &node, + float loc[3], + float rot[3], + float scale[3]) { #if 0 - node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2])); - node.addRotateY("rotationY", COLLADABU::Math::Utils::radToDegF(rot[1])); - node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0])); + node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2])); + node.addRotateY("rotationY", COLLADABU::Math::Utils::radToDegF(rot[1])); + node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0])); #endif - node.addTranslate("location", loc[0], loc[1], loc[2]); - node.addRotateZ("rotationZ", RAD2DEGF(rot[2])); - node.addRotateY("rotationY", RAD2DEGF(rot[1])); - node.addRotateX("rotationX", RAD2DEGF(rot[0])); - node.addScale("scale", scale[0], scale[1], scale[2]); - + node.addTranslate("location", loc[0], loc[1], loc[2]); + node.addRotateZ("rotationZ", RAD2DEGF(rot[2])); + node.addRotateY("rotationY", RAD2DEGF(rot[1])); + node.addRotateX("rotationX", RAD2DEGF(rot[0])); + node.addScale("scale", scale[0], scale[1], scale[2]); } |