fly/terragear
1
0
Fork 0
Code Activity

Runway lights: correct the TDZ numbers and do some more cleanup

Browse source
This commit is contained in:
Christian Schmitt 2012-10-23 13:44:00 +02:00
parent 1c8dbead04
commit f86782119c
1 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/Airports/GenAirports850/lights.cxx
View file

@ -227,11 +227,11 @@ superpoly_list Runway::gen_runway_threshold_lights( const int kind, bool recip )
ref1 = SGGeodesy::direct(GetStart(), length_hdg, rwy.threshold[get_thresh0(recip)] - 1); ref1 = SGGeodesy::direct(GetStart(), length_hdg, rwy.threshold[get_thresh0(recip)] - 1);
ref2 = GetStart(); ref2 = GetStart();
} }
double left_hdg = SGMiscd::normalizePeriodic(0, 360, length_hdg - 90.0);
Point3D normal1 = gen_runway_light_vector( 3.0, recip ); Point3D normal1 = gen_runway_light_vector( 3.0, recip );
Point3D normal2 = gen_runway_light_vector( 3.0, !recip ); Point3D normal2 = gen_runway_light_vector( 3.0, !recip );
double left_hdg = SGMiscd::normalizePeriodic(0, 360, length_hdg - 90.0);
int divs = (int)(rwy.width + 4) / 3.0; int divs = (int)(rwy.width + 4) / 3.0;
double step = (rwy.width + 4) / divs; double step = (rwy.width + 4) / divs;
SGGeod pt1, pt2; SGGeod pt1, pt2;
@ -356,8 +356,7 @@ superpoly_list Runway::gen_runway_center_line_lights( bool recip )
double length_hdg; double length_hdg;
if ( recip ) { if ( recip ) {
length_hdg = rwy.heading + 180.0; length_hdg = SGMiscd::normalizePeriodic(0, 360, rwy.heading + 180);
if ( length_hdg > 360.0 ) { length_hdg -= 360.0; }
pt1 = SGGeodesy::direct( GetEnd(), length_hdg, rwy.threshold[get_thresh0(recip)]); pt1 = SGGeodesy::direct( GetEnd(), length_hdg, rwy.threshold[get_thresh0(recip)]);
pt2 = GetStart(); pt2 = GetStart();
} else { } else {
@ -508,29 +507,27 @@ TGSuperPoly Runway::gen_touchdown_zone_lights( bool recip )
SGGeod ref; SGGeod ref;
double length_hdg, left_hdg; double length_hdg, left_hdg;
if ( recip ) { if ( recip ) {
length_hdg = rwy.heading + 180.0; length_hdg = SGMiscd::normalizePeriodic(0, 360, rwy.heading + 180);
if ( length_hdg > 360.0 ) {length_hdg -= 360.0;}
ref = SGGeodesy::direct( GetEnd(), length_hdg, rwy.threshold[get_thresh0(recip)]); ref = SGGeodesy::direct( GetEnd(), length_hdg, rwy.threshold[get_thresh0(recip)]);
} else { } else {
length_hdg = rwy.heading; length_hdg = rwy.heading;
ref = SGGeodesy::direct(GetStart(), length_hdg, rwy.threshold[get_thresh0(recip)]); ref = SGGeodesy::direct(GetStart(), length_hdg, rwy.threshold[get_thresh0(recip)]);
} }
left_hdg = length_hdg - 90.0; left_hdg = SGMiscd::normalizePeriodic(0, 360, length_hdg - 90.0);
if ( left_hdg < 0 ) { left_hdg += 360.0; }
// calculate amount of touchdown light rows. // calculate amount of touchdown light rows.
// They should cover a distance of 900m max. from the threshold or // They should cover a distance of 900m or
// half the runway length, whichever is shorter. // half the runway length, whichever comes first. Spacing is 30m.
int rows = (int)(rwy.length * 0.5) / 60; int rows = (int)(rwy.length * 0.5) / 30;
if (rows > 15) rows = 15; if (rows > 30) rows = 30;
for ( int i = 0; i < rows; ++i ) { for ( int i = 0; i < rows; ++i ) {
// offset 60m upwind // offset 30m upwind
ref = SGGeodesy::direct( ref, length_hdg, 60 ); ref = SGGeodesy::direct( ref, length_hdg, 30 );
SGGeod pt1 = ref; SGGeod pt1 = ref;
// left side bar // left side bar
pt1 = SGGeodesy::direct( pt1, left_hdg, 9 ); pt1 = SGGeodesy::direct( pt1, left_hdg, 11 );
lights.push_back( Point3D::fromSGGeod(pt1) ); lights.push_back( Point3D::fromSGGeod(pt1) );
normals.push_back( normal ); normals.push_back( normal );
@ -545,7 +542,7 @@ TGSuperPoly Runway::gen_touchdown_zone_lights( bool recip )
pt1 = ref; pt1 = ref;
// right side bar // right side bar
pt1 = SGGeodesy::direct( pt1, left_hdg, -9 ); pt1 = SGGeodesy::direct( pt1, left_hdg, -11 );
lights.push_back( Point3D::fromSGGeod(pt1) ); lights.push_back( Point3D::fromSGGeod(pt1) );
normals.push_back( normal ); normals.push_back( normal );
@ -579,29 +576,22 @@ TGSuperPoly Runway::gen_reil( bool recip )
point_list normals; normals.clear(); point_list normals; normals.clear();
string flag = rwy.rwnum[get_thresh0(recip)]; string flag = rwy.rwnum[get_thresh0(recip)];
Point3D normal = gen_runway_light_vector( 10, recip );; Point3D normal = gen_runway_light_vector( 10, recip );
// determine the start point. // determine the start point.
SGGeod ref; SGGeod ref;
double length_hdg, left_hdg; double length_hdg, left_hdg;
if ( recip ) { if ( recip ) {
length_hdg = rwy.heading + 180.0; length_hdg = SGMiscd::normalizePeriodic(0, 360, rwy.heading + 180);
if ( length_hdg > 360.0 ) { length_hdg -= 360.0; } ref = SGGeodesy::direct( GetEnd(), length_hdg, rwy.threshold[get_thresh0(recip)] - 1);
ref = SGGeodesy::direct( GetEnd(), length_hdg, rwy.threshold[get_thresh0(recip)]);
} else { } else {
length_hdg = rwy.heading; length_hdg = rwy.heading;
ref = SGGeodesy::direct(GetStart(), length_hdg, rwy.threshold[get_thresh0(recip)]); ref = SGGeodesy::direct(GetStart(), length_hdg, rwy.threshold[get_thresh0(recip)] - 1);
} }
left_hdg = length_hdg - 90.0; left_hdg = SGMiscd::normalizePeriodic(0, 360, length_hdg - 90.0);
if ( left_hdg < 0 ) {
left_hdg += 360.0;
}
// offset 1m downwind
ref = SGGeodesy::direct( ref, length_hdg, -1 );
double offset = rwy.width * 0.5 + 12; double offset = rwy.width * 0.5 + 12;
// left light // left light
lights.push_back( Point3D::fromSGGeod(SGGeodesy::direct( ref, left_hdg, offset )) ); lights.push_back( Point3D::fromSGGeod(SGGeodesy::direct( ref, left_hdg, offset )) );
normals.push_back( normal ); normals.push_back( normal );