fly/terragear
1
0
Fork 0
Code Activity

Fixed "rest" texture application.

Browse source
This commit is contained in:
curt 2000-09-11 00:35:59 +00:00
parent c9930e784e
commit 5606d93796
1 changed files with 351 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

584
src/Airports/GenAirports/build.cxx
View file

@ -1181,25 +1181,24 @@ static void gen_precision_rwy( const FGRunway& rwy_info,
// The rest ... // The rest ...
// //
if ( end_pct >= 1.0 ) { while ( end_pct < 1.0 ) {
return; start_pct = end_pct;
end_pct = start_pct + ( 400.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
} }
start_pct = end_pct;
end_pct = 1.0;
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
} }
@ -1285,6 +1284,48 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
material, "threshold", material, "threshold",
rwy_polys, texparams, accum ); rwy_polys, texparams, accum );
//
// Runway designation letter
//
int len = rwy_info.rwy_no.length();
string letter = "";
string rev_letter = "";
for ( int i = 0; i < len; ++i ) {
string tmp = rwy_info.rwy_no.substr(i, 1);
if ( tmp == "L" ) {
letter = "L";
rev_letter = "R";
} else if ( tmp == "R" ) {
letter = "R";
rev_letter = "L";
} else if ( tmp == "C" ) {
letter == "C";
rev_letter = "C";
}
}
cout << "Runway designation = " << rwy_info.rwy_no << endl;
cout << "Runway designation letter = " << letter << endl;
if ( letter != "" ) {
start_pct = end_pct;
end_pct = start_pct + ( 90.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, rev_letter,
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, letter,
rwy_polys, texparams, accum );
}
// //
// Runway designation number(s) // Runway designation number(s)
// //
@ -1292,7 +1333,7 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
start_pct = end_pct; start_pct = end_pct;
end_pct = start_pct + ( 100.0 / length ); end_pct = start_pct + ( 100.0 / length );
int len = rwy_info.rwy_no.length(); len = rwy_info.rwy_no.length();
string snum = rwy_info.rwy_no; string snum = rwy_info.rwy_no;
for ( int i = 0; i < len; ++i ) { for ( int i = 0; i < len; ++i ) {
string tmp = rwy_info.rwy_no.substr(i, 1); string tmp = rwy_info.rwy_no.substr(i, 1);
@ -1314,89 +1355,90 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
gen_number_block( rwy_info, material, runway_a, rwy_info.heading, gen_number_block( rwy_info, material, runway_a, rwy_info.heading,
num, start_pct, end_pct, rwy_polys, texparams, accum ); num, start_pct, end_pct, rwy_polys, texparams, accum );
// if ( false ) {
// Intermediate area before aiming point ... //
// // Intermediate area before aiming point ...
//
start_pct = end_pct; start_pct = end_pct;
end_pct = start_pct + ( 360.0 / length ); end_pct = start_pct + ( 360.0 / length );
gen_runway_section( rwy_info, runway_a, gen_runway_section( rwy_info, runway_a,
start_pct, end_pct, start_pct, end_pct,
0.0, 1.0, 0.0, 1.0,
rwy_info.heading, rwy_info.heading,
material, "rest", material, "rest",
rwy_polys, texparams, accum ); rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b, gen_runway_section( rwy_info, runway_b,
start_pct, end_pct, start_pct, end_pct,
0.0, 1.0, 0.0, 1.0,
rwy_info.heading + 180.0, rwy_info.heading + 180.0,
material, "rest", material, "rest",
rwy_polys, texparams, accum ); rwy_polys, texparams, accum );
start_pct = end_pct; start_pct = end_pct;
end_pct = start_pct + ( 360.0 / length ); end_pct = start_pct + ( 360.0 / length );
gen_runway_section( rwy_info, runway_a, gen_runway_section( rwy_info, runway_a,
start_pct, end_pct, start_pct, end_pct,
0.0, 1.0, 0.0, 1.0,
rwy_info.heading, rwy_info.heading,
material, "rest", material, "rest",
rwy_polys, texparams, accum ); rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b, gen_runway_section( rwy_info, runway_b,
start_pct, end_pct, start_pct, end_pct,
0.0, 1.0, 0.0, 1.0,
rwy_info.heading + 180.0, rwy_info.heading + 180.0,
material, "rest", material, "rest",
rwy_polys, texparams, accum ); rwy_polys, texparams, accum );
// //
// Aiming point // Aiming point
// //
if ( end_pct >= 1.0 ) { if ( end_pct >= 1.0 ) {
return; return;
}
start_pct = end_pct;
end_pct = start_pct + ( 500 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "aim",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "aim",
rwy_polys, texparams, accum );
} }
start_pct = end_pct;
end_pct = start_pct + ( 500 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "aim",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "aim",
rwy_polys, texparams, accum );
// //
// The rest ... // The rest ...
// //
if ( end_pct >= 1.0 ) { while ( end_pct < 1.0 ) {
return; start_pct = end_pct;
end_pct = start_pct + ( 400.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
} }
start_pct = end_pct;
end_pct = 1.0;
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
} }
@ -1405,11 +1447,11 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
// precision runway markings, please refer to FAA document AC // precision runway markings, please refer to FAA document AC
// 150/5340-1H // 150/5340-1H
static void gen_visual_rwy( const FGRunway& rwy_info, static void gen_visual_rwy( const FGRunway& rwy_info,
const string& material, const string& material,
superpoly_list *rwy_polys, superpoly_list *rwy_polys,
texparams_list *texparams, texparams_list *texparams,
FGPolygon *accum ) FGPolygon *accum )
{ {
// //
@ -1464,6 +1506,48 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
double end_pct = 0; double end_pct = 0;
//
// Runway designation letter
//
int len = rwy_info.rwy_no.length();
string letter = "";
string rev_letter = "";
for ( int i = 0; i < len; ++i ) {
string tmp = rwy_info.rwy_no.substr(i, 1);
if ( tmp == "L" ) {
letter = "L";
rev_letter = "R";
} else if ( tmp == "R" ) {
letter = "R";
rev_letter = "L";
} else if ( tmp == "C" ) {
letter == "C";
rev_letter = "C";
}
}
cout << "Runway designation = " << rwy_info.rwy_no << endl;
cout << "Runway designation letter = " << letter << endl;
if ( letter != "" ) {
start_pct = end_pct;
end_pct = start_pct + ( 90.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, rev_letter,
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, letter,
rwy_polys, texparams, accum );
}
// //
// Runway designation number(s) // Runway designation number(s)
// //
@ -1471,7 +1555,7 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
start_pct = end_pct; start_pct = end_pct;
end_pct = start_pct + ( 100.0 / length ); end_pct = start_pct + ( 100.0 / length );
int len = rwy_info.rwy_no.length(); len = rwy_info.rwy_no.length();
string snum = rwy_info.rwy_no; string snum = rwy_info.rwy_no;
for ( int i = 0; i < len; ++i ) { for ( int i = 0; i < len; ++i ) {
string tmp = rwy_info.rwy_no.substr(i, 1); string tmp = rwy_info.rwy_no.substr(i, 1);
@ -1493,98 +1577,169 @@ static void gen_non_precision_rwy( const FGRunway& rwy_info,
gen_number_block( rwy_info, material, runway_a, rwy_info.heading, gen_number_block( rwy_info, material, runway_a, rwy_info.heading,
num, start_pct, end_pct, rwy_polys, texparams, accum ); num, start_pct, end_pct, rwy_polys, texparams, accum );
// if ( false ) {
// Intermediate area before aiming point ... //
// // Intermediate area before aiming point ...
//
if ( end_pct >= 1.0 ) { if ( end_pct >= 1.0 ) {
return; return;
}
start_pct = end_pct;
end_pct = start_pct + ( 450.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
if ( end_pct >= 1.0 ) {
return;
}
start_pct = end_pct;
end_pct = start_pct + ( 450.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
//
// Aiming point
//
if ( end_pct >= 1.0 ) {
return;
}
start_pct = end_pct;
end_pct = start_pct + ( 500 / length );
if ( end_pct > 1.0 ) { end_pct = 1.0; }
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "aim",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "aim",
rwy_polys, texparams, accum );
} }
start_pct = end_pct;
end_pct = start_pct + ( 450.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
if ( end_pct >= 1.0 ) {
return;
}
start_pct = end_pct;
end_pct = start_pct + ( 450.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
//
// Aiming point
//
if ( end_pct >= 1.0 ) {
return;
}
start_pct = end_pct;
end_pct = start_pct + ( 500 / length );
if ( end_pct > 1.0 ) { end_pct = 1.0; }
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "aim",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "aim",
rwy_polys, texparams, accum );
// //
// The rest ... // The rest ...
// //
if ( end_pct >= 1.0 ) { while ( end_pct < 1.0 ) {
return; start_pct = end_pct;
end_pct = start_pct + ( 400.0 / length );
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading + 180.0,
material, "rest",
rwy_polys, texparams, accum );
}
}
// build a runway
void build_runway( const FGRunway& rwy_info,
superpoly_list *rwy_polys,
texparams_list *texparams,
FGPolygon *accum,
point_list *apt_pts ) {
string surface_flag = rwy_info.surface_flags.substr(1, 1);
cout << "surface flag = " << surface_flag << endl;
string material;
if ( surface_flag == "A" ) {
material = "pa_"; // asphalt
} else if ( surface_flag == "C" ) {
material = "pc_"; // concrete
} else if ( surface_flag == "D" ) {
material = "dirt_rwy";
} else if ( surface_flag == "G" ) {
material = "grass_rwy";
} else if ( surface_flag == "T" ) {
material = "grass_rwy";
} else if ( surface_flag == "W" ) {
// water ???
} else {
cout << "unknown runway type!" << endl;
exit(-1);
} }
start_pct = end_pct; string type_flag = rwy_info.surface_flags.substr(2, 1);
end_pct = 1.0; cout << "type flag = " << type_flag << endl;
gen_runway_section( rwy_info, runway_a,
start_pct, end_pct,
0.0, 1.0,
rwy_info.heading,
material, "rest",
rwy_polys, texparams, accum );
gen_runway_section( rwy_info, runway_b, if ( surface_flag == "D" || surface_flag == "G" ||
start_pct, end_pct, surface_flag == "T" )
0.0, 1.0, {
rwy_info.heading + 180.0, gen_simple_rwy( rwy_info, material,
material, "rest",
rwy_polys, texparams, accum ); rwy_polys, texparams, accum );
} else if ( type_flag == "P" ) {
// precision runway markings
gen_precision_rwy( rwy_info, material,
rwy_polys, texparams, accum );
} else if ( type_flag == "R" ) {
// non-precision runway markings
gen_non_precision_rwy( rwy_info, material,
rwy_polys, texparams, accum );
} else if ( type_flag == "V" ) {
// visual runway markings
gen_visual_rwy( rwy_info, material,
rwy_polys, texparams, accum );
} else if ( type_flag == "B" ) {
// bouys (sea plane base)
// do nothing for now.
} else {
// unknown runway code ... hehe, I know, let's just die
// right here so the programmer has to fix his code if a
// new code ever gets introduced. :-)
cout << "Unknown runway code in build.cxx:build_airport()" << endl;
cout << "dying ..." << endl;
exit(-1);
}
FGPolygon base = gen_runway_area( rwy_info, 1.05, 1.5 );
// add base to apt_pts (for convex hull of airport area)
for ( int j = 0; j < base.contour_size( 0 ); ++j ) {
Point3D p = base.get_pt(0, j);
// cout << " point = " << p << endl;
apt_pts->push_back( p );
}
} }
@ -1598,7 +1753,6 @@ void build_airport( string airport_raw, string_list& runways_raw,
// poly_list rwy_tris, rwy_txs; // poly_list rwy_tris, rwy_txs;
FGPolygon runway, runway_a, runway_b, result, clipped_a, clipped_b; FGPolygon runway, runway_a, runway_b, result, clipped_a, clipped_b;
FGPolygon split_a, split_b; FGPolygon split_a, split_b;
FGPolygon base;
point_list apt_pts; point_list apt_pts;
Point3D p; Point3D p;
@ -1696,67 +1850,31 @@ void build_airport( string airport_raw, string_list& runways_raw,
FGSuperPoly sp; FGSuperPoly sp;
FGTexParams tp; FGTexParams tp;
// First pass: generate the precision runways since these have
// precidence
for ( int i = 0; i < (int)runways.size(); ++i ) { for ( int i = 0; i < (int)runways.size(); ++i ) {
string surface_flag = runways[i].surface_flags.substr(1, 1);
cout << "surface flag = " << surface_flag << endl;
string material;
if ( surface_flag == "A" ) {
material = "pa_"; // asphalt
} else if ( surface_flag == "C" ) {
material = "pc_"; // concrete
} else if ( surface_flag == "D" ) {
material = "dirt_rwy";
} else if ( surface_flag == "G" ) {
material = "grass_rwy";
} else if ( surface_flag == "T" ) {
material = "grass_rwy";
} else if ( surface_flag == "W" ) {
// water ???
} else {
cout << "unknown runway type!" << endl;
exit(-1);
}
string type_flag = runways[i].surface_flags.substr(2, 1); string type_flag = runways[i].surface_flags.substr(2, 1);
cout << "type flag = " << type_flag << endl; if ( type_flag == "P" ) {
build_runway( runways[i],
if ( surface_flag == "D" || surface_flag == "G" || &rwy_polys, &texparams, &accum, &apt_pts );
surface_flag == "T" )
{
gen_simple_rwy( runways[i], material,
&rwy_polys, &texparams, &accum );
} else if ( type_flag == "P" ) {
// precision runway markings
gen_precision_rwy( runways[i], material,
&rwy_polys, &texparams, &accum );
} else if ( type_flag == "R" ) {
// non-precision runway markings
gen_non_precision_rwy( runways[i], material,
&rwy_polys, &texparams, &accum );
} else if ( type_flag == "V" ) {
// visual runway markings
gen_visual_rwy( runways[i], material,
&rwy_polys, &texparams, &accum );
} else if ( type_flag == "B" ) {
// bouys (sea plane base)
// do nothing for now.
} else {
// unknown runway code ... hehe, I know, let's just die
// right here so the programmer has to fix his code if a
// new code ever gets introduced. :-)
cout << "Unknown runway code in build.cxx:build_airport()" << endl;
cout << "dying ..." << endl;
exit(-1);
} }
}
base = gen_runway_area( runways[i], 1.05, 1.5 ); // 2nd pass: generate the non-precision and visual runways
for ( int i = 0; i < (int)runways.size(); ++i ) {
string type_flag = runways[i].surface_flags.substr(2, 1);
if ( type_flag == "R" || type_flag == "V" ) {
build_runway( runways[i],
&rwy_polys, &texparams, &accum, &apt_pts );
}
}
// add base to apt_pts (for convex hull of airport area) // Last pass: generate all remaining runways not covered in the first pass
for ( int j = 0; j < base.contour_size( 0 ); ++j ) { for ( int i = 0; i < (int)runways.size(); ++i ) {
p = base.get_pt(0, j); string type_flag = runways[i].surface_flags.substr(2, 1);
// cout << " point = " << p << endl; if ( type_flag != "P" && type_flag != "R" && type_flag != "V" ) {
apt_pts.push_back( p ); build_runway( runways[i],
&rwy_polys, &texparams, &accum, &apt_pts );
} }
} }