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

From Daniel Sjölie, for the purpose of maintainability, made the load proxy nodes code the standard, remove the older

Browse Source 
code that remained as part of #else #endif blocks, and remove the erroneous
implementation of caching of proxynodes.
This commit is contained in:
Robert Osfield
2005-05-17 13:34:04 +00:00
parent 9717fcd3a5
commit 9c27121f77
1 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2487,19 +2487,6 @@ osg::Group* ConvertFromFLT::visitExternal(osg::Group& osgParent, ExternalRecord*
//Path for Nested external references
osgDB::ReaderWriter::Options *options = pFile->getOptions();
#ifdef USE_PROXYNODE_FOR_EXTERNAL_FILES
if(options->getObjectCacheHint() & osgDB::ReaderWriter::Options::CACHE_ARCHIVES)
{
external = dynamic_cast<osg::Group*> (osgDB::Registry::instance()->getFromObjectCache(rec->getFilename()));
if(external)
{
osg::Group *tempParent = visitAncillary(osgParent, *external, rec);
tempParent->addChild(external);
return external;
}
}
#endif
osgDB::FilePathList& fpl = options->getDatabasePathList();
const std::string& filePath = osgDB::getFilePath(rec->getFilename());
std::string pushAndPopPath;
@@ -2520,8 +2507,6 @@ osg::Group* ConvertFromFLT::visitExternal(osg::Group& osgParent, ExternalRecord*
external = pFile->convert();
if (external)
{
osg::Group *tempParent = visitAncillary(osgParent, *external, rec);
// In the situation in which only one model is required from an
// externally referenced file, it would be more efficient to only
// convert that one model from the FltFile records. (This would be
@@ -2537,17 +2522,12 @@ osg::Group* ConvertFromFLT::visitExternal(osg::Group& osgParent, ExternalRecord*
std::string modelName = rec->getModelName();
if ( modelName.empty() )
{
#ifdef USE_PROXYNODE_FOR_EXTERNAL_FILES
// Add the entire externally referenced file
osg::ProxyNode *proxynode = new osg::ProxyNode;
proxynode->setCenterMode(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER);
proxynode->addChild(external, rec->getFilename());
osg::Group *tempParent = visitAncillary(osgParent, *proxynode, rec);
tempParent->addChild(proxynode);
if(options->getObjectCacheHint() & osgDB::ReaderWriter::Options::CACHE_ARCHIVES)
osgDB::Registry::instance()->addEntryToObjectCache(rec->getFilename(), proxynode);
#else
tempParent->addChild(external);
#endif
}
else
{
@@ -2558,16 +2538,11 @@ osg::Group* ConvertFromFLT::visitExternal(osg::Group& osgParent, ExternalRecord*
osg::Node *model = findExternalModelVisitor.getModel();
if (model)
{
#ifdef USE_PROXYNODE_FOR_EXTERNAL_FILES
osg::ProxyNode *proxynode = new osg::ProxyNode;
proxynode->setCenterMode(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER);
proxynode->addChild(model, rec->getFilename());
osg::Group *tempParent = visitAncillary(osgParent, *proxynode, rec);
tempParent->addChild(proxynode);
if(options->getObjectCacheHint() & osgDB::ReaderWriter::Options::CACHE_ARCHIVES)
osgDB::Registry::instance()->addEntryToObjectCache(rec->getFilename(), proxynode);
#else
//tempParent->addChild(model);
#endif
}
else
{