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

Removed unneccessary compound name usage

Browse Source
This commit is contained in:
Robert Osfield
2008-09-10 16:17:17 +00:00
parent 898a0c11c2
commit ed4bd41574
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/osgTerrain/ImageLayer.cpp
View File

@@ -33,15 +33,12 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
if (fr.matchSequence("file %w") || fr.matchSequence("file %s")) if (fr.matchSequence("file %w") || fr.matchSequence("file %s"))
{ {
std::string setname; std::string filename = fr[1].getStr();
std::string filename;
osgTerrain::extractSetNameAndFileName(fr[1].getStr(),setname, filename);
if (!filename.empty()) if (!filename.empty())
{ {
osg::ref_ptr<osg::Image> image = fr.readImage(filename.c_str()); osg::ref_ptr<osg::Image> image = fr.readImage(filename.c_str());
if (image.valid()) if (image.valid())
{ {
layer.setName(setname);
layer.setFileName(filename); layer.setFileName(filename);
layer.setImage(image.get()); layer.setImage(image.get());
} }
@@ -61,8 +58,7 @@ bool ImageLayer_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
if (!layer.getFileName().empty()) if (!layer.getFileName().empty())
{ {
std::string str = osgTerrain::createCompondSetNameAndFileName(layer.getName(), layer.getFileName()); fw.indent()<<"file "<< layer.getFileName() << std::endl;
fw.indent()<<"file "<< str << std::endl;
} }
return true; return true;