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

[BPMDisplay] Added FormatString metric.

Browse Source
This commit is contained in:
AJ Kelly
2011-02-19 03:34:58 -06:00
parent 1fd81cfe9c
commit c3e3cf3361
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BPMDisplay.cpp
+4 -3
View File
@@ -38,6 +38,7 @@ void BPMDisplay::Load()
QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" );
RANDOM_TEXT.Load( m_sName, "RandomText" );
VARIOUS_TEXT.Load( m_sName, "VariousText" );
BPM_FORMAT_STRING.Load( m_sName, "FormatString" );
RunCommands( SET_NORMAL_COMMAND );
}
@@ -76,9 +77,9 @@ void BPMDisplay::Update( float fDeltaTime )
{
m_fBPMFrom = -1;
if( (bool)SHOW_QMARKS )
SetText( (RandomFloat(0,1)>0.90f) ? (RString)QUESTIONMARKS_TEXT : ssprintf("%03.0f",RandomFloat(0,999)) );
SetText( (RandomFloat(0,1)>0.90f) ? (RString)QUESTIONMARKS_TEXT : ssprintf((RString)BPM_FORMAT_STRING,RandomFloat(0,999)) );
else
SetText( ssprintf("%03.0f",RandomFloat(0,999)) );
SetText( ssprintf((RString)BPM_FORMAT_STRING, RandomFloat(0,999)) );
}
else if(m_fBPMFrom == -1)
{
@@ -89,7 +90,7 @@ void BPMDisplay::Update( float fDeltaTime )
if( m_fBPMTo != -1)
{
const float fActualBPM = GetActiveBPM();
SetText( ssprintf("%03.0f", fActualBPM) );
SetText( ssprintf((RString)BPM_FORMAT_STRING, fActualBPM) );
}
}
src/BPMDisplay.h
+2
View File
@@ -94,6 +94,8 @@ protected:
ThemeMetric<RString> RANDOM_TEXT;
/** @brief The text used as one possible option for random BPM. */
ThemeMetric<RString> QUESTIONMARKS_TEXT;
/** @brief The format string used for the numbers. */
ThemeMetric<RString> BPM_FORMAT_STRING;
/** @brief The lowest valued BPM. */
float m_fBPMFrom;