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

From Alberto Farre, added support for nesting of files.

Browse Source
This commit is contained in:
Robert Osfield
2003-11-25 10:32:23 +00:00
parent bd686c4598
commit 689e11693a
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,8 +115,8 @@ bool FltFile::readModel(const std::string& fileName)
bool FltFile::readFile(const std::string& fileName)
{
FileInput fin;
FileInput fin;
if (!fin.open(fileName))
{
// havn't found file, look in OSGFILEPATH
@@ -195,7 +195,26 @@ bool FltFile::readFile(const std::string& fileName)
pExternalFltFile = Registry::instance()->getFltFile(filename);
if (pExternalFltFile == NULL)
{
pExternalFltFile = new FltFile(pColorPool, pTexturePool, pMaterialPool);
//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();
if(pushAndPopPath.empty()) pushAndPopPath = ".";
pushAndPopPath += "/" + filePath;
}
osgDB::PushAndPopDataPath tmpfile(pushAndPopPath);
pExternalFltFile = new FltFile(pColorPool, pTexturePool, pMaterialPool);
pExternalFltFile->readModel(filename);
}
Registry::instance()->addFltFile(filename, pExternalFltFile);