diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-12 02:45:48 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-12 02:45:48 +0400 |
| commit | eb9c3f6aecc982a7377574866110018ca8eb744f (patch) | |
| tree | 86ea638c662fbea129bb0cce4b24c979148a20a0 /source/blender/collada/TransformWriter.cpp | |
| parent | 9307565269055e39cd71bd2c27bc86ad8fc12b96 (diff) | |
[#34062] Collada: fixed redundant transform information and order of creation for the loc/rot/trans
Diffstat (limited to 'source/blender/collada/TransformWriter.cpp')
| -rw-r--r-- | source/blender/collada/TransformWriter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index fb8ba567192..fa813e0b961 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -51,10 +51,10 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[4][4], converter->mat4_to_dae_double(dmat, local); TransformBase::decompose(local, loc, rot, NULL, scale); - if (node.getType() == COLLADASW::Node::JOINT) + //if (node.getType() == COLLADASW::Node::JOINT) node.addMatrix("transform", dmat); - else - add_transform(node, loc, rot, scale); + //else + //add_transform(node, loc, rot, scale); } void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob) @@ -115,7 +115,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob) double d_obmat[4][4]; converter.mat4_to_dae_double(d_obmat, ob->obmat); node.addMatrix("transform",d_obmat); - add_transform(node, ob->loc, ob->rot, ob->size); + //add_transform(node, ob->loc, ob->rot, ob->size); } void TransformWriter::add_node_transform_identity(COLLADASW::Node& node) @@ -131,10 +131,10 @@ void TransformWriter::add_transform(COLLADASW::Node& node, float loc[3], float r 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]); } |