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

Added support for filename only setup of CompositeLayer on reading/writing.

Browse Source
This commit is contained in:
Robert Osfield
2007-11-13 17:03:36 +00:00
parent 91e7550ecf
commit 592d0dfc5b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgPlugins/osgTerrain/Terrain.cpp
View File

@@ -189,8 +189,19 @@ osgTerrain::Layer* readLayer(osgDB::Input& fr, bool& itrAdvanced)
{
osg::notify(osg::INFO)<<"Composite layer "<<fr[0].getStr()<<std::endl;
bool localAdvanced = false;
osgTerrain::Layer* layer = readLayer(fr, localAdvanced);
if (layer) cl->addLayer(layer);
if (fr.matchSequence("file %s") || fr.matchSequence("file %w") )
{
cl->addLayer(fr[1].getStr());
fr += 2;
localAdvanced = true;
}
else
{
osgTerrain::Layer* layer = readLayer(fr, localAdvanced);
if (layer) cl->addLayer(layer);
}
if (!localAdvanced) ++fr;
}
@@ -567,7 +578,7 @@ bool writeLayer(const osgTerrain::Layer& layer, osgDB::Output& fw)
}
else if (!compositeLayer->getFileName(i).empty())
{
fw.indent()<<"image "<<compositeLayer->getFileName(i)<<std::endl;
fw.indent()<<"file "<<compositeLayer->getFileName(i)<<std::endl;
}
}
fw.moveOut();