fly/terragear
1
0
Fork 0
Code Activity

Convert runway light vector calculation to SGVec3 and SGQuat

Browse source
This commit is contained in:
Christian Schmitt 2012-10-17 08:58:48 +02:00
parent 306b125044
commit b6a4dacf33
2 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,43 +49,24 @@ point_list Runway::gen_corners(double l_ext, double disp1, double disp2, double
return corner; return corner;
} }
// calculate the runway light direction vector. We take the center of // calculate the runway light direction vector. We take both runway
// one runway end - the center of the other end to get the direction // ends to get the direction of the runway.
// of the runway. Combine this with an appropriate portion of the Point3D Runway::gen_runway_light_vector( float angle, bool recip ) {
// local 'up' vector based on the provide 'angle' gives the light SGVec3f cart1, cart2;
// direction vector for the runway.
Point3D Runway::gen_runway_light_vector( double angle, bool recip ) {
double length;
point_list corner = gen_corners(0.0, 0.0, 0.0, 0.0);
Point3D end1, end2;
if ( !recip ) { if ( !recip ) {
end1 = (corner[0] + corner[1]) / 2.0; cart1 = normalize(SGVec3f::fromGeod(GetStart()));
end2 = (corner[2] + corner[3]) / 2.0; cart2 = normalize(SGVec3f::fromGeod(GetEnd()));
} else { } else {
end2 = (corner[0] + corner[1]) / 2.0; cart2 = normalize(SGVec3f::fromGeod(GetStart()));
end1 = (corner[2] + corner[3]) / 2.0; cart1 = normalize(SGVec3f::fromGeod(GetEnd()));
} }
Point3D cart1 = sgGeodToCart( end1 * SG_DEGREES_TO_RADIANS );
Point3D cart2 = sgGeodToCart( end2 * SG_DEGREES_TO_RADIANS );
SG_LOG(SG_GENERAL, SG_DEBUG, "cart1 = " << cart1 << " cart2 = " << cart2);
Point3D up = cart1; SGVec3f runway_vec = normalize(cart1 - cart2);
length = up.distance3D( Point3D(0.0) ); SGVec3f horizontal(normalize(cross(cart1, runway_vec)));
up = up / length; SGQuatf rotation = SGQuatf::fromAngleAxisDeg(angle, horizontal);
SGVec3f light_vec = rotation.transform(runway_vec);
Point3D rwy_vec = cart2 - cart1; return Point3D::fromSGVec3(light_vec);
SG_LOG(SG_GENERAL, SG_DEBUG, "rwy_vec = " << rwy_vec);
// angle up specified amount
length = rwy_vec.distance3D( Point3D(0.0) );
double up_length = length * tan(angle * SG_DEGREES_TO_RADIANS);
Point3D light_vec = rwy_vec + (up * up_length);
length = light_vec.distance3D( Point3D(0.0) );
light_vec = light_vec / length;
return light_vec;
} }
// generate runway edge lighting // generate runway edge lighting

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

@ -162,7 +162,7 @@ private:
} }
point_list gen_corners( double l_ext, double disp1, double disp2, double w_ext ); point_list gen_corners( double l_ext, double disp1, double disp2, double w_ext );
Point3D gen_runway_light_vector( double angle, bool recip ); Point3D gen_runway_light_vector( float angle, bool recip );
superpoly_list gen_runway_edge_lights( bool recip ); superpoly_list gen_runway_edge_lights( bool recip );
superpoly_list gen_runway_threshold_lights( const int kind, bool recip ); superpoly_list gen_runway_threshold_lights( const int kind, bool recip );
superpoly_list gen_runway_center_line_lights( bool recip ); superpoly_list gen_runway_center_line_lights( bool recip );