From 0bdeaeb4e277e79bb96ebfc24bb40a7a49243580 Mon Sep 17 00:00:00 2001 From: Christian Schmitt Date: Thu, 3 May 2012 16:35:47 +0200 Subject: [PATCH] Remove unused SGMakeRunwaySign function. --- simgear/scene/tgdb/ReaderWriterSTG.cxx | 3 --- simgear/scene/tgdb/apt_signs.cxx | 24 ------------------------ simgear/scene/tgdb/apt_signs.hxx | 4 ---- 3 files changed, 31 deletions(-) diff --git a/simgear/scene/tgdb/ReaderWriterSTG.cxx b/simgear/scene/tgdb/ReaderWriterSTG.cxx index f37df129..8dc917d0 100644 --- a/simgear/scene/tgdb/ReaderWriterSTG.cxx +++ b/simgear/scene/tgdb/ReaderWriterSTG.cxx @@ -261,9 +261,6 @@ ReaderWriterSTG::readStgFile(const std::string& absoluteFileName, } else if ( token == "OBJECT_SIGN" ) { node = SGMakeSign(staticOptions->getMaterialLib(), name); - } else if ( token == "OBJECT_RUNWAY_SIGN" ) { - node = SGMakeRunwaySign(staticOptions->getMaterialLib(), name); - } else { SG_LOG( SG_TERRAIN, SG_ALERT, absoluteFileName << ": Unknown token '" << token << "'" ); diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx index a1a42ce0..fda3a9ff 100644 --- a/simgear/scene/tgdb/apt_signs.cxx +++ b/simgear/scene/tgdb/apt_signs.cxx @@ -41,7 +41,6 @@ #include "apt_signs.hxx" #define SIGN "OBJECT_SIGN: " -#define RWY "OBJECT_RUNWAY_SIGN: " using std::vector; using namespace simgear; @@ -368,26 +367,3 @@ SGMakeSign(SGMaterialLib *matlib, const string& content) return object; } - -osg::Node* -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 - - float width = name.length() / 3.0; - - osg::Vec3 corner(-width, 0, 0.25f); - osg::Vec3 widthVec(2*width + 1, 0, 0); - osg::Vec3 heightVec(0, 0, 1); - osg::Geometry* geometry; - geometry = osg::createTexturedQuadGeometry(corner, widthVec, heightVec); - EffectGeode* geode = new EffectGeode; - geode->setName(name); - geode->addDrawable(geometry); - SGMaterial *mat = matlib->find(name); - if (mat) - geode->setEffect(mat->get_effect()); - - return geode; -} diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx index c908be9e..17e91d7a 100644 --- a/simgear/scene/tgdb/apt_signs.hxx +++ b/simgear/scene/tgdb/apt_signs.hxx @@ -45,8 +45,4 @@ using std::string; osg::Node* SGMakeSign( SGMaterialLib *matlib, const string& content ); -// Generate a runway sign -osg::Node* SGMakeRunwaySign( SGMaterialLib *matlib, const string& name ); - - #endif // _SG_APT_SIGNS_HXX -- 2.39.5