diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-13 02:05:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-13 02:05:33 +0400 |
| commit | 2e8a2f7668e5687a0a9a5087e76eeb739c818b2b (patch) | |
| tree | 75aa5fe8746df4cd369afff88c4fd367cb78f72c /source/blender/collada/TransformWriter.cpp | |
| parent | 46c95d37c6fae2268a7f39f90ef46e9c3c696e3f (diff) | |
style cleanup
Diffstat (limited to 'source/blender/collada/TransformWriter.cpp')
| -rw-r--r-- | source/blender/collada/TransformWriter.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index fbd36cd6613..0d6e3831637 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -47,11 +47,11 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[][4], } double dmat[4][4]; - UnitConverter* converter = new UnitConverter(); + UnitConverter *converter = new UnitConverter(); 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); @@ -59,7 +59,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[][4], void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob) { - /* +#if 0 float rot[3], loc[3], scale[3]; if (ob->parent) { @@ -92,7 +92,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob) } add_transform(node, loc, rot, scale); - */ +#endif /* Using parentinv should allow use of existing curves */ if (ob->parent) { @@ -124,9 +124,11 @@ void TransformWriter::add_node_transform_identity(COLLADASW::Node& node) void TransformWriter::add_transform(COLLADASW::Node& node, float loc[3], float rot[3], float scale[3]) { node.addTranslate("location", loc[0], loc[1], loc[2]); - /*node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2])); +#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.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0])); +#endif node.addRotateZ("rotationZ", RAD2DEGF(rot[2])); node.addRotateY("rotationY", RAD2DEGF(rot[1])); node.addRotateX("rotationX", RAD2DEGF(rot[0])); |