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

Merge pull request #598 from nixtrix/musicwheelfadeout

Browse Source 
Music wheel preview fadeout time is now adjustable by the metric [ScreenSelectMusic] SampleMusicFadeOutSeconds.
This commit is contained in:
Colby Klein
2015-05-15 07:38:54 -07:00
parent 30614e965e 459c74c3bf
commit 3df07863f5
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+1
View File
@@ -2100,6 +2100,7 @@ DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses"
SampleMusicPreviewMode='SampleMusicPreviewMode_Normal' SampleMusicPreviewMode='SampleMusicPreviewMode_Normal'
SampleMusicLoops=true SampleMusicLoops=true
SampleMusicFallbackFadeInSeconds=0 SampleMusicFallbackFadeInSeconds=0
SampleMusicFadeOutSeconds=1.5
# #
UseOptionsList=false UseOptionsList=false
OptionsListTimeout=0.25 OptionsListTimeout=0.25
src/ScreenSelectMusic.cpp
+2 -1
View File
@@ -85,6 +85,7 @@ void ScreenSelectMusic::Init()
SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" ); SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" );
SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" ); SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" );
SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load( m_sName, "SampleMusicFallbackFadeInSeconds" ); SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load( m_sName, "SampleMusicFallbackFadeInSeconds" );
SAMPLE_MUSIC_FADE_OUT_SECONDS.Load( m_sName, "SampleMusicFadeOutSeconds" );
DO_ROULETTE_ON_MENU_TIMER.Load( m_sName, "DoRouletteOnMenuTimer" ); DO_ROULETTE_ON_MENU_TIMER.Load( m_sName, "DoRouletteOnMenuTimer" );
ROULETTE_TIMER_SECONDS.Load( m_sName, "RouletteTimerSeconds" ); ROULETTE_TIMER_SECONDS.Load( m_sName, "RouletteTimerSeconds" );
ALIGN_MUSIC_BEATS.Load( m_sName, "AlignMusicBeat" ); ALIGN_MUSIC_BEATS.Load( m_sName, "AlignMusicBeat" );
@@ -383,7 +384,7 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce )
PlayParams.bForceLoop = SAMPLE_MUSIC_LOOPS; PlayParams.bForceLoop = SAMPLE_MUSIC_LOOPS;
PlayParams.fStartSecond = m_fSampleStartSeconds; PlayParams.fStartSecond = m_fSampleStartSeconds;
PlayParams.fLengthSeconds = m_fSampleLengthSeconds; PlayParams.fLengthSeconds = m_fSampleLengthSeconds;
PlayParams.fFadeOutLengthSeconds = 1.5f; PlayParams.fFadeOutLengthSeconds = SAMPLE_MUSIC_FADE_OUT_SECONDS;
PlayParams.bAlignBeat = ALIGN_MUSIC_BEATS; PlayParams.bAlignBeat = ALIGN_MUSIC_BEATS;
PlayParams.bApplyMusicRate = true; PlayParams.bApplyMusicRate = true;
src/ScreenSelectMusic.h
+1
View File
@@ -78,6 +78,7 @@ protected:
ThemeMetric<bool> SAMPLE_MUSIC_LOOPS; ThemeMetric<bool> SAMPLE_MUSIC_LOOPS;
ThemeMetric<SampleMusicPreviewMode> SAMPLE_MUSIC_PREVIEW_MODE; ThemeMetric<SampleMusicPreviewMode> SAMPLE_MUSIC_PREVIEW_MODE;
ThemeMetric<float> SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS; ThemeMetric<float> SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS;
ThemeMetric<float> SAMPLE_MUSIC_FADE_OUT_SECONDS;
ThemeMetric<bool> DO_ROULETTE_ON_MENU_TIMER; ThemeMetric<bool> DO_ROULETTE_ON_MENU_TIMER;
ThemeMetric<float> ROULETTE_TIMER_SECONDS; ThemeMetric<float> ROULETTE_TIMER_SECONDS;
ThemeMetric<bool> ALIGN_MUSIC_BEATS; ThemeMetric<bool> ALIGN_MUSIC_BEATS;