actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove and update old comments.

Browse Source 
Remove old function.
Simplify unloading logic by reversing the refcount check.
This commit is contained in:
Glenn Maynard
2003-04-19 22:37:00 +00:00
parent 147c2986e2
commit 592f829f4e
1 changed files with 26 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageTextureManager.cpp
+24 -61
View File
@@ -58,21 +58,10 @@ void RageTextureManager::Update( float fDeltaTime )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
RageTexture* RageTextureManager::LoadTexture( RageTextureID ID ) RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
{ {
/* Don't do this; just get case right to begin with. */
// ID.filename.MakeLower();
LOG->Trace( "RageTextureManager::LoadTexture(%s).", ID.filename.GetString() ); LOG->Trace( "RageTextureManager::LoadTexture(%s).", ID.filename.GetString() );
/* We could have two copies of the same bitmap if there are equivalent but
// Convert the path to lowercase so that we don't load duplicates. * different paths, e.g. "Bitmaps\me.bmp" and "..\Rage PC Edition\Bitmaps\me.bmp". */
// Really, this does not solve the duplicate problem. We could have to copies
// of the same bitmap if there are equivalent but different paths
// (e.g. "Bitmaps\me.bmp" and "..\Rage PC Edition\Bitmaps\me.bmp" ).
/* This will return a texture that is equivalent to ID; here, that means it
* has the same filename. (see RageTextureID::operator<). Once we have that,
* we need to search through textures that are equivalent, looking for one
* that's equal. */
std::map<RageTextureID, RageTexture*>::iterator p = m_mapPathToTexture.find(ID); std::map<RageTextureID, RageTexture*>::iterator p = m_mapPathToTexture.find(ID);
while(p != m_mapPathToTexture.end()) while(p != m_mapPathToTexture.end())
{ {
@@ -81,8 +70,7 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
return p->second; return p->second;
} }
// the texture is not already loaded. Load it. // The texture is not already loaded. Load it.
CString sDir, sFName, sExt; CString sDir, sFName, sExt;
splitpath( ID.filename, sDir, sFName, sExt ); splitpath( ID.filename, sDir, sFName, sExt );
sExt.MakeLower(); sExt.MakeLower();
@@ -97,8 +85,6 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
m_mapPathToTexture[ID] = pTexture; m_mapPathToTexture[ID] = pTexture;
// LOG->Trace( "Display: %.2f KB video memory left", DISPLAY->GetDevice()->GetAvailableTextureMem()/1000000.0f );
return pTexture; return pTexture;
} }
@@ -114,23 +100,24 @@ void RageTextureManager::UnloadTexture( RageTexture *t )
t->m_iRefCount--; t->m_iRefCount--;
ASSERT( t->m_iRefCount >= 0 ); ASSERT( t->m_iRefCount >= 0 );
if( t->m_iRefCount )
continue; /* Can't unload textures that are still referenced. */
bool bDeleteThis = false;
/* Always unload movies, so we don't waste time decoding. /* Always unload movies, so we don't waste time decoding.
* *
* Actually, multiple refs to a movie won't work; they should play independently, * Actually, multiple refs to a movie won't work; they should play independently,
* but they'll actually share settings. Not worth fixing, since we don't currently * but they'll actually share settings. Not worth fixing, since we don't currently
* using movies for anything except BGAs (though we could). * using movies for anything except BGAs (though we could).
*/ */
if( t->m_iRefCount==0 ) if( t->IsAMovie() )
{ bDeleteThis = true;
bool bDeleteThis = false; if( !m_bDelayedDelete || !t->m_bCacheThis )
if( t->IsAMovie() ) bDeleteThis = true;
bDeleteThis = true;
if( !m_bDelayedDelete || !t->m_bCacheThis )
bDeleteThis = true;
if( bDeleteThis ) if( bDeleteThis )
DeleteTexture( t ); DeleteTexture( t );
}
} }
void RageTextureManager::DeleteTexture( RageTexture *t ) void RageTextureManager::DeleteTexture( RageTexture *t )
@@ -155,44 +142,20 @@ void RageTextureManager::GarbageCollect( GCType type )
CString sPath = j->first.filename; CString sPath = j->first.filename;
RageTexture* t = j->second; RageTexture* t = j->second;
if( t->m_iRefCount==0 ) if( t->m_iRefCount )
{ continue; /* Can't unload textures that are still referenced. */
bool bDeleteThis = false;
if( type==cached_textures && !m_bDelayedDelete )
bDeleteThis = true;
if( type==delayed_delete )
bDeleteThis = true;
if( bDeleteThis ) bool bDeleteThis = false;
DeleteTexture( t ); if( type==cached_textures && !m_bDelayedDelete )
} bDeleteThis = true;
if( type==delayed_delete )
bDeleteThis = true;
if( bDeleteThis )
DeleteTexture( t );
} }
} }
/*
Redundant. -Chris
void RageTextureManager::UnloadTexture( RageTextureID ID )
{
ID.filename.MakeLower();
if( ID.filename == "" )
{
//LOG->Trace( "RageTextureManager::UnloadTexture(): tried to Unload a blank texture." );
return;
}
LOG->Trace( "RageTextureManager::UnloadTexture(%s).", ID.filename.GetString() );
std::map<RageTextureID, RageTexture*>::iterator p = m_mapPathToTexture.find(ID);
if(p == m_mapPathToTexture.end())
RageException::Throw( "Tried to Unload texture '%s' that wasn't loaded.", ID.filename.GetString() );
UnloadTexture(p->second);
//LOG->Trace( "RageTextureManager: '%s' will not be deleted. It still has %d references.", sTexturePath.GetString(), pTexture->m_iRefCount );
}
*/
void RageTextureManager::ReloadAll() void RageTextureManager::ReloadAll()
{ {