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

scenery: Remove unused argument from runway signs.

Browse Source
This commit is contained in:
Mathias Froehlich 2012-03-06 21:14:24 +01:00
parent a7379c88f4
commit fbb7c84409
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/scene/tgdb/TileEntry.cxx
View File

@ -362,9 +362,9 @@ TileEntry::loadTileByFileName(const string& fileName,
osg::Node *custom_obj = 0;
if (obj->type == OBJECT_SIGN)
custom_obj = SGMakeSign(opt->getMaterialLib(), custom_path.str(), obj->name);
custom_obj = SGMakeSign(opt->getMaterialLib(), obj->name);
else
custom_obj = SGMakeRunwaySign(opt->getMaterialLib(), custom_path.str(), obj->name);
custom_obj = SGMakeRunwaySign(opt->getMaterialLib(), obj->name);
// wire the pieces together
if ( custom_obj != NULL ) {

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

@ -90,7 +90,7 @@ struct pair {
// see $FG_ROOT/Docs/README.scenery
//
osg::Node*
SGMakeSign(SGMaterialLib *matlib, const string& path, const string& content)
SGMakeSign(SGMaterialLib *matlib, const string& content)
{
double sign_height = 1.0; // meter
bool lighted = true;
@ -370,7 +370,7 @@ SGMakeSign(SGMaterialLib *matlib, const string& path, const string& content)
}
osg::Node*
SGMakeRunwaySign(SGMaterialLib *matlib, const string& path, const string& name)
SGMakeRunwaySign(SGMaterialLib *matlib, const string& name)
{
// for demo purposes we assume each element (letter) is 1x1 meter.
// Sign is placed 0.25 meters above the ground

6
simgear/scene/tgdb/apt_signs.hxx
View File

@ -42,13 +42,11 @@ using std::string;
// Generate a generic sign
osg::Node* SGMakeSign( SGMaterialLib *matlib,
const string& path, const string& content );
osg::Node* SGMakeSign( SGMaterialLib *matlib, const string& content );
// Generate a runway sign
osg::Node* SGMakeRunwaySign( SGMaterialLib *matlib,
const string& path, const string& name );
osg::Node* SGMakeRunwaySign( SGMaterialLib *matlib, const string& name );
#endif // _SG_APT_SIGNS_HXX