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

From Alberto Farre, fix to nested OpenFlight file problem.

Browse Source
This commit is contained in:
Robert Osfield 2005-02-14 15:17:20 +00:00
parent 1b805f7bdb
commit 1223e4c8ca
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/osgPlugins/flt/FltFile.cpp
View File

@ -240,44 +240,36 @@ bool FltFile::readFile(const std::string& fileName)
#endif #endif
pExternalFltFile = registerFLT ? Registry::instance()->getFltFile(filename) : NULL; pExternalFltFile = registerFLT ? Registry::instance()->getFltFile(filename) : NULL;
if (pExternalFltFile == NULL) if (pExternalFltFile == NULL)
{ {
osg::ref_ptr<osgDB::ReaderWriter::Options> options = new osgDB::ReaderWriter::Options; osg::ref_ptr<osgDB::ReaderWriter::Options> options =
_pFltFile->getOptions() ? _pFltFile->getOptions() :
new osgDB::ReaderWriter::Options;
if (_pFltFile->getOptions()) //Path for Nested external references
osgDB::FilePathList& fpl = options->getDatabasePathList();
std::string filePath = osgDB::getFilePath(filename);
std::string pushAndPopPath;
//If absolute path
if( (filePath.length()>0 && filePath.find_first_of("/\\")==0) ||
(filePath.length()>2 && filePath.substr(1,1)==":" && filePath.find_first_of("/\\")==2) )
{ {
options = _pFltFile->getOptions(); pushAndPopPath = filePath;
} }
else else
{ {
options = new osgDB::ReaderWriter::Options; pushAndPopPath = (fpl.empty() ? "." : fpl.back()) + "/" + filePath;
//Path for Nested external references
std::string filePath = osgDB::getFilePath(filename);
std::string pushAndPopPath;
//If absolute path
if( (filePath.length()>0 && filePath.find_first_of("/\\")==0) ||
(filePath.length()>2 && filePath.substr(1,1)==":" && filePath.find_first_of("/\\")==2) )
{
pushAndPopPath = filePath;
}
else
{
osgDB::FilePathList fpl = osgDB::getDataFilePathList();
pushAndPopPath = fpl.empty() ? "." : fpl.front();
pushAndPopPath += "/" + filePath;
}
char optionsString[256];
sprintf(optionsString,"FLT_VER %d",rec.getFlightVersion());
options->setOptionString(optionsString);
osg::notify(osg::NOTICE)<<"Create local path"<<pushAndPopPath<<std::endl;
options->getDatabasePathList().push_back(pushAndPopPath);
} }
char optionsString[256];
sprintf(optionsString,"FLT_VER %d",rec.getFlightVersion());
options->setOptionString(optionsString);
//osg::notify(osg::NOTICE)<<"Create local path"<<pushAndPopPath<<std::endl;
fpl.push_back(pushAndPopPath);
pExternalFltFile = new FltFile( pColorPool, pTexturePool, pMaterialPool, pExternalFltFile = new FltFile( pColorPool, pTexturePool, pMaterialPool,
pLtPtAppearancePool, pLtPtAnimationPool, options.get() ); pLtPtAppearancePool, pLtPtAnimationPool, options.get() );