fly/flightgear
1
0
Fork 0
Code Activity

Tweaked some log messages.

Browse source
This commit is contained in:
curt 1999-09-01 18:52:31 +00:00
parent 0925492e4c
commit 87e3a7decb
2 changed files with 19 additions and 18 deletions

12
src/Scenery/tilecache.cxx
View file

@ -133,7 +133,7 @@ FGTileCache::exists( const FGBucket& p )
void void
FGTileCache::fill_in( int index, const FGBucket& p ) FGTileCache::fill_in( int index, const FGBucket& p )
{ {
cout << "FILL IN CACHE ENTRY = " << index << endl; // cout << "FILL IN CACHE ENTRY = " << index << endl;
// Force some values in case the tile fails to load (i.e. fill // Force some values in case the tile fails to load (i.e. fill
// doesn't exist) // doesn't exist)
@ -163,13 +163,13 @@ FGTileCache::fill_in( int index, const FGBucket& p )
terrain->addKid( tile_cache[index].select_ptr ); terrain->addKid( tile_cache[index].select_ptr );
if ( tile_cache[index].is_scheduled_for_cache() ) { if ( tile_cache[index].is_scheduled_for_cache() ) {
cout << "FOUND ONE SCHEDULED FOR CACHE" << endl; // cout << "FOUND ONE SCHEDULED FOR CACHE" << endl;
// load, but not needed now so disable // load, but not needed now so disable
tile_cache[index].mark_loaded(); tile_cache[index].mark_loaded();
tile_cache[index].ssg_disable(); tile_cache[index].ssg_disable();
tile_cache[index].select_ptr->select(0); tile_cache[index].select_ptr->select(0);
} else { } else {
cout << "FOUND ONE READY TO LOAD" << endl; // cout << "FOUND ONE READY TO LOAD" << endl;
tile_cache[index].mark_loaded(); tile_cache[index].mark_loaded();
tile_cache[index].select_ptr->select(1); tile_cache[index].select_ptr->select(1);
} }
@ -180,7 +180,7 @@ FGTileCache::fill_in( int index, const FGBucket& p )
void void
FGTileCache::entry_free( int cache_index ) FGTileCache::entry_free( int cache_index )
{ {
cout << "FREEING CACHE ENTRY = " << cache_index << endl; // cout << "FREEING CACHE ENTRY = " << cache_index << endl;
tile_cache[cache_index].free_tile(); tile_cache[cache_index].free_tile();
} }
@ -247,8 +247,8 @@ FGTileCache::next_avail( void )
// index. // index.
if ( max_index >=0 ) { if ( max_index >=0 ) {
FG_LOG( FG_TERRAIN, FG_INFO, " max_dist = " << max_dist ); FG_LOG( FG_TERRAIN, FG_DEBUG, " max_dist = " << max_dist );
FG_LOG( FG_TERRAIN, FG_INFO, " index = " << max_index ); FG_LOG( FG_TERRAIN, FG_DEBUG, " index = " << max_index );
entry_free( max_index ); entry_free( max_index );
return( max_index ); return( max_index );
} else { } else {

25
src/Scenery/tileentry.cxx
View file

@ -64,33 +64,34 @@ FGTileEntry::~FGTileEntry ( void ) {
void void
FGTileEntry::free_tile() FGTileEntry::free_tile()
{ {
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
"FREEING TILE = (" << tile_bucket << ")" ); "FREEING TILE = (" << tile_bucket << ")" );
// mark tile unused // mark tile unused
mark_unused(); mark_unused();
// delete fragment list // delete fragment list and node list
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
" deleting " << fragment_list.size() << " fragments" ); " deleting " << fragment_list.size() << " fragments" );
// for_each( begin(), end(), fragment_list.clear();
// mem_fun_ref( &fgFRAGMENT::deleteDisplayList )); FG_LOG( FG_TERRAIN, FG_DEBUG,
fragment_list.erase( begin(), end() ); " deleting " << nodes.size() << " nodes" );
nodes.clear();
// delete the ssg used structures // delete the ssg structures
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
" deleting vertex, normal, and texture coordinate arrays" ); " deleting vertex, normal, and texture coordinate arrays" );
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
" deleting vertex array" ); " deleting vertex array" );
if ( vtlist != NULL ) { if ( vtlist != NULL ) {
delete vtlist; delete vtlist;
} }
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
" deleting normal array" ); " deleting normal array" );
if ( vnlist != NULL ) { if ( vnlist != NULL ) {
delete vnlist; delete vnlist;
} }
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
" deleting texture coordinate array" ); " deleting texture coordinate array" );
if ( tclist != NULL ) { if ( tclist != NULL ) {
delete tclist; delete tclist;
@ -110,7 +111,7 @@ FGTileEntry::free_tile()
for ( int i = 0; i < kcount; ++i ) { for ( int i = 0; i < kcount; ++i ) {
ssgEntity *kid = parent->getKid( i ); ssgEntity *kid = parent->getKid( i );
if ( kid == select_ptr ) { if ( kid == select_ptr ) {
FG_LOG( FG_TERRAIN, FG_INFO, FG_LOG( FG_TERRAIN, FG_DEBUG,
"Found a kid to delete " << kid); "Found a kid to delete " << kid);
found_kid = true; found_kid = true;
} }