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

Fix lyrics in courses

Browse Source
This commit is contained in:
Glenn Maynard
2003-05-18 22:37:20 +00:00
parent 4866eb62a5
commit 9e0a1e08aa
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LyricDisplay.cpp
+21 -12
View File
@@ -26,12 +26,18 @@ void LyricDisplay::Init()
/* Update global cache: */ /* Update global cache: */
g_TweenInTime = Actor::GetCommandLength(IN_COMMAND); g_TweenInTime = Actor::GetCommandLength(IN_COMMAND);
g_TweenOutTime = Actor::GetCommandLength(OUT_COMMAND); g_TweenOutTime = Actor::GetCommandLength(OUT_COMMAND);
m_fLastSecond = -500;
} }
void LyricDisplay::Update( float fDeltaTime ) void LyricDisplay::Update( float fDeltaTime )
{ {
ActorFrame::Update( fDeltaTime ); ActorFrame::Update( fDeltaTime );
/* If the song has changed (in a course), reset. */
if( GAMESTATE->m_fMusicSeconds < m_fLastSecond )
Init();
m_fLastSecond = GAMESTATE->m_fMusicSeconds;
// Make sure we don't go over the array's boundry // Make sure we don't go over the array's boundry
if( m_iCurLyricNumber >= GAMESTATE->m_pCurSong->m_LyricSegments.size() ) if( m_iCurLyricNumber >= GAMESTATE->m_pCurSong->m_LyricSegments.size() )
return; return;
@@ -46,21 +52,24 @@ void LyricDisplay::Update( float fDeltaTime )
float fShowLength = MaxDisplayTime; float fShowLength = MaxDisplayTime;
/* Clamp this lyric to the beginning of the next, the end of the music,
* or 5 seconds. */
float EndTime;
if(m_iCurLyricNumber+1 < GAMESTATE->m_pCurSong->m_LyricSegments.size()) if(m_iCurLyricNumber+1 < GAMESTATE->m_pCurSong->m_LyricSegments.size())
{ EndTime = song->m_LyricSegments[m_iCurLyricNumber+1].m_fStartTime;
/* Clamp this lyric to the beginning of the next. */ else
const float Distance = EndTime = song->GetElapsedTimeFromBeat( song->m_fLastBeat );
song->m_LyricSegments[m_iCurLyricNumber+1].m_fStartTime -
song->m_LyricSegments[m_iCurLyricNumber].m_fStartTime;
const float TweenBufferTime = g_TweenInTime + g_TweenOutTime;
fShowLength = min(fShowLength, Distance - TweenBufferTime); const float Distance = EndTime - song->m_LyricSegments[m_iCurLyricNumber].m_fStartTime;
const float TweenBufferTime = g_TweenInTime + g_TweenOutTime;
/* If it's negative, two lyrics are so close together that there's no time fShowLength = min(fShowLength, Distance - TweenBufferTime);
* to tween properly. Lyrics should never be this brief, anyway, so just fShowLength = min(fShowLength, 5);
* skip it. */
fShowLength = max(fShowLength, 0); /* If it's negative, two lyrics are so close together that there's no time
} * to tween properly. Lyrics should never be this brief, anyway, so just
* skip it. */
fShowLength = max(fShowLength, 0);
m_textLyrics.SetText( GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric ); m_textLyrics.SetText( GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric );
stepmania/src/LyricDisplay.h
+1
View File
@@ -16,6 +16,7 @@ public:
private: private:
BitmapText m_textLyrics; BitmapText m_textLyrics;
unsigned m_iCurLyricNumber; unsigned m_iCurLyricNumber;
float m_fLastSecond;
}; };
#endif #endif