diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx index 34e34389..2a35338f 100644 --- a/src/Airports/GenAirports/build.cxx +++ b/src/Airports/GenAirports/build.cxx @@ -81,7 +81,7 @@ SG_USING_STD(string); // except each point is the texture coordinate of the corresponding // point in the original polygon. static TGPolygon rwy_section_tex_coords( const TGPolygon& in_poly, - const FGTexParams& tp, + const TGTexParams& tp, const bool clip_result ) { int i, j; @@ -533,7 +533,7 @@ void build_airport( string airport_raw, float alt_m, } TGSuperPoly sp; - FGTexParams tp; + TGTexParams tp; // First pass: generate the precision runways since these have // precidence diff --git a/src/Airports/GenAirports/rwy_common.cxx b/src/Airports/GenAirports/rwy_common.cxx index 621cf91b..0733fbed 100644 --- a/src/Airports/GenAirports/rwy_common.cxx +++ b/src/Airports/GenAirports/rwy_common.cxx @@ -233,8 +233,8 @@ void gen_runway_section( const TGRunway& rwy_info, double wid = rwy_info.width + 4; double sect_wid = wid * ( endw_pct - startw_pct ); - FGTexParams tp; - tp = FGTexParams( p0, + TGTexParams tp; + tp = TGTexParams( p0, sect_wid * SG_FEET_TO_METER, sect_len * SG_FEET_TO_METER, heading ); diff --git a/src/Airports/GenAirports/rwy_nonprec.cxx b/src/Airports/GenAirports/rwy_nonprec.cxx index 3ca51012..46bf4946 100644 --- a/src/Airports/GenAirports/rwy_nonprec.cxx +++ b/src/Airports/GenAirports/rwy_nonprec.cxx @@ -85,7 +85,7 @@ void gen_non_precision_rwy( const TGRunway& rwy_info, // TGSuperPoly sp; - FGTexParams tp; + TGTexParams tp; // we add 2' to the length for texture overlap. This puts the // lines on the texture back to the edge of the runway where they diff --git a/src/Airports/GenAirports/rwy_prec.cxx b/src/Airports/GenAirports/rwy_prec.cxx index 75de15e2..75bcad09 100644 --- a/src/Airports/GenAirports/rwy_prec.cxx +++ b/src/Airports/GenAirports/rwy_prec.cxx @@ -87,7 +87,7 @@ void gen_precision_rwy( const TGRunway& rwy_info, // TGSuperPoly sp; - FGTexParams tp; + TGTexParams tp; // we add 2' to the length for texture overlap. This puts the // lines on the texture back to the edge of the runway where they diff --git a/src/Airports/GenAirports/rwy_simple.cxx b/src/Airports/GenAirports/rwy_simple.cxx index 348f6f4b..7b87221e 100644 --- a/src/Airports/GenAirports/rwy_simple.cxx +++ b/src/Airports/GenAirports/rwy_simple.cxx @@ -74,7 +74,7 @@ void gen_simple_rwy( const TGRunway& rwy_info, } TGSuperPoly sp; - FGTexParams tp; + TGTexParams tp; TGPolygon clipped_a = polygon_diff( runway_a, *accum ); TGPolygon split_a = split_long_edges( clipped_a, 400.0 ); @@ -84,7 +84,7 @@ void gen_simple_rwy( const TGRunway& rwy_info, rwy_polys->push_back( sp ); SG_LOG(SG_GENERAL, SG_DEBUG, "clipped_a = " << clipped_a.contours()); *accum = polygon_union( runway_a, *accum ); - tp = FGTexParams( runway_a.get_pt(0,0), + tp = TGTexParams( runway_a.get_pt(0,0), rwy_info.width * SG_FEET_TO_METER, rwy_info.length * SG_FEET_TO_METER / 2.0, rwy_info.heading ); @@ -98,7 +98,7 @@ void gen_simple_rwy( const TGRunway& rwy_info, rwy_polys->push_back( sp ); SG_LOG(SG_GENERAL, SG_DEBUG, "clipped_b = " << clipped_b.contours()); *accum = polygon_union( runway_b, *accum ); - tp = FGTexParams( runway_b.get_pt(0,0), + tp = TGTexParams( runway_b.get_pt(0,0), rwy_info.width * SG_FEET_TO_METER, rwy_info.length * SG_FEET_TO_METER / 2.0, rwy_info.heading + 180.0 ); diff --git a/src/Airports/GenAirports/rwy_visual.cxx b/src/Airports/GenAirports/rwy_visual.cxx index 9e75f4a1..e0a45af8 100644 --- a/src/Airports/GenAirports/rwy_visual.cxx +++ b/src/Airports/GenAirports/rwy_visual.cxx @@ -86,7 +86,7 @@ void gen_visual_rwy( const TGRunway& rwy_info, // TGSuperPoly sp; - FGTexParams tp; + TGTexParams tp; // we add 2' to the length for texture overlap. This puts the // lines on the texture back to the edge of the runway where they diff --git a/src/Airports/GenAirports/taxiway.cxx b/src/Airports/GenAirports/taxiway.cxx index 5c6f4e06..71c87c96 100644 --- a/src/Airports/GenAirports/taxiway.cxx +++ b/src/Airports/GenAirports/taxiway.cxx @@ -74,7 +74,7 @@ void gen_taxiway( const TGRunway& rwy_info, } TGSuperPoly sp; - FGTexParams tp; + TGTexParams tp; SG_LOG(SG_GENERAL, SG_DEBUG, "len = " << rwy_info.length); SG_LOG(SG_GENERAL, SG_DEBUG, "width = " << rwy_info.width); @@ -99,7 +99,7 @@ void gen_taxiway( const TGRunway& rwy_info, rwy_polys->push_back( sp ); SG_LOG(SG_GENERAL, SG_DEBUG, "clipped_a = " << clipped_a.contours()); *accum = polygon_union( runway_a, *accum ); - tp = FGTexParams( runway_a.get_pt(0,0), + tp = TGTexParams( runway_a.get_pt(0,0), twid * SG_FEET_TO_METER, 250 * SG_FEET_TO_METER, rwy_info.heading ); @@ -113,7 +113,7 @@ void gen_taxiway( const TGRunway& rwy_info, rwy_polys->push_back( sp ); SG_LOG(SG_GENERAL, SG_DEBUG, "clipped_b = " << clipped_b.contours()); *accum = polygon_union( runway_b, *accum ); - tp = FGTexParams( runway_b.get_pt(0,0), + tp = TGTexParams( runway_b.get_pt(0,0), twid * SG_FEET_TO_METER, 250 * SG_FEET_TO_METER, rwy_info.heading + 180.0 ); diff --git a/src/Airports/GenAirports/texparams.hxx b/src/Airports/GenAirports/texparams.hxx index d605d395..fb0256e4 100644 --- a/src/Airports/GenAirports/texparams.hxx +++ b/src/Airports/GenAirports/texparams.hxx @@ -39,7 +39,7 @@ SG_USING_STD(vector); -class FGTexParams { +class TGTexParams { private: @@ -51,15 +51,15 @@ private: public: // Constructor and destructor - inline FGTexParams( void ) { } - inline FGTexParams( const Point3D &r, const double w, const double l, + inline TGTexParams( void ) { } + inline TGTexParams( const Point3D &r, const double w, const double l, const double h ) { ref = r; width = w; length = l; heading = h; } - inline ~FGTexParams( void ) { } + inline ~TGTexParams( void ) { } inline Point3D get_ref() const { return ref; } inline void set_ref( const Point3D &r ) { ref = r; } @@ -75,7 +75,7 @@ public: }; -typedef vector < FGTexParams > texparams_list; +typedef vector < TGTexParams > texparams_list; typedef texparams_list::iterator texparams_list_iterator; typedef texparams_list::const_iterator const_texparams_list_iterator;