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

From Julian Ortiz, fix to OpenFlight loader so that it handlers OpenFlight

Browse Source 
switches in a more appropriate way.
This commit is contained in:
Robert Osfield 2003-09-15 15:03:30 +00:00
parent 3ae5b72030
commit 79b87c933e
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/osgPlugins/flt/flt2osg.cpp
View File

@ -978,34 +978,42 @@ osg::Group* ConvertFromFLT::visitSwitch(osg::Group& osgParent, SwitchRecord* rec
osgSwitch->setName(pSSwitch->szIdent); osgSwitch->setName(pSSwitch->szIdent);
visitAncillary(osgParent, *osgSwitch, rec)->addChild( osgSwitch ); visitAncillary(osgParent, *osgSwitch, rec)->addChild( osgSwitch );
visitPrimaryNode(*osgSwitch, (PrimNodeRecord*)rec); osg::ref_ptr<osg::Group> allChildrenGroup = new osg::Group;
visitPrimaryNode(*allChildrenGroup, (PrimNodeRecord*)rec);
unsigned int totalNumChildren = (unsigned int)rec->getNumChildren(); unsigned int totalNumChildren = (unsigned int)rec->getNumChildren();
if (totalNumChildren!=osgSwitch->getNumChildren()) if (totalNumChildren!=allChildrenGroup->getNumChildren())
{ {
// only convert the children we agree on, // only convert the children we agree on,
// however, there could be a chance that ordering of children might // however, there could be a chance that ordering of children might
// be different if there a children that hanvn't mapped across... // be different if there a children that hanvn't mapped across...
if (totalNumChildren>osgSwitch->getNumChildren()) totalNumChildren=osgSwitch->getNumChildren(); if (totalNumChildren>allChildrenGroup->getNumChildren()) totalNumChildren=allChildrenGroup->getNumChildren();
osg::notify(osg::INFO)<<"Warning::OpenFlight loader has come across an incorrectly handled switch."<<std::endl; osg::notify(osg::INFO)<<"Warning::OpenFlight loader has come across an incorrectly handled switch."<<std::endl;
osg::notify(osg::INFO)<<" The number of OpenFlight children ("<<rec->getNumChildren()<<") "<<std::endl; osg::notify(osg::INFO)<<" The number of OpenFlight children ("<<rec->getNumChildren()<<") "<<std::endl;
osg::notify(osg::INFO)<<" exceeds the number converted to OSG ("<<osgSwitch->getNumChildren()<<")"<<std::endl; osg::notify(osg::INFO)<<" exceeds the number converted to OSG ("<<allChildrenGroup->getNumChildren()<<")"<<std::endl;
} }
for(unsigned int nChild=0; nChild<totalNumChildren; nChild++) // for each mask in the FLT Switch node
for (int itMask=0; itMask<pSSwitch->nMasks; ++itMask)
{ {
unsigned int nMaskBit = nChild % 32; // create a osg group node
unsigned int nMaskWord = pSSwitch->nCurrentMask * pSSwitch->nWordsInMask + nChild / 32; osg::ref_ptr<osg::Group> group = new osg::Group;
osgSwitch->addChild( group.get() );
if (nChild<osgSwitch->getNumChildren()) // for each child in the FLT Switch node
for (unsigned itChild=0; itChild<totalNumChildren; ++itChild)
{ {
osgSwitch->setValue(nChild,(pSSwitch->aMask[nMaskWord] & (uint32(1) << nMaskBit))!=0); // test if this child is active in the current mask (itMask)
unsigned int nMaskBit = itChild % 32;
unsigned int nMaskWord = itMask * pSSwitch->nWordsInMask + itChild / 32;
if ( (pSSwitch->aMask[nMaskWord] & (uint32(1) << nMaskBit))!=0 )
{
// add this child in the group
group->addChild( allChildrenGroup->getChild(itChild) );
}
} }
// now the group contain all the childrens that are active in the current mask (itMask)
} }
osgSwitch->setSingleChildOn(pSSwitch->nCurrentMask);
return osgSwitch; return osgSwitch;
} }