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

use PercentageDisplay::FormatPercentScore in ScreenRanking

Browse Source
This commit is contained in:
Chris Danford
2005-04-15 08:05:29 +00:00
parent 215ce5ad21
commit d67e3c618b
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PercentageDisplay.cpp
+10 -6
View File
@@ -9,6 +9,8 @@
#include "StageStats.h"
#include "PlayerState.h"
ThemeMetric<int> PERCENT_DECIMAL_PLACES ( "PercentageDisplay", "PercentDecimalPlaces" );
ThemeMetric<int> PERCENT_TOTAL_SIZE ( "PercentageDisplay", "PercentTotalSize" );
PercentageDisplay::PercentageDisplay()
{
@@ -24,8 +26,6 @@ void PercentageDisplay::Load( PlayerNumber pn, PlayerStageStats* pSource, const
m_LastMax = -1;
DANCE_POINT_DIGITS.Load( sMetricsGroup, "DancePointsDigits" );
PERCENT_DECIMAL_PLACES.Load( sMetricsGroup, "PercentDecimalPlaces" );
PERCENT_TOTAL_SIZE.Load( sMetricsGroup, "PercentTotalSize" );
PERCENT_USE_REMAINDER.Load( sMetricsGroup, "PercentUseRemainder" );
APPLY_SCORE_DISPLAY_OPTIONS.Load( sMetricsGroup, "ApplyScoreDisplayOptions" );
@@ -121,7 +121,7 @@ void PercentageDisplay::Refresh()
}
else
{
sNumToDisplay = FormatPercentScore( fPercentDancePoints, PERCENT_TOTAL_SIZE, PERCENT_DECIMAL_PLACES );
sNumToDisplay = FormatPercentScore( fPercentDancePoints );
// HACK: Use the last frame in the numbers texture as '-'
sNumToDisplay.Replace('-','x');
@@ -131,11 +131,11 @@ void PercentageDisplay::Refresh()
m_textPercent.SetText( sNumToDisplay );
}
CString PercentageDisplay::FormatPercentScore( float fPercentDancePoints, int iTotalSize, int iDecimalPlaces )
CString PercentageDisplay::FormatPercentScore( float fPercentDancePoints )
{
// TRICKY: printf will round, but we want to truncate. Otherwise, we may display a percent
// score that's too high and doesn't match up with the calculated grade.
float fTruncInterval = powf( 0.1f, (float)iTotalSize-1 );
float fTruncInterval = powf( 0.1f, (float)PERCENT_TOTAL_SIZE-1 );
// TRICKY: ftruncf is rounding 1.0000000 to 0.99990004. Give a little boost to
// fPercentDancePoints to correct for this.
@@ -143,9 +143,13 @@ CString PercentageDisplay::FormatPercentScore( float fPercentDancePoints, int iT
fPercentDancePoints = ftruncf( fPercentDancePoints, fTruncInterval );
return ssprintf( "%*.*f%%", iTotalSize, iDecimalPlaces, fPercentDancePoints*100 );
CString s = ssprintf( "%*.*f%%", (int)PERCENT_TOTAL_SIZE, (int)PERCENT_DECIMAL_PLACES, fPercentDancePoints*100 );
return s;
}
LuaFunction_Float( FormatPercentScore, PercentageDisplay::FormatPercentScore(a1) )
/*
* (c) 2001-2003 Chris Danford
* All rights reserved.