fly/terragear
1
0
Fork 0
Code Activity

Better fix by Geoff McLane

Browse source
This commit is contained in:
Frederic Bouvier 2010-10-02 10:25:36 +02:00
parent dab333f858
commit bbae3a98a6
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/BuildTiles/GenOutput/genobj.cxx
View file

@ -147,7 +147,7 @@ int_list TGGenOutput::calc_tex_coords( TGConstruct& c, point_list geod_nodes,
// build the necessary output structures based on the triangulation // build the necessary output structures based on the triangulation
// data // data
int TGGenOutput::build( TGConstruct& c ) { int TGGenOutput::build( TGConstruct& c ) {
int i, j; int i, j, k;
TGTriNodes trinodes = c.get_tri_nodes(); TGTriNodes trinodes = c.get_tri_nodes();
@ -183,7 +183,11 @@ int TGGenOutput::build( TGConstruct& c ) {
cout << "calculating texture coordinates" << endl; cout << "calculating texture coordinates" << endl;
cout << "c.get_useUKGrid() = " << c.get_useUKGrid() << endl; cout << "c.get_useUKGrid() = " << c.get_useUKGrid() << endl;
tex_coords.clear(); tex_coords.clear();
std::vector < SGGeod > convGeodNodes;
for ( k = 0; k < geod_nodes.size(); k++ ) {
Point3D node = geod_nodes[k];
convGeodNodes.push_back( SGGeod::fromDegM( node.x(), node.y(), node.z() ) );
}
for ( i = 0; i < TG_MAX_AREA_TYPES; ++i ) { for ( i = 0; i < TG_MAX_AREA_TYPES; ++i ) {
// cout << " area = " << i << endl; // cout << " area = " << i << endl;
for ( j = 0; j < (int)fans[i].size(); ++j ) { for ( j = 0; j < (int)fans[i].size(); ++j ) {
@ -203,18 +207,12 @@ int TGGenOutput::build( TGConstruct& c ) {
if( (c.get_useUKGrid()) && (isInUK(ourPosition)) ) { if( (c.get_useUKGrid()) && (isInUK(ourPosition)) ) {
point_list tp_list; point_list tp_list;
tp_list = UK_calc_tex_coords( b, geod_nodes, fans[i][j], 1.0 ); tp_list = UK_calc_tex_coords( b, geod_nodes, fans[i][j], 1.0 );
for ( int k = 0; k < (int)tp_list.size(); ++k ) { for ( k = 0; k < (int)tp_list.size(); ++k ) {
// cout << " tc = " << tp_list[k] << endl; // cout << " tc = " << tp_list[k] << endl;
int index = tex_coords.simple_add( tp_list[k] ); int index = tex_coords.simple_add( tp_list[k] );
ti_list.push_back( index ); ti_list.push_back( index );
} }
} else { } else {
int k;
std::vector < SGGeod > convGeodNodes;
for ( k = 0; k < geod_nodes.size(); k++ ) {
Point3D node = geod_nodes[k];
convGeodNodes.push_back( SGGeod::fromDegM( node.x(), node.y(), node.z() ) );
}
std::vector< SGVec2f > tp_list = sgCalcTexCoords( b, convGeodNodes, fans[i][j] ); std::vector< SGVec2f > tp_list = sgCalcTexCoords( b, convGeodNodes, fans[i][j] );
for ( k = 0; k < (int)tp_list.size(); ++k ) { for ( k = 0; k < (int)tp_list.size(); ++k ) {
SGVec2f tc = tp_list[k]; SGVec2f tc = tp_list[k];
@ -236,7 +234,7 @@ int TGGenOutput::build( TGConstruct& c ) {
} }
// caclulate the bounding sphere for a list of triangle faces // calculate the bounding sphere for a list of triangle faces
void TGGenOutput::calc_group_bounding_sphere( TGConstruct& c, void TGGenOutput::calc_group_bounding_sphere( TGConstruct& c,
const opt_list& fans, const opt_list& fans,
Point3D *center, double *radius ) Point3D *center, double *radius )