FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Roland Smeenk, "Attached is a fix for the Collada plugin. A PositionAttitudeTransform wrote its place elements in the wrong order."

Browse Source
This commit is contained in:
Robert Osfield
2009-01-09 12:21:36 +00:00
parent fa499dc55f
commit 1289528770
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgPlugins/dae/daeWTransforms.cpp
View File

@@ -90,13 +90,13 @@ void daeWriter::apply( osg::PositionAttitudeTransform &node )
const osg::Quat &q = node.getAttitude();
const osg::Vec3 &s = node.getScale();
if ( s.x() != 1 || s.y() != 1 || s.z() != 1 )
if ( pos.x() != 0 || pos.y() != 0 || pos.z() != 0 )
{
//make a scale
domScale *scale = daeSafeCast< domScale >( currentNode->add( COLLADA_ELEMENT_SCALE ) );
scale->getValue().append( s.x() );
scale->getValue().append( s.y() );
scale->getValue().append( s.z() );
//make a translate
domTranslate *trans = daeSafeCast< domTranslate >( currentNode->add( COLLADA_ELEMENT_TRANSLATE ) );
trans->getValue().append( pos.x() );
trans->getValue().append( pos.y() );
trans->getValue().append( pos.z() );
}
double angle;
@@ -112,13 +112,13 @@ void daeWriter::apply( osg::PositionAttitudeTransform &node )
rot->getValue().append( osg::RadiansToDegrees(angle) );
}
if ( pos.x() != 0 || pos.y() != 0 || pos.z() != 0 )
if ( s.x() != 1 || s.y() != 1 || s.z() != 1 )
{
//make a translate
domTranslate *trans = daeSafeCast< domTranslate >( currentNode->add( COLLADA_ELEMENT_TRANSLATE ) );
trans->getValue().append( pos.x() );
trans->getValue().append( pos.y() );
trans->getValue().append( pos.z() );
//make a scale
domScale *scale = daeSafeCast< domScale >( currentNode->add( COLLADA_ELEMENT_SCALE ) );
scale->getValue().append( s.x() );
scale->getValue().append( s.y() );
scale->getValue().append( s.z() );
}
writeNodeExtra(node);