From 9c27121f77210ba005d45962bdae352d2fa87bba Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 17 May 2005 13:34:04 +0000 Subject: [PATCH] =?UTF-8?q?From=20Daniel=20Sj=C3=B6lie,=20for=20the=20purp?= =?UTF-8?q?ose=20of=20maintainability,=20made=20the=20load=20proxy=20nodes?= =?UTF-8?q?=20code=20the=20standard,=20remove=20the=20older=20code=20that?= =?UTF-8?q?=20remained=20as=20part=20of=20#else=20#endif=20blocks,=20and?= =?UTF-8?q?=20remove=20the=20erroneous=20implementation=20of=20caching=20o?= =?UTF-8?q?f=20proxynodes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/osgPlugins/flt/flt2osg.cpp | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/osgPlugins/flt/flt2osg.cpp b/src/osgPlugins/flt/flt2osg.cpp index d389918ef..4328039bf 100644 --- a/src/osgPlugins/flt/flt2osg.cpp +++ b/src/osgPlugins/flt/flt2osg.cpp @@ -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 (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 {