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

Fixed child object transform issue in exporter: transform written for child objects was local-to-world, now it's local-to-parent.

Browse Source
This commit is contained in:
Chingiz Dyussenov
2009-08-05 06:45:47 +00:00
parent aa7e9f7d78
commit 11a01aedcf
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/collada/DocumentExporter.cpp
View File

@@ -599,11 +599,21 @@ public:
class TransformWriter : protected TransformBase
{
protected:
void add_node_transform(COLLADASW::Node& node, float mat[][4])
void add_node_transform(COLLADASW::Node& node, float mat[][4], float parent_mat[][4])
{
float loc[3], rot[3], size[3];
float local[4][4];
TransformBase::decompose(mat, loc, rot, size);
if (parent_mat) {
float invpar[4][4];
Mat4Invert(invpar, parent_mat);
Mat4MulMat4(local, mat, invpar);
}
else {
Mat4CpyMat4(local, mat);
}
TransformBase::decompose(local, loc, rot, size);
/*
// this code used to create a single <rotate> representing object rotation
@@ -842,7 +852,7 @@ private:
Mat4MulMat4(mat, pchan->pose_mat, ob_arm->obmat);
}
TransformWriter::add_node_transform(node, mat);
TransformWriter::add_node_transform(node, mat, NULL);
}
std::string get_controller_id(Object *ob_arm)
@@ -1179,7 +1189,7 @@ public:
else
Mat4CpyMat4(mat, ob->obmat);
TransformWriter::add_node_transform(node, mat);
TransformWriter::add_node_transform(node, mat, ob->parent ? ob->parent->obmat : NULL);
// <instance_geometry>
if (ob->type == OB_MESH) {