[BPMDisplay] Added FormatString metric.
This commit is contained in:
@@ -13,9 +13,13 @@ _____________________________________________________________________________
|
|||||||
sm-ssc v1.2.2 | 201102??
|
sm-ssc v1.2.2 | 201102??
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
20110219
|
||||||
|
--------
|
||||||
|
* [BPMDisplay] Added FormatString metric. [AJ]
|
||||||
|
|
||||||
20110218
|
20110218
|
||||||
--------
|
--------
|
||||||
* [WheelBase] Added SetOpenSection Lua binding [AJ]
|
* [WheelBase] Added SetOpenSection Lua binding. [AJ]
|
||||||
|
|
||||||
20110217
|
20110217
|
||||||
--------
|
--------
|
||||||
|
|||||||
@@ -218,6 +218,8 @@ QuestionMarksText="???"
|
|||||||
RandomText="!!!"
|
RandomText="!!!"
|
||||||
# xxx: localize me -aj
|
# xxx: localize me -aj
|
||||||
VariousText="000"
|
VariousText="000"
|
||||||
|
FormatString="%03.0f"
|
||||||
|
|
||||||
[CodeDetector]
|
[CodeDetector]
|
||||||
# Codes on the MusicWheel that change stuff!
|
# Codes on the MusicWheel that change stuff!
|
||||||
PrevSteps1="Up,Up"
|
PrevSteps1="Up,Up"
|
||||||
|
|||||||
+4
-3
@@ -38,6 +38,7 @@ void BPMDisplay::Load()
|
|||||||
QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" );
|
QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" );
|
||||||
RANDOM_TEXT.Load( m_sName, "RandomText" );
|
RANDOM_TEXT.Load( m_sName, "RandomText" );
|
||||||
VARIOUS_TEXT.Load( m_sName, "VariousText" );
|
VARIOUS_TEXT.Load( m_sName, "VariousText" );
|
||||||
|
BPM_FORMAT_STRING.Load( m_sName, "FormatString" );
|
||||||
|
|
||||||
RunCommands( SET_NORMAL_COMMAND );
|
RunCommands( SET_NORMAL_COMMAND );
|
||||||
}
|
}
|
||||||
@@ -76,9 +77,9 @@ void BPMDisplay::Update( float fDeltaTime )
|
|||||||
{
|
{
|
||||||
m_fBPMFrom = -1;
|
m_fBPMFrom = -1;
|
||||||
if( (bool)SHOW_QMARKS )
|
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
|
else
|
||||||
SetText( ssprintf("%03.0f",RandomFloat(0,999)) );
|
SetText( ssprintf((RString)BPM_FORMAT_STRING, RandomFloat(0,999)) );
|
||||||
}
|
}
|
||||||
else if(m_fBPMFrom == -1)
|
else if(m_fBPMFrom == -1)
|
||||||
{
|
{
|
||||||
@@ -89,7 +90,7 @@ void BPMDisplay::Update( float fDeltaTime )
|
|||||||
if( m_fBPMTo != -1)
|
if( m_fBPMTo != -1)
|
||||||
{
|
{
|
||||||
const float fActualBPM = GetActiveBPM();
|
const float fActualBPM = GetActiveBPM();
|
||||||
SetText( ssprintf("%03.0f", fActualBPM) );
|
SetText( ssprintf((RString)BPM_FORMAT_STRING, fActualBPM) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -94,6 +94,8 @@ protected:
|
|||||||
ThemeMetric<RString> RANDOM_TEXT;
|
ThemeMetric<RString> RANDOM_TEXT;
|
||||||
/** @brief The text used as one possible option for random BPM. */
|
/** @brief The text used as one possible option for random BPM. */
|
||||||
ThemeMetric<RString> QUESTIONMARKS_TEXT;
|
ThemeMetric<RString> QUESTIONMARKS_TEXT;
|
||||||
|
/** @brief The format string used for the numbers. */
|
||||||
|
ThemeMetric<RString> BPM_FORMAT_STRING;
|
||||||
|
|
||||||
/** @brief The lowest valued BPM. */
|
/** @brief The lowest valued BPM. */
|
||||||
float m_fBPMFrom;
|
float m_fBPMFrom;
|
||||||
|
|||||||
Reference in New Issue
Block a user