fly/flightgear
1
0
Fork 0
Code Activity

Tweaks to loop constructs with STL usage.

Browse source
This commit is contained in:
curt 1998-09-09 20:58:09 +00:00
parent 723f54c78b
commit e641ccb51d
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Scenery/tilemgr.cxx
View file

@ -484,9 +484,8 @@ double fgTileMgrCurElev( double lon, double lat, fgPoint3d *abs_view_pos ) {
current = t->fragment_list.begin(); current = t->fragment_list.begin();
last = t->fragment_list.end(); last = t->fragment_list.end();
while ( current != last ) { for ( ; current != last; ++current ) {
frag_ptr = &(*current); frag_ptr = &(*current);
current++;
/* printf("distance squared = %.2f, bounding radius = %.2f\n", /* printf("distance squared = %.2f, bounding radius = %.2f\n",
point_line_dist_squared( &(frag_ptr->center), point_line_dist_squared( &(frag_ptr->center),
&abs_view_pos), local_up), &abs_view_pos), local_up),
@ -644,9 +643,8 @@ void fgTileMgrRender( void ) {
current = t->fragment_list.begin(); current = t->fragment_list.begin();
last = t->fragment_list.end(); last = t->fragment_list.end();
while ( current != last ) { for ( ; current != last; ++current ) {
frag_ptr = &(*current); frag_ptr = &(*current);
current++;
if ( frag_ptr->display_list >= 0 ) { if ( frag_ptr->display_list >= 0 ) {
// Fine (fragment based) culling // Fine (fragment based) culling
@ -714,7 +712,7 @@ void fgTileMgrRender( void ) {
xglPushMatrix(); xglPushMatrix();
while ( mapcurrent != maplast ) { for ( ; mapcurrent != maplast; ++mapcurrent ) {
// (char *)key = (*mapcurrent).first; // (char *)key = (*mapcurrent).first;
// (fgMATERIAL)value = (*mapcurrent).second; // (fgMATERIAL)value = (*mapcurrent).second;
mtl_ptr = &(*mapcurrent).second; mtl_ptr = &(*mapcurrent).second;
@ -761,8 +759,6 @@ void fgTileMgrRender( void ) {
last_tile_ptr = frag_ptr->tile_ptr; last_tile_ptr = frag_ptr->tile_ptr;
} }
} }
*mapcurrent++;
} }
xglPopMatrix(); xglPopMatrix();
@ -775,6 +771,9 @@ void fgTileMgrRender( void ) {
// $Log$ // $Log$
// Revision 1.34 1998/09/09 20:58:09 curt
// Tweaks to loop constructs with STL usage.
//
// Revision 1.33 1998/09/08 15:05:10 curt // Revision 1.33 1998/09/08 15:05:10 curt
// Optimization by Norman Vine. // Optimization by Norman Vine.
// //

5
Scenery/tilemgr.hxx
View file

@ -55,7 +55,10 @@ void fgTileMgrRender( void );
// $Log$ // $Log$
// Revision 1.3 1998/08/22 14:49:59 curt // Revision 1.4 1998/09/09 20:58:11 curt
// Tweaks to loop constructs with STL usage.
//
// Revision 1.3 1998/08/22 14:49:59 curt
// Attempting to iron out seg faults and crashes. // Attempting to iron out seg faults and crashes.
// Did some shuffling to fix a initialization order problem between view // Did some shuffling to fix a initialization order problem between view
// position, scenery elevation. // position, scenery elevation.