1
0
Fork 0

Rename FGRunway -> TGRunway.

This commit is contained in:
curt 2003-02-26 21:16:43 +00:00
parent 62a3a1936c
commit 0e4f17ad51
17 changed files with 48 additions and 48 deletions

View file

@ -262,7 +262,7 @@ static void my_chomp( string& str ) {
// build a runway
static void build_runway( const FGRunway& rwy_info,
static void build_runway( const TGRunway& rwy_info,
double alt_m,
superpoly_list *rwy_polys,
texparams_list *texparams,
@ -428,7 +428,7 @@ void build_airport( string airport_raw, float alt_m,
for ( i = 0; i < (int)runways_raw.size(); ++i ) {
rwy_str = runways_raw[i];
FGRunway rwy;
TGRunway rwy;
rwy.really_taxiway = false;
@ -492,7 +492,7 @@ void build_airport( string airport_raw, float alt_m,
for ( i = 0; i < (int)taxiways_raw.size(); ++i ) {
rwy_str = taxiways_raw[i];
FGRunway taxi;
TGRunway taxi;
taxi.really_taxiway = true;
taxi.generated = false;

View file

@ -35,7 +35,7 @@ SG_USING_STD(endl);
// of the runway. Combine this with an appropriate portion of the
// local 'up' vector based on the provide 'angle' gives the light
// direction vector for the runway.
static Point3D gen_runway_light_vector( const FGRunway& rwy_info,
static Point3D gen_runway_light_vector( const TGRunway& rwy_info,
double angle, bool recip ) {
double length;
@ -79,7 +79,7 @@ static Point3D gen_runway_light_vector( const FGRunway& rwy_info,
// generate runway edge lighting
// 60 meters spacing or the next number down that divides evenly.
static superpoly_list gen_runway_edge_lights( const FGRunway& rwy_info,
static superpoly_list gen_runway_edge_lights( const TGRunway& rwy_info,
const string& kind, bool recip )
{
point_list w_lights; w_lights.clear();
@ -186,7 +186,7 @@ static superpoly_list gen_runway_edge_lights( const FGRunway& rwy_info,
// generate taxiway edge lighting
// 100 meters spacing or the next number down that divides evenly.
static superpoly_list gen_taxiway_edge_lights( const FGRunway& rwy_info,
static superpoly_list gen_taxiway_edge_lights( const TGRunway& rwy_info,
const string& kind, bool recip )
{
point_list b_lights; b_lights.clear();
@ -268,7 +268,7 @@ static superpoly_list gen_taxiway_edge_lights( const FGRunway& rwy_info,
// generate threshold lights for a 3 degree approach
static superpoly_list gen_runway_threshold_lights( const FGRunway& rwy_info,
static superpoly_list gen_runway_threshold_lights( const TGRunway& rwy_info,
const string& kind,
float alt_m, bool recip )
{
@ -397,7 +397,7 @@ static superpoly_list gen_runway_threshold_lights( const FGRunway& rwy_info,
// generate runway center line lighting, 50' spacing.
static superpoly_list gen_runway_center_line_lights( const FGRunway& rwy_info,
static superpoly_list gen_runway_center_line_lights( const TGRunway& rwy_info,
bool recip )
{
point_list w_lights; w_lights.clear();
@ -497,7 +497,7 @@ static superpoly_list gen_runway_center_line_lights( const FGRunway& rwy_info,
// generate touch down zone lights
static TGSuperPoly gen_touchdown_zone_lights( const FGRunway& rwy_info,
static TGSuperPoly gen_touchdown_zone_lights( const TGRunway& rwy_info,
float alt_m, bool recip )
{
point_list lights; lights.clear();
@ -600,7 +600,7 @@ static TGSuperPoly gen_touchdown_zone_lights( const FGRunway& rwy_info,
// generate a simple 2 bar VASI for a 3 degree approach
static TGSuperPoly gen_vasi( const FGRunway& rwy_info, float alt_m,
static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@ -741,7 +741,7 @@ static TGSuperPoly gen_vasi( const FGRunway& rwy_info, float alt_m,
// generate a simple PAPI for a 3 degree approach
static TGSuperPoly gen_papi( const FGRunway& rwy_info, float alt_m,
static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@ -837,7 +837,7 @@ static TGSuperPoly gen_papi( const FGRunway& rwy_info, float alt_m,
// generate REIL lights
static TGSuperPoly gen_reil( const FGRunway& rwy_info, float alt_m,
static TGSuperPoly gen_reil( const TGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@ -922,7 +922,7 @@ static TGSuperPoly gen_reil( const FGRunway& rwy_info, float alt_m,
// generate ALSF-I/II and SALS/SALSF approach lighting schemes
static superpoly_list gen_alsf( const FGRunway& rwy_info,
static superpoly_list gen_alsf( const TGRunway& rwy_info,
float alt_m, const string &kind, bool recip )
{
point_list g_lights; g_lights.clear();
@ -1435,7 +1435,7 @@ static superpoly_list gen_alsf( const FGRunway& rwy_info,
// generate ODALS lights
static TGSuperPoly gen_odals( const FGRunway& rwy_info, float alt_m,
static TGSuperPoly gen_odals( const TGRunway& rwy_info, float alt_m,
bool recip )
{
point_list lights; lights.clear();
@ -1532,7 +1532,7 @@ static TGSuperPoly gen_odals( const FGRunway& rwy_info, float alt_m,
// generate SSALS, SSALF, and SSALR approach lighting scheme (kind =
// S, F, or R)
static superpoly_list gen_ssalx( const FGRunway& rwy_info,
static superpoly_list gen_ssalx( const TGRunway& rwy_info,
float alt_m, const string& kind, bool recip )
{
point_list g_lights; g_lights.clear();
@ -1798,7 +1798,7 @@ static superpoly_list gen_ssalx( const FGRunway& rwy_info,
// generate MALS, MALSF, and MALSR approach lighting scheme (kind =
// ' ', F, or R)
static superpoly_list gen_malsx( const FGRunway& rwy_info,
static superpoly_list gen_malsx( const TGRunway& rwy_info,
float alt_m, const string& kind, bool recip )
{
point_list g_lights; g_lights.clear();
@ -2063,7 +2063,7 @@ static superpoly_list gen_malsx( const FGRunway& rwy_info,
// top level runway light generator
void gen_runway_lights( const FGRunway& rwy_info, float alt_m,
void gen_runway_lights( const TGRunway& rwy_info, float alt_m,
superpoly_list &lights ) {
cout << "gen runway lights " << rwy_info.rwy_no << " "
@ -2379,7 +2379,7 @@ void gen_runway_lights( const FGRunway& rwy_info, float alt_m,
// top level taxiway light generator
void gen_taxiway_lights( const FGRunway& taxiway_info, float alt_m,
void gen_taxiway_lights( const TGRunway& taxiway_info, float alt_m,
superpoly_list &lights ) {
cout << "gen taxiway lights " << taxiway_info.rwy_no << " "

View file

@ -34,11 +34,11 @@
// generate runway lighting
void gen_runway_lights( const FGRunway& rwy_info, float alt_m,
void gen_runway_lights( const TGRunway& rwy_info, float alt_m,
superpoly_list &lights );
// generate taxiway lighting
void gen_taxiway_lights( const FGRunway& taxiway_info, float alt_m,
void gen_taxiway_lights( const TGRunway& taxiway_info, float alt_m,
superpoly_list &lights );
#endif // _RWY_LIGHTS_HXX

View file

@ -108,7 +108,7 @@ TGPolygon gen_wgs84_area( Point3D origin, double length_m, double width_m,
// generate an area for a runway with expantion specified as a scale
// factor (return result points in degrees)
TGPolygon gen_runway_area_w_scale( const FGRunway& runway,
TGPolygon gen_runway_area_w_scale( const TGRunway& runway,
double alt_m,
double len_scale,
double width_scale ) {
@ -133,7 +133,7 @@ TGPolygon gen_runway_area_w_scale( const FGRunway& runway,
// generate an area for a runway with expansion specified in meters
// (return result points in degrees)
TGPolygon gen_runway_area_w_extend( const FGRunway& runway,
TGPolygon gen_runway_area_w_extend( const TGRunway& runway,
double alt_m,
double len_extend,
double wid_extend ) {
@ -158,7 +158,7 @@ TGPolygon gen_runway_area_w_extend( const FGRunway& runway,
// generate an area for a runway and include midpoints
TGPolygon gen_runway_w_mid( const FGRunway& runway,
TGPolygon gen_runway_w_mid( const TGRunway& runway,
double alt_m,
double len_extend_m,
double wid_extend_m ) {

View file

@ -34,7 +34,7 @@
#include <Polygon/polygon.hxx>
struct FGRunway {
struct TGRunway {
string rwy_no;
double lon;
@ -62,28 +62,28 @@ struct FGRunway {
bool generated;};
typedef vector < FGRunway > runway_list;
typedef vector < TGRunway > runway_list;
typedef runway_list::iterator runway_list_iterator;
typedef runway_list::const_iterator const_runway_list_iterator;
// generate an area for a runway with expantion specified as a scale
// factor (return result points in degrees)
TGPolygon gen_runway_area_w_scale( const FGRunway& runway,
TGPolygon gen_runway_area_w_scale( const TGRunway& runway,
double alt_m,
double len_scale = 1.0,
double width_scale = 1.0 );
// generate an area for a runway with expansion specified in meters
// (return result points in degrees)
TGPolygon gen_runway_area_w_extend( const FGRunway& runway,
TGPolygon gen_runway_area_w_extend( const TGRunway& runway,
double alt_m,
double len_extend = 0.0,
double wid_extend = 0.0 );
// generate an area for half a runway
TGPolygon gen_runway_w_mid( const FGRunway& runway,
TGPolygon gen_runway_w_mid( const TGRunway& runway,
double alt_m,
double len_extend_m = 0.0,
double wid_extend_m = 0.0 );

View file

@ -30,7 +30,7 @@
#include "rwy_common.hxx"
void gen_number_block( const FGRunway& rwy_info,
void gen_number_block( const TGRunway& rwy_info,
const string& material,
TGPolygon poly, double heading, int num,
double start_pct, double end_pct,
@ -92,7 +92,7 @@ void gen_number_block( const FGRunway& rwy_info,
// generate a section of runway
void gen_runway_section( const FGRunway& rwy_info,
void gen_runway_section( const TGRunway& rwy_info,
const TGPolygon& runway,
double startl_pct, double endl_pct,
double startw_pct, double endw_pct,

View file

@ -33,16 +33,16 @@
#include "texparams.hxx"
void gen_number_block( const FGRunway& rwy_info,
const string& material,
TGPolygon poly, double heading, int num,
double start_pct, double end_pct,
superpoly_list *rwy_polys,
texparams_list *texparams,
TGPolygon *accum );
void gen_number_block( const TGRunway& rwy_info,
const string& material,
TGPolygon poly, double heading, int num,
double start_pct, double end_pct,
superpoly_list *rwy_polys,
texparams_list *texparams,
TGPolygon *accum );
// generate a section of runway
void gen_runway_section( const FGRunway& rwy_info,
void gen_runway_section( const TGRunway& rwy_info,
const TGPolygon& runway,
double startl_pct, double endl_pct,
double startw_pct, double endw_pct,

View file

@ -34,7 +34,7 @@
// dimensions of precision runway markings, please refer to FAA
// document AC 150/5340-1H
void gen_non_precision_rwy( const FGRunway& rwy_info,
void gen_non_precision_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -38,7 +38,7 @@
// dimensions of precision runway markings, please refer to FAA
// document AC 150/5340-1H
void gen_non_precision_rwy( const FGRunway& rwy_info,
void gen_non_precision_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -34,7 +34,7 @@
// dimensions of precision runway markings, please refer to FAA
// document AC 150/5340-1H
void gen_precision_rwy( const FGRunway& rwy_info,
void gen_precision_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -38,7 +38,7 @@
// dimensions of precision runway markings, please refer to FAA
// document AC 150/5340-1H
void gen_precision_rwy( const FGRunway& rwy_info,
void gen_precision_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -34,7 +34,7 @@
// generate a simple runway. The routine modifies rwy_polys,
// texparams, and accum
void gen_simple_rwy( const FGRunway& rwy_info,
void gen_simple_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -35,7 +35,7 @@
// generate a simple runway. The routine modifies rwy_polys,
// texparams, and accum
void gen_simple_rwy( const FGRunway& rwy_info,
void gen_simple_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -35,7 +35,7 @@
// precision runway markings, please refer to FAA document AC
// 150/5340-1H
void gen_visual_rwy( const FGRunway& rwy_info,
void gen_visual_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -38,7 +38,7 @@
// precision runway markings, please refer to FAA document AC
// 150/5340-1H
void gen_visual_rwy( const FGRunway& rwy_info,
void gen_visual_rwy( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -34,7 +34,7 @@
// generate a taxiway. The routine modifies rwy_polys, texparams, and
// accum
void gen_taxiway( const FGRunway& rwy_info,
void gen_taxiway( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,

View file

@ -35,7 +35,7 @@
// generate a taxiway. The routine modifies rwy_polys, texparams, and
// accum
void gen_taxiway( const FGRunway& rwy_info,
void gen_taxiway( const TGRunway& rwy_info,
double alt_m,
const string& material,
superpoly_list *rwy_polys,