fly/terragear
1
0
Fork 0
Code Activity

Fixed a bug with corner matching when an airport hole sits on top of a corner.

Browse source 
Then fixed a follow up bug in corner handling that was introduced by the
first fix.
This commit is contained in:
curt 2000-11-20 16:44:29 +00:00
parent f90cffd10d
commit 5e5f43e0eb
1 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/BuildTiles/Match/match.cxx
View file

@ -224,10 +224,22 @@ void FGMatch::load_neighbor_shared( FGConstruct& c ) {
load_shared( c, WEST ); load_shared( c, WEST );
cout << "Shared data read in:" << endl; cout << "Shared data read in:" << endl;
if ( sw_flag ) { cout << " sw corner = " << sw_node << endl; } if ( sw_flag ) {
if ( se_flag ) { cout << " se corner = " << se_node << endl; } cout << " sw corner = " << sw_node << endl;
if ( ne_flag ) { cout << " ne corner = " << ne_node << endl; } cout << " normal = " << sw_normal << endl;
if ( nw_flag ) { cout << " nw corner = " << nw_node << endl; } }
if ( se_flag ) {
cout << " se corner = " << se_node << endl;
cout << " normal = " << se_normal << endl;
}
if ( ne_flag ) {
cout << " ne corner = " << ne_node << endl;
cout << " normal = " << ne_normal << endl;
}
if ( nw_flag ) {
cout << " nw corner = " << nw_node << endl;
cout << " normal = " << nw_normal << endl;
}
if ( north_flag ) { if ( north_flag ) {
cout << " north nodes = " << north_nodes.size() << endl; cout << " north nodes = " << north_nodes.size() << endl;
for ( int i = 0; i < (int)north_nodes.size(); ++i ) { for ( int i = 0; i < (int)north_nodes.size(); ++i ) {
@ -255,6 +267,21 @@ void FGMatch::load_neighbor_shared( FGConstruct& c ) {
} }
// fake a normal for a point which is basically straight up
static Point3D fake_normal( const Point3D& p ) {
Point3D radians = Point3D( p.x() * DEG_TO_RAD,
p.y() * DEG_TO_RAD,
p.z() );
Point3D cart = sgGeodToCart(radians);
double len = Point3D(0.0).distance3D(cart);
// cout << "len = " << len << endl;
cart /= len;
// cout << "fake normal = " << cart << endl;
return cart;
}
// split up the tile between the shared edge points, normals, and // split up the tile between the shared edge points, normals, and
// segments and the body. This must be done after calling // segments and the body. This must be done after calling
// load_neighbor_data() and will ignore any shared data from the // load_neighbor_data() and will ignore any shared data from the
@ -274,10 +301,22 @@ void FGMatch::split_tile( FGConstruct& c ) {
max.y = b.get_center_lat() + 0.5 * b.get_height(); max.y = b.get_center_lat() + 0.5 * b.get_height();
// defaults "just in case" // defaults "just in case"
sw_node = Point3D( min.x, min.y, 0.0 ); if ( ! sw_flag ) {
se_node = Point3D( max.x, min.y, 0.0 ); sw_node = Point3D( min.x, min.y, 0.0 );
nw_node = Point3D( min.x, max.y, 0.0 ); sw_normal = fake_normal( sw_node );
ne_node = Point3D( max.x, max.y, 0.0 ); }
if ( ! se_flag ) {
se_node = Point3D( max.x, min.y, 0.0 );
se_normal = fake_normal( sw_node );
}
if ( ! nw_flag ) {
nw_node = Point3D( min.x, max.y, 0.0 );
nw_normal = fake_normal( sw_node );
}
if ( ! ne_flag ) {
ne_node = Point3D( max.x, max.y, 0.0 );
ne_normal = fake_normal( sw_node );
}
// separate nodes and normals into components // separate nodes and normals into components
@ -591,21 +630,6 @@ void insert_normal( point_list& normals, Point3D n, int i ) {
} }
// fake a normal for a point which is basically straight up
static Point3D fake_normal( const Point3D& p ) {
Point3D radians = Point3D( p.x() * DEG_TO_RAD,
p.y() * DEG_TO_RAD,
p.z() );
Point3D cart = sgGeodToCart(radians);
double len = Point3D(0.0).distance3D(cart);
cout << "len = " << len << endl;
cart /= len;
cout << "fake normal = " << cart << endl;
return cart;
}
// reassemble the tile pieces (combining the shared data and our own // reassemble the tile pieces (combining the shared data and our own
// data) // data)
void FGMatch::assemble_tile( FGConstruct& c ) { void FGMatch::assemble_tile( FGConstruct& c ) {