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

From Ulrich Hertlein, "attached are patches to osgTerrain that fix some typos and add a bit of documentation.

Browse Source 
"
This commit is contained in:
Robert Osfield
2010-12-08 10:34:29 +00:00
parent ebeed76643
commit 3d67b7a7eb
4 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgTerrain/Layer.cpp
View File

@@ -45,7 +45,7 @@ void osgTerrain::extractSetNameAndFileName(const std::string& compoundstring, st
filename = compoundstring.substr(secondcolonpos+1, std::string::npos);
}
std::string osgTerrain::createCompondSetNameAndFileName(const std::string& setname, const std::string& filename)
std::string osgTerrain::createCompoundSetNameAndFileName(const std::string& setname, const std::string& filename)
{
if (setname.empty()) return filename;
return std::string("set:")+setname+std::string(":")+filename;
@@ -620,7 +620,7 @@ void CompositeLayer::setCompoundName(unsigned int i, const std::string& compound
std::string CompositeLayer::getCompoundName(unsigned int i) const
{
return createCompondSetNameAndFileName(_layers[i].setname, _layers[i].filename);
return createCompoundSetNameAndFileName(_layers[i].setname, _layers[i].filename);
}
void CompositeLayer::addLayer(const std::string& compoundname)

2
src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp
View File

@@ -68,7 +68,7 @@ bool HeightFieldLayer_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
if (!layer.getFileName().empty())
{
std::string str = osgTerrain::createCompondSetNameAndFileName(layer.getName(), layer.getFileName());
std::string str = osgTerrain::createCompoundSetNameAndFileName(layer.getName(), layer.getFileName());
fw.indent()<<"file "<< str << std::endl;
}
else