fly/terragear
1
0
Fork 0
Code Activity

Fixes corresponding to slightly different terrafit output.

Browse source
This commit is contained in:
curt 2003-08-22 19:13:02 +00:00
parent 38bb74f339
commit 7a4f52e98b
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Lib/Array/array.cxx
View file

@ -158,16 +158,12 @@ TGArray::parse( SGBucket& b ) {
// Parse/load the fitted data file // Parse/load the fitted data file
if ( fitted_in->is_open() ) { if ( fitted_in->is_open() ) {
int fitted_size; int fitted_size;
double x, y, z, error; double x, y, z;
*fitted_in >> fitted_size; *fitted_in >> fitted_size;
for ( int i = 0; i < fitted_size; ++i ) { for ( int i = 0; i < fitted_size; ++i ) {
*fitted_in >> x >> y >> z; *fitted_in >> x >> y >> z;
if ( i < 4 ) { fitted_list.push_back( Point3D(x, y, z) );
// skip first 4 corner nodes cout << " loading fitted = " << Point3D(x, y, z) << endl;
} else {
fitted_list.push_back( Point3D(x, y, z) );
cout << " loading fitted = " << Point3D(x, y, z) << endl;
}
} }
} }
@ -457,8 +453,8 @@ double TGArray::closest_nonvoid_elev( double lon, double lat ) const {
if ( dist < mindist && elev > -9000 ) { if ( dist < mindist && elev > -9000 ) {
mindist = dist; mindist = dist;
minelev = elev; minelev = elev;
cout << "dist = " << mindist; // cout << "dist = " << mindist;
cout << " elev = " << elev << endl; // cout << " elev = " << elev << endl;
} }
} }
} }
@ -480,7 +476,7 @@ double TGArray::altitude_from_grid( double lon, double lat ) const {
int x1, x2, x3, y1, y2, y3; int x1, x2, x3, y1, y2, y3;
float z1, z2, z3; float z1, z2, z3;
int xindex, yindex; int xindex, yindex;
/* determine if we are in the lower triangle or the upper triangle /* determine if we are in the lower triangle or the upper triangle
______ ______
| /| | /|