From 62a3a1936ca9a7457d66057669d2776f2a1ceb89 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 26 Feb 2003 21:09:39 +0000
Subject: [PATCH] Rename FGSuperPoly -> TGSuperPoly
---
src/Airports/GenAirports/build.cxx | 4 +-
src/Airports/GenAirports/lights.cxx | 78 ++++++++++++------------
src/Airports/GenAirports/rwy_common.cxx | 2 +-
src/Airports/GenAirports/rwy_nonprec.cxx | 2 +-
src/Airports/GenAirports/rwy_prec.cxx | 2 +-
src/Airports/GenAirports/rwy_simple.cxx | 2 +-
src/Airports/GenAirports/rwy_visual.cxx | 2 +-
src/Airports/GenAirports/taxiway.cxx | 2 +-
src/Lib/Polygon/simple_clip.hxx | 2 +-
src/Lib/Polygon/superpoly.cxx | 6 +-
src/Lib/Polygon/superpoly.hxx | 8 +--
11 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx
index 0c7ca604..cdcfec4c 100644
--- a/src/Airports/GenAirports/build.cxx
+++ b/src/Airports/GenAirports/build.cxx
@@ -532,7 +532,7 @@ void build_airport( string airport_raw, float alt_m,
taxiways.push_back( taxi );
}
- FGSuperPoly sp;
+ TGSuperPoly sp;
FGTexParams tp;
// First pass: generate the precision runways since these have
@@ -1036,7 +1036,7 @@ void build_airport( string airport_raw, float alt_m,
= calc_elevations( root, light_nodes.get_node_list(), 0.5 );
TGPolygon p;
p.add_contour( geod_light_nodes, 0 );
- FGSuperPoly s;
+ TGSuperPoly s;
s.set_poly( p );
tmp_light_list.push_back( s );
diff --git a/src/Airports/GenAirports/lights.cxx b/src/Airports/GenAirports/lights.cxx
index afcc2a31..68f219de 100644
--- a/src/Airports/GenAirports/lights.cxx
+++ b/src/Airports/GenAirports/lights.cxx
@@ -148,7 +148,7 @@ static superpoly_list gen_runway_edge_lights( const FGRunway& rwy_info,
lights_poly.add_contour( w_lights, false );
normals_poly.add_contour( w_normals, false );
- FGSuperPoly white;
+ TGSuperPoly white;
white.set_poly( lights_poly );
white.set_normals( normals_poly );
if ( kind == "H" ) {
@@ -164,7 +164,7 @@ static superpoly_list gen_runway_edge_lights( const FGRunway& rwy_info,
lights_poly.add_contour( y_lights, false );
normals_poly.add_contour( y_normals, false );
- FGSuperPoly yellow;
+ TGSuperPoly yellow;
yellow.set_poly( lights_poly );
yellow.set_normals( normals_poly );
if ( kind == "H" ) {
@@ -254,7 +254,7 @@ static superpoly_list gen_taxiway_edge_lights( const FGRunway& rwy_info,
lights_poly.add_contour( b_lights, false );
normals_poly.add_contour( b_normals, false );
- FGSuperPoly blue;
+ TGSuperPoly blue;
blue.set_poly( lights_poly );
blue.set_normals( normals_poly );
blue.set_material( "RWY_BLUE_TAXIWAY_LIGHTS" );
@@ -351,7 +351,7 @@ static superpoly_list gen_runway_threshold_lights( const FGRunway& rwy_info,
lights_poly.add_contour( g_lights, false );
normals_poly.add_contour( g_normals, false );
- FGSuperPoly green;
+ TGSuperPoly green;
green.set_poly( lights_poly );
green.set_normals( normals_poly );
green.set_material( "RWY_GREEN_LIGHTS" );
@@ -372,7 +372,7 @@ static superpoly_list gen_runway_threshold_lights( const FGRunway& rwy_info,
lights_poly.add_contour( r_lights, false );
normals_poly.add_contour( r_normals, false );
- FGSuperPoly red;
+ TGSuperPoly red;
red.set_poly( lights_poly );
red.set_normals( normals_poly );
if ( kind == "H" ) {
@@ -470,7 +470,7 @@ static superpoly_list gen_runway_center_line_lights( const FGRunway& rwy_info,
lights_poly.add_contour( w_lights, false );
normals_poly.add_contour( w_normals, false );
- FGSuperPoly white;
+ TGSuperPoly white;
white.set_poly( lights_poly );
white.set_normals( normals_poly );
white.set_material( "RWY_WHITE_MEDIUM_LIGHTS" );
@@ -484,7 +484,7 @@ static superpoly_list gen_runway_center_line_lights( const FGRunway& rwy_info,
lights_poly.add_contour( r_lights, false );
normals_poly.add_contour( r_normals, false );
- FGSuperPoly red;
+ TGSuperPoly red;
red.set_poly( lights_poly );
red.set_normals( normals_poly );
red.set_material( "RWY_RED_MEDIUM_LIGHTS" );
@@ -497,7 +497,7 @@ static superpoly_list gen_runway_center_line_lights( const FGRunway& rwy_info,
// generate touch down zone lights
-static FGSuperPoly gen_touchdown_zone_lights( const FGRunway& rwy_info,
+static TGSuperPoly gen_touchdown_zone_lights( const FGRunway& rwy_info,
float alt_m, bool recip )
{
point_list lights; lights.clear();
@@ -590,7 +590,7 @@ static FGSuperPoly gen_touchdown_zone_lights( const FGRunway& rwy_info,
lights_poly.add_contour( lights, false );
normals_poly.add_contour( normals, false );
- FGSuperPoly result;
+ TGSuperPoly result;
result.set_poly( lights_poly );
result.set_normals( normals_poly );
result.set_material( "RWY_WHITE_LIGHTS" );
@@ -600,7 +600,7 @@ static FGSuperPoly gen_touchdown_zone_lights( const FGRunway& rwy_info,
// generate a simple 2 bar VASI for a 3 degree approach
-static FGSuperPoly gen_vasi( const FGRunway& rwy_info, float alt_m,
+static TGSuperPoly gen_vasi( const FGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@@ -729,7 +729,7 @@ static FGSuperPoly gen_vasi( const FGRunway& rwy_info, float alt_m,
lights_poly.add_contour( lights, false );
normals_poly.add_contour( normals, false );
- FGSuperPoly result;
+ TGSuperPoly result;
result.set_poly( lights_poly );
result.set_normals( normals_poly );
result.set_material( "RWY_VASI_LIGHTS" );
@@ -741,7 +741,7 @@ static FGSuperPoly gen_vasi( const FGRunway& rwy_info, float alt_m,
// generate a simple PAPI for a 3 degree approach
-static FGSuperPoly gen_papi( const FGRunway& rwy_info, float alt_m,
+static TGSuperPoly gen_papi( const FGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@@ -825,7 +825,7 @@ static FGSuperPoly gen_papi( const FGRunway& rwy_info, float alt_m,
lights_poly.add_contour( lights, false );
normals_poly.add_contour( normals, false );
- FGSuperPoly result;
+ TGSuperPoly result;
result.set_poly( lights_poly );
result.set_normals( normals_poly );
result.set_material( "RWY_VASI_LIGHTS" );
@@ -837,7 +837,7 @@ static FGSuperPoly gen_papi( const FGRunway& rwy_info, float alt_m,
// generate REIL lights
-static FGSuperPoly gen_reil( const FGRunway& rwy_info, float alt_m,
+static TGSuperPoly gen_reil( const FGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@@ -910,7 +910,7 @@ static FGSuperPoly gen_reil( const FGRunway& rwy_info, float alt_m,
lights_poly.add_contour( lights, false );
normals_poly.add_contour( normals, false );
- FGSuperPoly result;
+ TGSuperPoly result;
result.set_poly( lights_poly );
result.set_normals( normals_poly );
result.set_material( "RWY_REIL_LIGHTS" );
@@ -1381,7 +1381,7 @@ static superpoly_list gen_alsf( const FGRunway& rwy_info,
lights_poly.add_contour( g_lights, false );
normals_poly.add_contour( g_normals, false );
- FGSuperPoly green;
+ TGSuperPoly green;
green.set_poly( lights_poly );
green.set_normals( normals_poly );
green.set_material( "RWY_GREEN_LIGHTS" );
@@ -1392,7 +1392,7 @@ static superpoly_list gen_alsf( const FGRunway& rwy_info,
lights_poly.add_contour( r_lights, false );
normals_poly.add_contour( r_normals, false );
- FGSuperPoly red;
+ TGSuperPoly red;
red.set_poly( lights_poly );
red.set_normals( normals_poly );
red.set_material( "RWY_RED_LIGHTS" );
@@ -1403,7 +1403,7 @@ static superpoly_list gen_alsf( const FGRunway& rwy_info,
lights_poly.add_contour( w_lights, false );
normals_poly.add_contour( w_normals, false );
- FGSuperPoly white;
+ TGSuperPoly white;
white.set_poly( lights_poly );
white.set_normals( normals_poly );
white.set_material( "RWY_WHITE_LIGHTS" );
@@ -1421,7 +1421,7 @@ static superpoly_list gen_alsf( const FGRunway& rwy_info,
lights_poly.add_contour( s_lights, false );
normals_poly.add_contour( s_normals, false );
- FGSuperPoly sequenced;
+ TGSuperPoly sequenced;
sequenced.set_poly( lights_poly );
sequenced.set_normals( normals_poly );
sequenced.set_material( "RWY_SEQUENCED_LIGHTS" );
@@ -1435,7 +1435,7 @@ static superpoly_list gen_alsf( const FGRunway& rwy_info,
// generate ODALS lights
-static FGSuperPoly gen_odals( const FGRunway& rwy_info, float alt_m,
+static TGSuperPoly gen_odals( const FGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@@ -1519,7 +1519,7 @@ static FGSuperPoly gen_odals( const FGRunway& rwy_info, float alt_m,
lights_poly.add_contour( lights, false );
normals_poly.add_contour( normals, false );
- FGSuperPoly result;
+ TGSuperPoly result;
result.set_poly( lights_poly );
result.set_normals( normals_poly );
result.set_material( "RWY_ODALS_LIGHTS" );
@@ -1743,7 +1743,7 @@ static superpoly_list gen_ssalx( const FGRunway& rwy_info,
lights_poly.add_contour( g_lights, false );
normals_poly.add_contour( g_normals, false );
- FGSuperPoly green;
+ TGSuperPoly green;
green.set_poly( lights_poly );
green.set_normals( normals_poly );
green.set_material( "RWY_GREEN_LIGHTS" );
@@ -1754,7 +1754,7 @@ static superpoly_list gen_ssalx( const FGRunway& rwy_info,
lights_poly.add_contour( r_lights, false );
normals_poly.add_contour( r_normals, false );
- FGSuperPoly red;
+ TGSuperPoly red;
red.set_poly( lights_poly );
red.set_normals( normals_poly );
red.set_material( "RWY_RED_LIGHTS" );
@@ -1765,7 +1765,7 @@ static superpoly_list gen_ssalx( const FGRunway& rwy_info,
lights_poly.add_contour( w_lights, false );
normals_poly.add_contour( w_normals, false );
- FGSuperPoly white;
+ TGSuperPoly white;
white.set_poly( lights_poly );
white.set_normals( normals_poly );
white.set_material( "RWY_WHITE_LIGHTS" );
@@ -1783,7 +1783,7 @@ static superpoly_list gen_ssalx( const FGRunway& rwy_info,
lights_poly.add_contour( s_lights, false );
normals_poly.add_contour( s_normals, false );
- FGSuperPoly sequenced;
+ TGSuperPoly sequenced;
sequenced.set_poly( lights_poly );
sequenced.set_normals( normals_poly );
sequenced.set_material( "RWY_SEQUENCED_LIGHTS" );
@@ -2009,7 +2009,7 @@ static superpoly_list gen_malsx( const FGRunway& rwy_info,
lights_poly.add_contour( g_lights, false );
normals_poly.add_contour( g_normals, false );
- FGSuperPoly green;
+ TGSuperPoly green;
green.set_poly( lights_poly );
green.set_normals( normals_poly );
green.set_material( "RWY_GREEN_LIGHTS" );
@@ -2020,7 +2020,7 @@ static superpoly_list gen_malsx( const FGRunway& rwy_info,
lights_poly.add_contour( r_lights, false );
normals_poly.add_contour( r_normals, false );
- FGSuperPoly red;
+ TGSuperPoly red;
red.set_poly( lights_poly );
red.set_normals( normals_poly );
red.set_material( "RWY_RED_LIGHTS" );
@@ -2031,7 +2031,7 @@ static superpoly_list gen_malsx( const FGRunway& rwy_info,
lights_poly.add_contour( w_lights, false );
normals_poly.add_contour( w_normals, false );
- FGSuperPoly white;
+ TGSuperPoly white;
white.set_poly( lights_poly );
white.set_normals( normals_poly );
white.set_material( "RWY_WHITE_LIGHTS" );
@@ -2049,7 +2049,7 @@ static superpoly_list gen_malsx( const FGRunway& rwy_info,
lights_poly.add_contour( s_lights, false );
normals_poly.add_contour( s_normals, false );
- FGSuperPoly sequenced;
+ TGSuperPoly sequenced;
sequenced.set_poly( lights_poly );
sequenced.set_normals( normals_poly );
sequenced.set_material( "RWY_SEQUENCED_LIGHTS" );
@@ -2106,41 +2106,41 @@ void gen_runway_lights( const FGRunway& rwy_info, float alt_m,
// Touchdown zone lighting
if ( rwy_info.end1_flags.substr(0,1) == "Y" ) {
- FGSuperPoly s = gen_touchdown_zone_lights( rwy_info, alt_m, false );
+ TGSuperPoly s = gen_touchdown_zone_lights( rwy_info, alt_m, false );
lights.push_back( s );
}
if ( rwy_info.end2_flags.substr(0,1) == "Y" ) {
- FGSuperPoly s = gen_touchdown_zone_lights( rwy_info, alt_m, true );
+ TGSuperPoly s = gen_touchdown_zone_lights( rwy_info, alt_m, true );
lights.push_back( s );
}
// REIL lighting
if ( rwy_info.end1_flags.substr(1,1) == "Y" ) {
- FGSuperPoly s = gen_reil( rwy_info, alt_m, false );
+ TGSuperPoly s = gen_reil( rwy_info, alt_m, false );
lights.push_back( s );
}
if ( rwy_info.end2_flags.substr(1,1) == "Y" ) {
- FGSuperPoly s = gen_reil( rwy_info, alt_m, true );
+ TGSuperPoly s = gen_reil( rwy_info, alt_m, true );
lights.push_back( s );
}
// PAPI lighting
if ( rwy_info.end1_flags.substr(2,1) == "P" ) {
- FGSuperPoly s = gen_papi( rwy_info, alt_m, false );
+ TGSuperPoly s = gen_papi( rwy_info, alt_m, false );
lights.push_back( s );
}
if ( rwy_info.end2_flags.substr(2,1) == "P" ) {
- FGSuperPoly s = gen_papi( rwy_info, alt_m, true );
+ TGSuperPoly s = gen_papi( rwy_info, alt_m, true );
lights.push_back( s );
}
// VASI lighting
if ( rwy_info.end1_flags.substr(2,1) == "V" ) {
- FGSuperPoly s = gen_vasi( rwy_info, alt_m, false );
+ TGSuperPoly s = gen_vasi( rwy_info, alt_m, false );
lights.push_back( s );
}
if ( rwy_info.end2_flags.substr(2,1) == "V" ) {
- FGSuperPoly s = gen_vasi( rwy_info, alt_m, true );
+ TGSuperPoly s = gen_vasi( rwy_info, alt_m, true );
lights.push_back( s );
}
@@ -2261,11 +2261,11 @@ void gen_runway_lights( const FGRunway& rwy_info, float alt_m,
// ODALS Omni-directional approach light system
if ( rwy_info.end1_flags.substr(3,1) == "L" ) {
- FGSuperPoly s = gen_odals( rwy_info, alt_m, false );
+ TGSuperPoly s = gen_odals( rwy_info, alt_m, false );
lights.push_back( s );
}
if ( rwy_info.end2_flags.substr(3,1) == "L" ) {
- FGSuperPoly s = gen_odals( rwy_info, alt_m, true );
+ TGSuperPoly s = gen_odals( rwy_info, alt_m, true );
lights.push_back( s );
}
diff --git a/src/Airports/GenAirports/rwy_common.cxx b/src/Airports/GenAirports/rwy_common.cxx
index a065a1cd..8fae5ed7 100644
--- a/src/Airports/GenAirports/rwy_common.cxx
+++ b/src/Airports/GenAirports/rwy_common.cxx
@@ -206,7 +206,7 @@ void gen_runway_section( const FGRunway& rwy_info,
// Create the final output and push on to the runway super_polygon
// list
- FGSuperPoly sp;
+ TGSuperPoly sp;
sp.erase();
sp.set_poly( split );
sp.set_material( prefix + material );
diff --git a/src/Airports/GenAirports/rwy_nonprec.cxx b/src/Airports/GenAirports/rwy_nonprec.cxx
index a2f2b7ec..13bc325b 100644
--- a/src/Airports/GenAirports/rwy_nonprec.cxx
+++ b/src/Airports/GenAirports/rwy_nonprec.cxx
@@ -84,7 +84,7 @@ void gen_non_precision_rwy( const FGRunway& rwy_info,
// into its various sections
//
- FGSuperPoly sp;
+ TGSuperPoly sp;
FGTexParams tp;
// we add 2' to the length for texture overlap. This puts the
diff --git a/src/Airports/GenAirports/rwy_prec.cxx b/src/Airports/GenAirports/rwy_prec.cxx
index 29d2ba6b..594d8439 100644
--- a/src/Airports/GenAirports/rwy_prec.cxx
+++ b/src/Airports/GenAirports/rwy_prec.cxx
@@ -86,7 +86,7 @@ void gen_precision_rwy( const FGRunway& rwy_info,
// into its various sections
//
- FGSuperPoly sp;
+ TGSuperPoly sp;
FGTexParams tp;
// we add 2' to the length for texture overlap. This puts the
diff --git a/src/Airports/GenAirports/rwy_simple.cxx b/src/Airports/GenAirports/rwy_simple.cxx
index 6f113505..06dc7540 100644
--- a/src/Airports/GenAirports/rwy_simple.cxx
+++ b/src/Airports/GenAirports/rwy_simple.cxx
@@ -73,7 +73,7 @@ void gen_simple_rwy( const FGRunway& rwy_info,
SG_LOG(SG_GENERAL, SG_DEBUG, " point = " << p);
}
- FGSuperPoly sp;
+ TGSuperPoly sp;
FGTexParams tp;
TGPolygon clipped_a = polygon_diff( runway_a, *accum );
diff --git a/src/Airports/GenAirports/rwy_visual.cxx b/src/Airports/GenAirports/rwy_visual.cxx
index 389ca9c2..72e8efcb 100644
--- a/src/Airports/GenAirports/rwy_visual.cxx
+++ b/src/Airports/GenAirports/rwy_visual.cxx
@@ -85,7 +85,7 @@ void gen_visual_rwy( const FGRunway& rwy_info,
// into its various sections
//
- FGSuperPoly sp;
+ TGSuperPoly sp;
FGTexParams tp;
// we add 2' to the length for texture overlap. This puts the
diff --git a/src/Airports/GenAirports/taxiway.cxx b/src/Airports/GenAirports/taxiway.cxx
index 25a1ee8b..a73d5377 100644
--- a/src/Airports/GenAirports/taxiway.cxx
+++ b/src/Airports/GenAirports/taxiway.cxx
@@ -73,7 +73,7 @@ void gen_taxiway( const FGRunway& rwy_info,
SG_LOG(SG_GENERAL, SG_DEBUG, " point = " << p);
}
- FGSuperPoly sp;
+ TGSuperPoly sp;
FGTexParams tp;
SG_LOG(SG_GENERAL, SG_DEBUG, "len = " << rwy_info.length);
diff --git a/src/Lib/Polygon/simple_clip.hxx b/src/Lib/Polygon/simple_clip.hxx
index 5798938e..33217629 100644
--- a/src/Lib/Polygon/simple_clip.hxx
+++ b/src/Lib/Polygon/simple_clip.hxx
@@ -45,7 +45,7 @@ enum fgSideType {
// it was successful.
TGPolygon horizontal_clip( const TGPolygon& in, const double y,
- const fgSideType side );
+ const fgSideType side );
#endif // _SIMPLE_CLIP_HXX
diff --git a/src/Lib/Polygon/superpoly.cxx b/src/Lib/Polygon/superpoly.cxx
index 508b4268..0dbbc61f 100644
--- a/src/Lib/Polygon/superpoly.cxx
+++ b/src/Lib/Polygon/superpoly.cxx
@@ -25,19 +25,19 @@
// Constructor
-FGSuperPoly::FGSuperPoly() :
+TGSuperPoly::TGSuperPoly() :
flag( "" )
{
}
// Destructor
-FGSuperPoly::~FGSuperPoly() {
+TGSuperPoly::~TGSuperPoly() {
}
// erase the "super" polygon
-void FGSuperPoly::erase() {
+void TGSuperPoly::erase() {
material = "";
poly.erase();
normals.erase();
diff --git a/src/Lib/Polygon/superpoly.hxx b/src/Lib/Polygon/superpoly.hxx
index 3c66a7a2..d5c4eed0 100644
--- a/src/Lib/Polygon/superpoly.hxx
+++ b/src/Lib/Polygon/superpoly.hxx
@@ -47,7 +47,7 @@ SG_USING_STD(string);
SG_USING_STD(vector);
-class FGSuperPoly {
+class TGSuperPoly {
private:
@@ -62,8 +62,8 @@ private:
public:
// Constructor and destructor
- FGSuperPoly( void );
- ~FGSuperPoly( void );
+ TGSuperPoly( void );
+ ~TGSuperPoly( void );
inline string get_material() const { return material; }
inline void set_material( const string &m ) { material = m; }
@@ -92,7 +92,7 @@ public:
};
-typedef vector < FGSuperPoly > superpoly_list;
+typedef vector < TGSuperPoly > superpoly_list;
typedef superpoly_list::iterator superpoly_list_iterator;
typedef superpoly_list::const_iterator const_superpoly_list_iterator;