fly/terragear
1
0
Fork 0
Code Activity

Revert "Do not load shared data of own tile."

Browse source 
The original commit did not solve the problem, as also neighbouring tiles were used multiple times due to an inconsistency in the tile grid calculations.
This commit is contained in:
Ralf Gerlich 2008-01-08 03:07:31 -08:00
parent 4f0ee5178f
commit f4b4a7dc3c
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,51 +153,51 @@ void TGMatch::load_shared( const TGConstruct& c, neighbor_type n ) {
if ( n == SW_Corner ) { if ( n == SW_Corner ) {
// cout << "searching for SW corner data" << endl; // cout << "searching for SW corner data" << endl;
cb = sgBucketOffset(clon, clat, -1, 0); cb = sgBucketOffset(clon, clat, -1, 0);
if ( ! (cb==b) ) scan_share_file( base, cb, SE_Corner, n ); scan_share_file( base, cb, SE_Corner, n );
cb = sgBucketOffset(clon, clat, -1, -1); cb = sgBucketOffset(clon, clat, -1, -1);
if ( ! (cb==b) ) scan_share_file( base, cb, NE_Corner, n ); scan_share_file( base, cb, NE_Corner, n );
cb = sgBucketOffset(clon, clat, 0, -1); cb = sgBucketOffset(clon, clat, 0, -1);
if ( ! (cb==b) ) scan_share_file( base, cb, NW_Corner, n ); scan_share_file( base, cb, NW_Corner, n );
} else if ( n == SE_Corner ) { } else if ( n == SE_Corner ) {
// cout << "searching for SE corner data" << endl; // cout << "searching for SE corner data" << endl;
cb = sgBucketOffset(clon, clat, 0, -1); cb = sgBucketOffset(clon, clat, 0, -1);
if ( ! (cb==b) ) scan_share_file( base, cb, NE_Corner, n ); scan_share_file( base, cb, NE_Corner, n );
cb = sgBucketOffset(clon, clat, 1, -1); cb = sgBucketOffset(clon, clat, 1, -1);
if ( ! (cb==b) ) scan_share_file( base, cb, NW_Corner, n ); scan_share_file( base, cb, NW_Corner, n );
cb = sgBucketOffset(clon, clat, 1, 0); cb = sgBucketOffset(clon, clat, 1, 0);
if ( ! (cb==b) ) scan_share_file( base, cb, SW_Corner, n ); scan_share_file( base, cb, SW_Corner, n );
} else if ( n == NE_Corner ) { } else if ( n == NE_Corner ) {
// cout << "searching for NE corner data" << endl; // cout << "searching for NE corner data" << endl;
cb = sgBucketOffset(clon, clat, 1, 0); cb = sgBucketOffset(clon, clat, 1, 0);
if ( ! (cb==b) ) scan_share_file( base, cb, NW_Corner, n ); scan_share_file( base, cb, NW_Corner, n );
cb = sgBucketOffset(clon, clat, 1, 1); cb = sgBucketOffset(clon, clat, 1, 1);
if ( ! (cb==b) ) scan_share_file( base, cb, SW_Corner, n ); scan_share_file( base, cb, SW_Corner, n );
cb = sgBucketOffset(clon, clat, 0, 1); cb = sgBucketOffset(clon, clat, 0, 1);
if ( ! (cb==b) ) scan_share_file( base, cb, SE_Corner, n ); scan_share_file( base, cb, SE_Corner, n );
} else if ( n == NW_Corner ) { } else if ( n == NW_Corner ) {
// cout << "searching for NW corner data" << endl; // cout << "searching for NW corner data" << endl;
cb = sgBucketOffset(clon, clat, 0, 1); cb = sgBucketOffset(clon, clat, 0, 1);
if ( ! (cb==b) ) scan_share_file( base, cb, SW_Corner, n ); scan_share_file( base, cb, SW_Corner, n );
cb = sgBucketOffset(clon, clat, -1, 1); cb = sgBucketOffset(clon, clat, -1, 1);
if ( ! (cb==b) ) scan_share_file( base, cb, SE_Corner, n ); scan_share_file( base, cb, SE_Corner, n );
cb = sgBucketOffset(clon, clat, -1, 0); cb = sgBucketOffset(clon, clat, -1, 0);
if ( ! (cb==b) ) scan_share_file( base, cb, NE_Corner, n ); scan_share_file( base, cb, NE_Corner, n );
} else if ( n == NORTH ) { } else if ( n == NORTH ) {
// cout << "searching for NORTH edge data" << endl; // cout << "searching for NORTH edge data" << endl;
cb = sgBucketOffset(clon, clat, 0, 1); cb = sgBucketOffset(clon, clat, 0, 1);
if ( ! (cb==b) ) scan_share_file( base, cb, SOUTH, n ); scan_share_file( base, cb, SOUTH, n );
} else if ( n == SOUTH ) { } else if ( n == SOUTH ) {
// cout << "searching for SOUTH edge data" << endl; // cout << "searching for SOUTH edge data" << endl;
cb = sgBucketOffset(clon, clat, 0, -1); cb = sgBucketOffset(clon, clat, 0, -1);
if ( ! (cb==b) ) scan_share_file( base, cb, NORTH, n ); scan_share_file( base, cb, NORTH, n );
} else if ( n == EAST ) { } else if ( n == EAST ) {
// cout << "searching for EAST edge data" << endl; // cout << "searching for EAST edge data" << endl;
cb = sgBucketOffset(clon, clat, 1, 0); cb = sgBucketOffset(clon, clat, 1, 0);
if ( ! (cb==b) ) scan_share_file( base, cb, WEST, n ); scan_share_file( base, cb, WEST, n );
} else if ( n == WEST ) { } else if ( n == WEST ) {
// cout << "searching for WEST edge data" << endl; // cout << "searching for WEST edge data" << endl;
cb = sgBucketOffset(clon, clat, -1, 0); cb = sgBucketOffset(clon, clat, -1, 0);
if ( ! (cb==b) ) scan_share_file( base, cb, EAST, n ); scan_share_file( base, cb, EAST, n );
} }
} }