From f92570b07b1231f50740b7c8dadb39133e4561d0 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sat, 24 Mar 2001 03:56:19 +0000
Subject: [PATCH] SG_ namespace.
---
src/Airports/GenAirports/build.cxx | 24 ++++++++++++------------
src/Airports/GenAirports/runway.cxx | 8 ++++----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx
index aed95275..885e0ce9 100644
--- a/src/Airports/GenAirports/build.cxx
+++ b/src/Airports/GenAirports/build.cxx
@@ -71,8 +71,8 @@ static FGPolygon rwy_section_tex_coords( const FGPolygon& in_poly,
int i, j;
FGPolygon result;
result.erase();
- // double length = rwy.length * FEET_TO_METER;
- // double width = rwy.width * FEET_TO_METER;
+ // double length = rwy.length * SG_FEET_TO_METER;
+ // double width = rwy.width * SG_FEET_TO_METER;
Point3D center = tp.get_center();
Point3D min = tp.get_min();
@@ -438,11 +438,11 @@ static void gen_simple_rwy( const FGRunway& rwy_info, const string& material,
cout << "clipped_a = " << clipped_a.contours() << endl;
*accum = polygon_union( runway_a, *accum );
tp = FGTexParams( Point3D( rwy_info.lon, rwy_info.lat, 0 ),
- Point3D( (-rwy_info.width / 2.0) * FEET_TO_METER,
+ Point3D( (-rwy_info.width / 2.0) * SG_FEET_TO_METER,
0.0,
0 ),
- Point3D( (rwy_info.width / 2.0) * FEET_TO_METER,
- (rwy_info.length / 2.0) * FEET_TO_METER,
+ Point3D( (rwy_info.width / 2.0) * SG_FEET_TO_METER,
+ (rwy_info.length / 2.0) * SG_FEET_TO_METER,
0.0 ),
rwy_info.heading );
texparams->push_back( tp );
@@ -456,11 +456,11 @@ static void gen_simple_rwy( const FGRunway& rwy_info, const string& material,
cout << "clipped_b = " << clipped_b.contours() << endl;
*accum = polygon_union( runway_b, *accum );
tp = FGTexParams( Point3D( rwy_info.lon, rwy_info.lat, 0 ),
- Point3D( (-rwy_info.width / 2.0) * FEET_TO_METER,
+ Point3D( (-rwy_info.width / 2.0) * SG_FEET_TO_METER,
0.0,
0 ),
- Point3D( (rwy_info.width / 2.0) * FEET_TO_METER,
- (rwy_info.length / 2.0) * FEET_TO_METER,
+ Point3D( (rwy_info.width / 2.0) * SG_FEET_TO_METER,
+ (rwy_info.length / 2.0) * SG_FEET_TO_METER,
0.0 ),
rwy_info.heading + 180.0 );
texparams->push_back( tp );
@@ -621,11 +621,11 @@ static void gen_runway_section( const FGRunway& rwy_info,
FGTexParams tp;
tp = FGTexParams( Point3D( rwy_info.lon, rwy_info.lat, 0 ),
- Point3D( start_wid * FEET_TO_METER,
- end_len * FEET_TO_METER,
+ Point3D( start_wid * SG_FEET_TO_METER,
+ end_len * SG_FEET_TO_METER,
0.0 ),
- Point3D( end_wid * FEET_TO_METER,
- start_len * FEET_TO_METER,
+ Point3D( end_wid * SG_FEET_TO_METER,
+ start_len * SG_FEET_TO_METER,
0.0 ),
heading );
texparams->push_back( tp );
diff --git a/src/Airports/GenAirports/runway.cxx b/src/Airports/GenAirports/runway.cxx
index ceb33e48..93e89349 100644
--- a/src/Airports/GenAirports/runway.cxx
+++ b/src/Airports/GenAirports/runway.cxx
@@ -129,8 +129,8 @@ FGPolygon gen_runway_area( const FGRunway& runway,
*/
Point3D origin(runway.lon, runway.lat, 0);
- l = runway.length * len_scale * FEET_TO_METER / 2.0;
- w = runway.width * width_scale * FEET_TO_METER / 2.0;
+ l = runway.length * len_scale * SG_FEET_TO_METER / 2.0;
+ w = runway.width * width_scale * SG_FEET_TO_METER / 2.0;
// generate untransformed runway area vertices
tmp_list.add_node( 0, Point3D( l, w, 0 ) );
@@ -172,8 +172,8 @@ FGPolygon gen_runway_w_mid( const FGRunway& runway,
*/
Point3D origin(runway.lon, runway.lat, 0);
- l = runway.length * len_scale * FEET_TO_METER / 2.0;
- w = runway.width * width_scale * FEET_TO_METER / 2.0;
+ l = runway.length * len_scale * SG_FEET_TO_METER / 2.0;
+ w = runway.width * width_scale * SG_FEET_TO_METER / 2.0;
// generate untransformed runway area vertices
tmp_list.add_node( 0, Point3D( l, w, 0 ) );