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

style cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-13 21:54:19 +00:00
parent 79b3de00f5
commit 4a584684bc
2 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BannerCache.cpp
+57 -58
View File
@@ -51,9 +51,9 @@ BannerCache *BANNERCACHE;
static map<RString,RageSurface *> g_BannerPathToImage; static map<RString,RageSurface *> g_BannerPathToImage;
static int g_iDemandRefcount = 0; static int g_iDemandRefcount = 0;
RString BannerCache::GetBannerCachePath( RString BannerPath ) RString BannerCache::GetBannerCachePath( RString sBannerPath )
{ {
return SongCacheIndex::GetCacheFilePath( "Banners", BannerPath ); return SongCacheIndex::GetCacheFilePath( "Banners", sBannerPath );
} }
/* If in on-demand mode, load all cached banners. This must be fast, so /* If in on-demand mode, load all cached banners. This must be fast, so
@@ -103,20 +103,20 @@ void BannerCache::Undemand()
* the cache file if necessary. Unlike CacheBanner(), the original file will * the cache file if necessary. Unlike CacheBanner(), the original file will
* not be examined unless the cached banner doesn't exist, so the banner will * not be examined unless the cached banner doesn't exist, so the banner will
* not be updated if the original file changes, for efficiency. */ * not be updated if the original file changes, for efficiency. */
void BannerCache::LoadBanner( RString BannerPath ) void BannerCache::LoadBanner( RString sBannerPath )
{ {
if( BannerPath == "" ) if( sBannerPath == "" )
return; // nothing to do return; // nothing to do
if( PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_PRELOAD && if( PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_PRELOAD &&
PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_LOAD_ON_DEMAND ) PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_LOAD_ON_DEMAND )
return; return;
/* Load it. */ /* Load it. */
const RString CachePath = GetBannerCachePath(BannerPath); const RString CachePath = GetBannerCachePath(sBannerPath);
for( int tries = 0; tries < 2; ++tries ) for( int tries = 0; tries < 2; ++tries )
{ {
if( g_BannerPathToImage.find(BannerPath) != g_BannerPathToImage.end() ) if( g_BannerPathToImage.find(sBannerPath) != g_BannerPathToImage.end() )
return; /* already loaded */ return; /* already loaded */
CHECKPOINT_M( ssprintf( "BannerCache::LoadBanner: %s", CachePath.c_str() ) ); CHECKPOINT_M( ssprintf( "BannerCache::LoadBanner: %s", CachePath.c_str() ) );
@@ -127,40 +127,39 @@ void BannerCache::LoadBanner( RString BannerPath )
{ {
/* The file doesn't exist. It's possible that the banner cache file is /* The file doesn't exist. It's possible that the banner cache file is
* missing, so try to create it. Don't do this first, for efficiency. */ * missing, so try to create it. Don't do this first, for efficiency. */
LOG->Trace( "Cached banner load of '%s' ('%s') failed, trying to cache ...", BannerPath.c_str(), CachePath.c_str() ); LOG->Trace( "Cached banner load of '%s' ('%s') failed, trying to cache ...", sBannerPath.c_str(), CachePath.c_str() );
/* Skip the up-to-date check; it failed to load, so it can't be up /* Skip the up-to-date check; it failed to load, so it can't be up
* to date. */ * to date. */
CacheBannerInternal( BannerPath ); CacheBannerInternal( sBannerPath );
continue; continue;
} }
else else
{ {
LOG->Trace( "Cached banner load of '%s' ('%s') failed", BannerPath.c_str(), CachePath.c_str() ); LOG->Trace( "Cached banner load of '%s' ('%s') failed", sBannerPath.c_str(), CachePath.c_str() );
return; return;
} }
} }
g_BannerPathToImage[BannerPath] = img; g_BannerPathToImage[sBannerPath] = img;
} }
} }
void BannerCache::OutputStats() const void BannerCache::OutputStats() const
{ {
map<RString,RageSurface *>::const_iterator ban; int iTotalSize = 0;
int total_size = 0; FOREACHM_CONST( RString, RageSurface *, g_BannerPathToImage, it )
for( ban = g_BannerPathToImage.begin(); ban != g_BannerPathToImage.end(); ++ban )
{ {
RageSurface * const &img = ban->second; const RageSurface *pImage = it->second;
const int size = img->pitch * img->h; const int iSize = pImage->pitch * pImage->h;
total_size += size; iTotalSize += iSize;
} }
LOG->Info( "%i bytes of banners loaded", total_size ); LOG->Info( "%i bytes of banners loaded", iTotalSize );
} }
void BannerCache::UnloadAllBanners() void BannerCache::UnloadAllBanners()
{ {
map<RString,RageSurface *>::iterator it; FOREACHM( RString, RageSurface *, g_BannerPathToImage, it )
for( it = g_BannerPathToImage.begin(); it != g_BannerPathToImage.end(); ++it )
delete it->second; delete it->second;
g_BannerPathToImage.clear(); g_BannerPathToImage.clear();
@@ -263,41 +262,41 @@ struct BannerTexture: public RageTexture
}; };
/* If a banner is cached, get its ID for use. */ /* If a banner is cached, get its ID for use. */
RageTextureID BannerCache::LoadCachedBanner( RString BannerPath ) RageTextureID BannerCache::LoadCachedBanner( RString sBannerPath )
{ {
RageTextureID ID( GetBannerCachePath(BannerPath) ); RageTextureID ID( GetBannerCachePath(sBannerPath) );
if( BannerPath == "" ) if( sBannerPath == "" )
return ID; return ID;
LOG->Trace( "BannerCache::LoadCachedBanner(%s): %s", BannerPath.c_str(), ID.filename.c_str() ); LOG->Trace( "BannerCache::LoadCachedBanner(%s): %s", sBannerPath.c_str(), ID.filename.c_str() );
/* Hack: make sure Banner::Load doesn't change our return value and end up /* Hack: make sure Banner::Load doesn't change our return value and end up
* reloading. */ * reloading. */
ID = Sprite::SongBannerTexture(ID); ID = Sprite::SongBannerTexture(ID);
/* It's not in a texture. Do we have it loaded? */ /* It's not in a texture. Do we have it loaded? */
if( g_BannerPathToImage.find(BannerPath) == g_BannerPathToImage.end() ) if( g_BannerPathToImage.find(sBannerPath) == g_BannerPathToImage.end() )
{ {
/* Oops, the image is missing. Warn and continue. */ /* Oops, the image is missing. Warn and continue. */
LOG->Warn( "Banner cache for '%s' wasn't loaded", BannerPath.c_str() ); LOG->Warn( "Banner cache for '%s' wasn't loaded", sBannerPath.c_str() );
return ID; return ID;
} }
/* This is a reference to a pointer. BannerTexture's ctor may change it /* This is a reference to a pointer. BannerTexture's ctor may change it
* when converting; this way, the conversion will end up in the map so we * when converting; this way, the conversion will end up in the map so we
* only have to convert once. */ * only have to convert once. */
RageSurface *&img = g_BannerPathToImage[BannerPath]; RageSurface *&img = g_BannerPathToImage[sBannerPath];
ASSERT( img ); ASSERT( img );
int src_width = 0, src_height = 0; int iSourceWidth = 0, iSourceHeight = 0;
bool WasRotatedBanner = false; bool WasRotatedBanner = false;
BannerData.GetValue( BannerPath, "Width", src_width ); BannerData.GetValue( sBannerPath, "Width", iSourceWidth );
BannerData.GetValue( BannerPath, "Height", src_height ); BannerData.GetValue( sBannerPath, "Height", iSourceHeight );
BannerData.GetValue( BannerPath, "Rotated", WasRotatedBanner ); BannerData.GetValue( sBannerPath, "Rotated", WasRotatedBanner );
if(src_width == 0 || src_height == 0) if( iSourceWidth == 0 || iSourceHeight == 0 )
{ {
LOG->UserLog( "Cache file", BannerPath, "couldn't be loaded." ); LOG->UserLog( "Cache file", sBannerPath, "couldn't be loaded." );
return ID; return ID;
} }
@@ -313,8 +312,8 @@ RageTextureID BannerCache::LoadCachedBanner( RString BannerPath )
return ID; /* It's all set. */ return ID; /* It's all set. */
LOG->Trace( "Loading banner texture %s; src %ix%i; image %ix%i", LOG->Trace( "Loading banner texture %s; src %ix%i; image %ix%i",
ID.filename.c_str(), src_width, src_height, img->w, img->h ); ID.filename.c_str(), iSourceWidth, iSourceHeight, img->w, img->h );
RageTexture *pTexture = new BannerTexture( ID, img, src_width, src_height ); RageTexture *pTexture = new BannerTexture( ID, img, iSourceWidth, iSourceHeight );
ID.Policy = RageTextureID::TEX_VOLATILE; ID.Policy = RageTextureID::TEX_VOLATILE;
TEXTUREMAN->RegisterTexture( ID, pTexture ); TEXTUREMAN->RegisterTexture( ID, pTexture );
@@ -332,17 +331,17 @@ static inline int closest( int num, int n1, int n2 )
/* Create or update the banner cache file as necessary. If in preload mode, /* Create or update the banner cache file as necessary. If in preload mode,
* load the cache file, too. (This is done at startup.) */ * load the cache file, too. (This is done at startup.) */
void BannerCache::CacheBanner( RString BannerPath ) void BannerCache::CacheBanner( RString sBannerPath )
{ {
if( PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_PRELOAD && if( PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_PRELOAD &&
PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_LOAD_ON_DEMAND ) PREFSMAN->m_BannerCache != BNCACHE_LOW_RES_LOAD_ON_DEMAND )
return; return;
CHECKPOINT_M( BannerPath ); CHECKPOINT_M( sBannerPath );
if( !DoesFileExist(BannerPath) ) if( !DoesFileExist(sBannerPath) )
return; return;
const RString CachePath = GetBannerCachePath(BannerPath); const RString CachePath = GetBannerCachePath(sBannerPath);
/* Check the full file hash. If it's the loaded and identical, don't recache. */ /* Check the full file hash. If it's the loaded and identical, don't recache. */
if( DoesFileExist(CachePath) ) if( DoesFileExist(CachePath) )
@@ -351,8 +350,8 @@ void BannerCache::CacheBanner( RString BannerPath )
if( !bCacheUpToDate ) if( !bCacheUpToDate )
{ {
unsigned CurFullHash; unsigned CurFullHash;
const unsigned FullHash = GetHashForFile( BannerPath ); const unsigned FullHash = GetHashForFile( sBannerPath );
if( BannerData.GetValue( BannerPath, "FullHash", CurFullHash ) && CurFullHash == FullHash ) if( BannerData.GetValue( sBannerPath, "FullHash", CurFullHash ) && CurFullHash == FullHash )
bCacheUpToDate = true; bCacheUpToDate = true;
} }
@@ -360,7 +359,7 @@ void BannerCache::CacheBanner( RString BannerPath )
{ {
/* It's identical. Just load it, if in preload. */ /* It's identical. Just load it, if in preload. */
if( PREFSMAN->m_BannerCache == BNCACHE_LOW_RES_PRELOAD ) if( PREFSMAN->m_BannerCache == BNCACHE_LOW_RES_PRELOAD )
LoadBanner( BannerPath ); LoadBanner( sBannerPath );
return; return;
} }
@@ -368,16 +367,16 @@ void BannerCache::CacheBanner( RString BannerPath )
/* The cache file doesn't exist, or is out of date. Cache it. This /* The cache file doesn't exist, or is out of date. Cache it. This
* will also load the cache into memory if in PRELOAD. */ * will also load the cache into memory if in PRELOAD. */
CacheBannerInternal( BannerPath ); CacheBannerInternal( sBannerPath );
} }
void BannerCache::CacheBannerInternal( RString BannerPath ) void BannerCache::CacheBannerInternal( RString sBannerPath )
{ {
RString error; RString error;
RageSurface *img = RageSurfaceUtils::LoadFile( BannerPath, error ); RageSurface *img = RageSurfaceUtils::LoadFile( sBannerPath, error );
if( img == NULL ) if( img == NULL )
{ {
LOG->UserLog( "Cache file", BannerPath, "couldn't be loaded: %s", error.c_str() ); LOG->UserLog( "Cache file", sBannerPath, "couldn't be loaded: %s", error.c_str() );
return; return;
} }
@@ -427,7 +426,7 @@ void BannerCache::CacheBannerInternal( RString BannerPath )
const int src_width = img->w, src_height = img->h; const int iSourceWidth = img->w, iSourceHeight = img->h;
int width = img->w / 2, height = img->h / 2; int width = img->w / 2, height = img->h / 2;
// int width = img->w, height = img->h; // int width = img->w, height = img->h;
@@ -438,8 +437,8 @@ void BannerCache::CacheBannerInternal( RString BannerPath )
/* Don't resize the image to less than 32 pixels in either dimension or the next /* Don't resize the image to less than 32 pixels in either dimension or the next
* power of two of the source (whichever is smaller); it's already very low res. */ * power of two of the source (whichever is smaller); it's already very low res. */
width = max( width, min(32, power_of_two(src_width)) ); width = max( width, min(32, power_of_two(iSourceWidth)) );
height = max( height, min(32, power_of_two(src_height)) ); height = max( height, min(32, power_of_two(iSourceHeight)) );
RageSurfaceUtils::ApplyHotPinkColorKey( img ); RageSurfaceUtils::ApplyHotPinkColorKey( img );
@@ -480,32 +479,32 @@ void BannerCache::CacheBannerInternal( RString BannerPath )
img = dst; img = dst;
} }
const RString CachePath = GetBannerCachePath(BannerPath); const RString CachePath = GetBannerCachePath(sBannerPath);
RageSurfaceUtils::SaveSurface( img, CachePath ); RageSurfaceUtils::SaveSurface( img, CachePath );
/* If an old image is loaded, free it. */ /* If an old image is loaded, free it. */
if( g_BannerPathToImage.find(BannerPath) != g_BannerPathToImage.end() ) if( g_BannerPathToImage.find(sBannerPath) != g_BannerPathToImage.end() )
{ {
RageSurface *oldimg = g_BannerPathToImage[BannerPath]; RageSurface *oldimg = g_BannerPathToImage[sBannerPath];
delete oldimg; delete oldimg;
g_BannerPathToImage.erase(BannerPath); g_BannerPathToImage.erase(sBannerPath);
} }
if( PREFSMAN->m_BannerCache == BNCACHE_LOW_RES_PRELOAD ) if( PREFSMAN->m_BannerCache == BNCACHE_LOW_RES_PRELOAD )
{ {
/* Keep it; we're just going to load it anyway. */ /* Keep it; we're just going to load it anyway. */
g_BannerPathToImage[BannerPath] = img; g_BannerPathToImage[sBannerPath] = img;
} }
else else
delete img; delete img;
/* Remember the original size. */ /* Remember the original size. */
BannerData.SetValue( BannerPath, "Path", CachePath ); BannerData.SetValue( sBannerPath, "Path", CachePath );
BannerData.SetValue( BannerPath, "Width", src_width ); BannerData.SetValue( sBannerPath, "Width", iSourceWidth );
BannerData.SetValue( BannerPath, "Height", src_height ); BannerData.SetValue( sBannerPath, "Height", iSourceHeight );
BannerData.SetValue( BannerPath, "FullHash", GetHashForFile( BannerPath ) ); BannerData.SetValue( sBannerPath, "FullHash", GetHashForFile( sBannerPath ) );
/* Remember this, so we can hint Sprite. */ /* Remember this, so we can hint Sprite. */
BannerData.SetValue( BannerPath, "Rotated", WasRotatedBanner ); BannerData.SetValue( sBannerPath, "Rotated", WasRotatedBanner );
BannerData.WriteFile( BANNER_CACHE_INDEX ); BannerData.WriteFile( BANNER_CACHE_INDEX );
} }
stepmania/src/BannerCache.h
+10 -9
View File
@@ -11,25 +11,26 @@ class LoadingWindow;
class BannerCache class BannerCache
{ {
IniFile BannerData;
static RString GetBannerCachePath( RString BannerPath );
void UnloadAllBanners();
void CacheBannerInternal( RString BannerPath );
public: public:
BannerCache(); BannerCache();
~BannerCache(); ~BannerCache();
void ReadFromDisk(); void ReadFromDisk();
RageTextureID LoadCachedBanner( RString BannerPath ); RageTextureID LoadCachedBanner( RString sBannerPath );
void CacheBanner( RString BannerPath ); void CacheBanner( RString sBannerPath );
void LoadBanner( RString BannerPath ); void LoadBanner( RString sBannerPath );
void Demand(); void Demand();
void Undemand(); void Undemand();
void OutputStats() const; void OutputStats() const;
private:
static RString GetBannerCachePath( RString sBannerPath );
void UnloadAllBanners();
void CacheBannerInternal( RString sBannerPath );
IniFile BannerData;
}; };
extern BannerCache *BANNERCACHE; // global and accessable from anywhere in our program extern BannerCache *BANNERCACHE; // global and accessable from anywhere in our program