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

From Sukender, "Factorized the depth loop ("while ( lastDepth >= _nodePath.size() )...") into a method called updateCurrentDaeNode(). Added missing calls into apply(osg::LightSource &) and daeWriter::apply(osg::Camera &) and daeWriter::apply(osg::CameraView &)"

Browse Source
This commit is contained in:
Robert Osfield
2011-01-19 09:53:34 +00:00
parent 0ed6049390
commit 975aea4a2b
4 changed files with 26 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,14 +62,7 @@ void daeWriter::apply( osg::MatrixTransform &node )
#ifdef _DEBUG
debugPrint( node );
#endif
while ( lastDepth >= _nodePath.size() )
{
//We are not a child of previous node
currentNode = daeSafeCast< domNode >( currentNode->getParentElement() );
lastDepth--;
}
updateCurrentDaeNode();
currentNode = daeSafeCast< domNode >(currentNode->add( COLLADA_ELEMENT_NODE ) );
std::string nodeName = getNodeName(node,"matrixTransform");
currentNode->setId(nodeName.c_str());
@@ -122,13 +115,7 @@ void daeWriter::apply( osg::PositionAttitudeTransform &node )
#ifdef _DEBUG
debugPrint( node );
#endif
while ( lastDepth >= _nodePath.size() )
{
//We are not a child of previous node
currentNode = daeSafeCast< domNode >( currentNode->getParentElement() );
lastDepth--;
}
updateCurrentDaeNode();
currentNode = daeSafeCast< domNode >(currentNode->add( COLLADA_ELEMENT_NODE ) );
std::string nodeName = getNodeName(node,"positionAttitudeTransform");
currentNode->setId(nodeName.c_str());
@@ -192,13 +179,7 @@ void daeWriter::apply( osg::PositionAttitudeTransform &node )
void daeWriter::apply( osg::Transform &node )
{
debugPrint( node );
while ( lastDepth >= _nodePath.size() )
{
// We are not a child of previous node
currentNode = daeSafeCast< domNode >( currentNode->getParentElement() );
lastDepth--;
}
updateCurrentDaeNode();
currentNode = daeSafeCast< domNode >(currentNode->add( COLLADA_ELEMENT_NODE ) );
// If a DOFTransform node store it's data as extra "DOFTransform" data in the "OpenSceneGraph" technique