]> git.mxchange.org Git - simgear.git/commitdiff
Remove unused SGMakeRunwaySign function.
authorChristian Schmitt <chris@ilovelinux.de>
Thu, 3 May 2012 14:35:47 +0000 (16:35 +0200)
committerChristian Schmitt <chris@ilovelinux.de>
Sat, 5 May 2012 11:39:07 +0000 (13:39 +0200)
simgear/scene/tgdb/ReaderWriterSTG.cxx
simgear/scene/tgdb/apt_signs.cxx
simgear/scene/tgdb/apt_signs.hxx

index f37df129bb5e36c26d2326be8639192c74ec7f07..8dc917d03b7cb0357ad631cbd9fb570ed6977f53 100644 (file)
@@ -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 << "'" );
index a1a42ce0a888eb0ba3e06e08fc9e49a945ec47f0..fda3a9ff9422b8e0b65b5f72bfc765c53fe7a331 100644 (file)
@@ -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;
-}
index c908be9ea79f30ae3c365b1c92f9b18a3bdb7115..17e91d7adfdcd9135c765baaa7b422cb7ab89efe 100644 (file)
@@ -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