From fbb7c844097f2256c807a51b53fc390eb32ac40d Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Tue, 6 Mar 2012 21:14:24 +0100 Subject: [PATCH] scenery: Remove unused argument from runway signs. --- simgear/scene/tgdb/TileEntry.cxx | 4 ++-- simgear/scene/tgdb/apt_signs.cxx | 4 ++-- simgear/scene/tgdb/apt_signs.hxx | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx index 92a6dab4..166da43d 100644 --- a/simgear/scene/tgdb/TileEntry.cxx +++ b/simgear/scene/tgdb/TileEntry.cxx @@ -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 ) { diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx index 80328d23..a1a42ce0 100644 --- a/simgear/scene/tgdb/apt_signs.cxx +++ b/simgear/scene/tgdb/apt_signs.cxx @@ -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 diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx index 8e3718a4..c908be9e 100644 --- a/simgear/scene/tgdb/apt_signs.hxx +++ b/simgear/scene/tgdb/apt_signs.hxx @@ -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 -- 2.39.5