[BPMDisplay] Add CourseCycleSpeed metric.

This commit is contained in:
AJ Kelly
2011-05-19 03:48:46 -05:00
parent 98eab22987
commit d6546caaa6
4 changed files with 9 additions and 1 deletions
+4
View File
@@ -8,6 +8,10 @@ ________________________________________________________________________________
StepMania 5.0 $NEXT | 20110xyy StepMania 5.0 $NEXT | 20110xyy
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
2011/05/19
----------
* [BPMDisplay] Add CourseCycleSpeed metric. [AJ]
2011/05/17 2011/05/17
---------- ----------
* [NotesWriterSM] Write out OpenITG compatible SM files from here on out. * [NotesWriterSM] Write out OpenITG compatible SM files from here on out.
+1
View File
@@ -252,6 +252,7 @@ Cycle=true
NoBpmText="000" NoBpmText="000"
# How fast it cycles, smaller is faster # How fast it cycles, smaller is faster
RandomCycleSpeed=0.1 RandomCycleSpeed=0.1
CourseCycleSpeed=0.2
# Seperator between both bpms ( 100-200 ). # Seperator between both bpms ( 100-200 ).
Separator="-" Separator="-"
# ??? when it cycles. # ??? when it cycles.
+3 -1
View File
@@ -32,6 +32,7 @@ void BPMDisplay::Load()
SET_EXTRA_COMMAND.Load( m_sName, "SetExtraCommand" ); SET_EXTRA_COMMAND.Load( m_sName, "SetExtraCommand" );
CYCLE.Load( m_sName, "Cycle" ); CYCLE.Load( m_sName, "Cycle" );
RANDOM_CYCLE_SPEED.Load( m_sName, "RandomCycleSpeed" ); RANDOM_CYCLE_SPEED.Load( m_sName, "RandomCycleSpeed" );
COURSE_CYCLE_SPEED.Load( m_sName, "CourseCycleSpeed" );
SEPARATOR.Load( m_sName, "Separator" ); SEPARATOR.Load( m_sName, "Separator" );
SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" ); SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" );
NO_BPM_TEXT.Load( m_sName, "NoBpmText" ); NO_BPM_TEXT.Load( m_sName, "NoBpmText" );
@@ -207,7 +208,8 @@ void BPMDisplay::SetBpmFromCourse( const Course* pCourse )
// GetTranslitFullTitle because "Crashinfo.txt is garbled because of the ANSI output as usual." -f // GetTranslitFullTitle because "Crashinfo.txt is garbled because of the ANSI output as usual." -f
ASSERT_M( pTrail, ssprintf("Course '%s' has no trail for StepsType '%s'", pCourse->GetTranslitFullTitle().c_str(), StringConversion::ToString(st).c_str() ) ); ASSERT_M( pTrail, ssprintf("Course '%s' has no trail for StepsType '%s'", pCourse->GetTranslitFullTitle().c_str(), StringConversion::ToString(st).c_str() ) );
m_fCycleTime = 0.2f; // todo: let themers define this. -aj
m_fCycleTime = (float)COURSE_CYCLE_SPEED;
if( (int)pTrail->m_vEntries.size() > CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS ) if( (int)pTrail->m_vEntries.size() > CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS )
{ {
+1
View File
@@ -82,6 +82,7 @@ protected:
ThemeMetric<bool> SHOW_QMARKS; ThemeMetric<bool> SHOW_QMARKS;
/** @brief How often the random BPMs cycle themselves. */ /** @brief How often the random BPMs cycle themselves. */
ThemeMetric<float> RANDOM_CYCLE_SPEED; ThemeMetric<float> RANDOM_CYCLE_SPEED;
ThemeMetric<float> COURSE_CYCLE_SPEED;
/** @brief The text used to separate the low and high BPMs. */ /** @brief The text used to separate the low and high BPMs. */
ThemeMetric<RString> SEPARATOR; ThemeMetric<RString> SEPARATOR;
/** @brief The text used when there is no BPM. */ /** @brief The text used when there is no BPM. */