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

Fixed bug in ProxyNode write out where non existant children were written out.

Browse Source
This commit is contained in:
Robert Osfield
2005-07-15 09:56:36 +00:00
parent cfac4c74bc
commit 70647b8801
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgPlugins/ive/ProxyNode.cpp
View File

@@ -70,7 +70,8 @@ void ProxyNode::write(DataOutputStream* out)
if (getFileName(i).empty())
{
out->writeString("");
++numChildrenToWriteOut;
if (i<getNumChildren()) ++numChildrenToWriteOut;
}
else
{
@@ -100,20 +101,23 @@ void ProxyNode::write(DataOutputStream* out)
for(i=0; i<getNumFileNames(); i++)
{
if (getFileName(i).empty())
if (i<getNumChildren())
{
out->writeNode(getChild(i));
}
else if(out->getWriteExternalReferenceFiles())
{
if(out->getUseOriginalExternalReferences())
if (getFileName(i).empty())
{
osgDB::writeNodeFile(*getChild(i), getFileName(i));
out->writeNode(getChild(i));
}
else
else if(out->getWriteExternalReferenceFiles())
{
std::string ivename = osgDB::getFilePath(getFileName(i)) +"/"+ osgDB::getStrippedName(getFileName(i)) +".ive";
osgDB::writeNodeFile(*getChild(i), ivename);
if(out->getUseOriginalExternalReferences())
{
osgDB::writeNodeFile(*getChild(i), getFileName(i));
}
else
{
std::string ivename = osgDB::getFilePath(getFileName(i)) +"/"+ osgDB::getStrippedName(getFileName(i)) +".ive";
osgDB::writeNodeFile(*getChild(i), ivename);
}
}
}
}