fly/terragear
1
0
Fork 0
Code Activity

Change edge lights routine to work with displaced thresholds as well

Browse source
This commit is contained in:
Christian Schmitt 2012-08-17 13:10:08 +02:00
parent 7774de4939
commit b0bb0ab9a0
2 changed files with 64 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,13 +92,17 @@ Point3D Runway::gen_runway_light_vector( double angle, bool recip ) {
// 60 meters spacing or the next number down that divides evenly.
superpoly_list Runway::gen_runway_edge_lights( bool recip )
{
point_list r_lights; r_lights.clear();
point_list w_lights; w_lights.clear();
point_list y_lights; y_lights.clear();
point_list r_normals; r_normals.clear();
point_list w_normals; w_normals.clear();
point_list y_normals; y_normals.clear();
int i;
int divs = (int)(rwy.length / 60.0) + 1;
int i;
double dist = rwy.length;
int divs = (int)(dist / 60.0) + 1;
double step = dist / divs;
Point3D normal = gen_runway_light_vector( 3.0, recip );
point_list corner = gen_corners(2.0, rwy.threshold[0], rwy.threshold[1], 2.0);
@ -118,13 +122,23 @@ superpoly_list Runway::gen_runway_edge_lights( bool recip )
pt2 = corner[2];
}
double dist = rwy.length;
double step = dist / divs;
Point3D thresh1 = pt1;
Point3D thresh2 = pt2;
int tstep;
w_lights.push_back( pt1 );
w_normals.push_back( normal );
w_lights.push_back( pt2 );
w_normals.push_back( normal );
//front threshold
if (rwy.threshold[get_thresh0(recip)] > step )
{
tstep = (int)(rwy.threshold[get_thresh0(recip)] / step) + 1;
for ( i = 0; i < tstep; ++i ) {
thresh1 -= inc1;
thresh2 -= inc2;
r_lights.push_back( thresh1 );
r_normals.push_back( normal );
r_lights.push_back( thresh2 );
r_normals.push_back( normal );
}
}
dist -= step;
for ( i = 0; i < divs; ++i ) {
@ -135,7 +149,7 @@ superpoly_list Runway::gen_runway_edge_lights( bool recip )
w_normals.push_back( normal );
w_lights.push_back( pt2 );
w_normals.push_back( normal );
} else {
} else if (dist > 5) {
y_lights.push_back( pt1 );
y_normals.push_back( normal );
y_lights.push_back( pt2 );
@ -144,6 +158,20 @@ superpoly_list Runway::gen_runway_edge_lights( bool recip )
dist -= step;
}
//back threshold
if (rwy.threshold[get_thresh1(recip)] > step )
{
tstep = (int)(rwy.threshold[get_thresh1(recip)] / step) + 1;
for ( i = 0; i < tstep; ++i ) {
pt1 += inc1;
pt2 += inc2;
y_lights.push_back( pt1 );
y_normals.push_back( normal );
y_lights.push_back( pt2 );
y_normals.push_back( normal );
}
}
TGPolygon lights_poly; lights_poly.erase();
TGPolygon normals_poly; normals_poly.erase();
lights_poly.add_contour( w_lights, false );
@ -176,10 +204,27 @@ superpoly_list Runway::gen_runway_edge_lights( bool recip )
else if (rwy.edge_lights == 1)
yellow.set_material( "RWY_YELLOW_LOW_LIGHTS" );
lights_poly.erase();
normals_poly.erase();
lights_poly.add_contour( r_lights, false );
normals_poly.add_contour( r_normals, false );
TGSuperPoly red;
red.set_poly( lights_poly );
red.set_normals( normals_poly );
//Different intensities
if (rwy.edge_lights == 3)
red.set_material( "RWY_RED_LIGHTS" );
else if (rwy.edge_lights == 2)
red.set_material( "RWY_RED_MEDIUM_LIGHTS" );
else if (rwy.edge_lights == 1)
red.set_material( "RWY_RED_LOW_LIGHTS" );
superpoly_list result; result.clear();
result.push_back( white );
result.push_back( yellow );
result.push_back( red );
return result;
}

10
src/Airports/GenAirports850/runway.hxx
View file

@ -151,6 +151,16 @@ private:
void gen_runway_lights( superpoly_list* lights );
int get_thresh0(bool recip)
{
return (recip) ? 1 : 0;
}
int get_thresh1(bool recip)
{
return (recip) ? 0 : 1;
}
point_list gen_corners( double l_ext, double disp1, double disp2, double w_ext );
Point3D gen_runway_light_vector( double angle, bool recip );
superpoly_list gen_runway_edge_lights( bool recip );