TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finally fix that nasty transformation bug in the P1 collada converter

Browse Source
This commit is contained in:
rdb 2010-08-24 14:12:03 +00:00
parent 6cb48a06bc
commit eb577633fa
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandatool/src/daeegg/daeToEggConverter.cxx
View File

@ -662,21 +662,5 @@ LMatrix4d DAEToEggConverter::convert_matrix(const FMMatrix44& matrix) {
void DAEToEggConverter::apply_transform(const PT(EggGroup) to, const FCDTransform* from) { void DAEToEggConverter::apply_transform(const PT(EggGroup) to, const FCDTransform* from) {
assert(from != NULL); assert(from != NULL);
assert(to != NULL); assert(to != NULL);
switch (from->GetType()) { to->set_transform3d(convert_matrix(from->ToMatrix()) * to->get_transform3d());
case FCDTransform::TRANSLATION:
to->add_translate3d(TO_VEC3(((FCDTTranslation*) from)->GetTranslation()));
break;
case FCDTransform::ROTATION:
to->add_rotate3d(((FCDTRotation*) from)->GetAngle(), TO_VEC3(((FCDTRotation*) from)->GetAxis()));
break;
case FCDTransform::SCALE:
to->add_scale3d(TO_VEC3(((FCDTScale*) from)->GetScale()));
break;
case FCDTransform::MATRIX:
to->add_matrix4(convert_matrix(((FCDTMatrix*) from)->GetTransform()));
break;
default:
// We don't know this, so let FCollada convert it into a matrix
to->add_matrix4(convert_matrix(from->ToMatrix()));
}
} }