FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Runway signs: avoid adding empty group without signs.

Browse Source
This commit is contained in:
Mathias Froehlich
2012-05-21 07:18:55 +02:00
parent ffb67f4014
commit 3796ce4d86
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/scene/tgdb/ReaderWriterSTG.cxx
View File

@@ -269,8 +269,7 @@ ReaderWriterSTG::readStgFile(const std::string& absoluteFileName,
}
} else if ( token == "OBJECT_SIGN" ) {
//node = SGMakeSign(staticOptions->getMaterialLib(), name);
signBuilder.addSign(SGGeod::fromDegM(lon, lat, elev), hdg, name);
signBuilder.addSign(SGGeod::fromDegM(lon, lat, elev), hdg, name);
} else {
SG_LOG( SG_TERRAIN, SG_ALERT, absoluteFileName
<< ": Unknown token '" << token << "'" );
@@ -311,7 +310,8 @@ ReaderWriterSTG::readStgFile(const std::string& absoluteFileName,
in >> ::skipeol;
}
group.addChild(signBuilder.getSignsGroup());
if (signBuilder.getSignsGroup())
group.addChild(signBuilder.getSignsGroup());
return has_base;
}

2
simgear/scene/tgdb/apt_signs.cxx
View File

@@ -261,6 +261,8 @@ AirportSignBuilder::AirportSignBuilder(SGMaterialLib* mats, const SGGeod& center
osg::Node* AirportSignBuilder::getSignsGroup()
{
if (0 == d->signsGroup->getNumChildren())
return 0;
return d->signsGroup;
}