fly/terragear
1
0
Fork 0
Code Activity

activate external threshold light bar function and clean up

Browse source
This commit is contained in:
Christian Schmitt 2012-09-01 00:35:47 +02:00
parent 7df8533e8e
commit d80a4c2df5
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,14 +230,13 @@ superpoly_list Runway::gen_runway_edge_lights( bool recip )
} }
// generate threshold lights for a 3 degree approach // generate threshold lights for a 3 degree approach
superpoly_list Runway::gen_runway_threshold_lights( int kind, bool recip ) superpoly_list Runway::gen_runway_threshold_lights( const int kind, bool recip )
{ {
point_list g_lights; g_lights.clear(); point_list g_lights; g_lights.clear();
point_list g_normals; g_normals.clear(); point_list g_normals; g_normals.clear();
point_list r_lights; r_lights.clear(); point_list r_lights; r_lights.clear();
point_list r_normals; r_normals.clear(); point_list r_normals; r_normals.clear();
int i; int i;
kind =1;
point_list corner = gen_corners( 2.0, rwy.threshold[0], rwy.threshold[1], 2.0 ); point_list corner = gen_corners( 2.0, rwy.threshold[0], rwy.threshold[1], 2.0 );
@ -2610,34 +2609,39 @@ void Runway::gen_runway_lights( superpoly_list *lights ) {
} }
} }
// Approach light systems that have a threshold light bar
SG_LOG(SG_GENERAL, SG_DEBUG, "Edge light = " << rwy.edge_lights << " Centre light = " << rwy.centerline_lights ); // use a central routine for its creation
SG_LOG(SG_GENERAL, SG_DEBUG, "ALC1 flag = " << rwy.approach_lights[0] << " ALC2 flag2 = " << rwy.approach_lights[1] ); if ( rwy.approach_lights[0] > 0 && rwy.approach_lights[0] < 11)
{
// Many aproach lighting systems define the threshold lighting // forward direction
// needed, but for those that don't (i.e. REIL, ODALS, or Edge superpoly_list s = gen_runway_threshold_lights( 1, false );
// lights defined but no approach lights) for ( i = 0; i < s.size(); ++i ) {
// make threshold lighting lights->push_back( s[i] );
}
if ( rwy.reil[0] > 0 /* Has REIL lighting */ }
|| rwy.approach_lights[0] == 11 /* ODALS Omni-directional approach light system */ if ( rwy.approach_lights[1] > 0 && rwy.approach_lights[1] < 11)
|| ( rwy.edge_lights > 0 && rwy.approach_lights[0] == 0 ) /* Has edge lighting, but no {
approach lighting */ ) // reverse direction
superpoly_list s = gen_runway_threshold_lights( 1, true );
for ( i = 0; i < s.size(); ++i ) {
lights->push_back( s[i] );
}
}
// If the runway has edge lights but no approach lights,
// or approach lights without a lights bar,
// create a simple threshold lighting
if ( rwy.edge_lights > 0 && (rwy.approach_lights[0] == 0 || rwy.approach_lights[0] > 10))
{ {
// forward direction // forward direction
SG_LOG(SG_GENERAL, SG_DEBUG, "threshold lights for forward direction" );
superpoly_list s = gen_runway_threshold_lights( 0, false ); superpoly_list s = gen_runway_threshold_lights( 0, false );
for ( i = 0; i < s.size(); ++i ) { for ( i = 0; i < s.size(); ++i ) {
lights->push_back( s[i] ); lights->push_back( s[i] );
} }
} }
if ( rwy.reil[1] > 0 /* Has REIL lighting */ if ( rwy.edge_lights > 0 && (rwy.approach_lights[1] == 0 || rwy.approach_lights[1] > 10))
|| rwy.approach_lights[1] == 11 /* ODALS Omni-directional approach light system */
|| ( rwy.edge_lights > 0 && rwy.approach_lights[1] == 0 ) /* Has edge lighting, but no
approach lighting */ )
{ {
// reverse direction // reverse direction
SG_LOG(SG_GENERAL, SG_DEBUG, "threshold lights for reverse direction" );
superpoly_list s = gen_runway_threshold_lights( 0, true ); superpoly_list s = gen_runway_threshold_lights( 0, true );
for ( i = 0; i < s.size(); ++i ) { for ( i = 0; i < s.size(); ++i ) {
lights->push_back( s[i] ); lights->push_back( s[i] );