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

Reading "1.0,0.5,.7,.3" is headache-inducing. Support "#FFFF80FF"

Browse Source 
and "#FFFF80" (RGBA, RGB).
This commit is contained in:
Glenn Maynard
2003-11-17 02:35:50 +00:00
parent 258982f934
commit a51f7a690c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+14 -6
View File
@@ -476,15 +476,23 @@ bool ThemeManager::GetMetricB( CString sClassName, CString sValueName )
RageColor ThemeManager::GetMetricC( CString sClassName, CString sValueName ) RageColor ThemeManager::GetMetricC( CString sClassName, CString sValueName )
{ {
float r=1,b=1,g=1,a=1; // initialize in case sscanf fails float r=1,b=1,g=1,a=1;
CString sValue = GetMetricRaw(sClassName,sValueName); CString sValue = GetMetricRaw(sClassName,sValueName);
int result = sscanf( GetMetricRaw(sClassName,sValueName), "%f,%f,%f,%f", &r, &g, &b, &a ); int result = sscanf( GetMetricRaw(sClassName,sValueName), "%f,%f,%f,%f", &r, &g, &b, &a );
if( result != 4 ) if( result == 4 )
{
LOG->Warn( "The color value '%s' for NoteSkin metric '%s : %s' is invalid.", GetMetricRaw(sClassName,sValueName).c_str(), sClassName.c_str(), sValueName.c_str() );
}
return RageColor(r,g,b,a); return RageColor(r,g,b,a);
int ir=255,ib=255,ig=255,ia=255;
result = sscanf( GetMetricRaw(sClassName,sValueName), "#%2x%2x%2x%2x", &ir, &ig, &ib, &ia );
if( result == 4 )
return RageColor(ir / 255.0f, ig / 255.0f, ib / 255.0f, ia / 255.0f);
result = sscanf( GetMetricRaw(sClassName,sValueName), "#%2x%2x%2x", &ir, &ig, &ib );
if( result == 3 )
return RageColor(ir / 255.0f, ig / 255.0f, ib / 255.0f, 1);
LOG->Warn( "The color value '%s' for NoteSkin metric '%s : %s' is invalid.", GetMetricRaw(sClassName,sValueName).c_str(), sClassName.c_str(), sValueName.c_str() );
return RageColor(1,1,1,1);
} }
void ThemeManager::NextTheme() void ThemeManager::NextTheme()