From d8c4057660fa82ebbc779dfc14973a93708dda8c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 19 Dec 2002 23:07:20 +0000 Subject: [PATCH] get rid of TIMER --- stepmania/src/ArrowEffects.cpp | 4 ++-- stepmania/src/Background.cpp | 2 +- stepmania/src/BitmapText.cpp | 2 +- stepmania/src/HoldGhostArrow.cpp | 2 +- stepmania/src/InputQueue.cpp | 6 +++--- stepmania/src/LifeMeterBar.cpp | 6 +++--- stepmania/src/MusicStatusDisplay.cpp | 2 +- stepmania/src/NoteField.cpp | 6 +++--- stepmania/src/ThemeManager.cpp | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index 95f7790d04..84c70fd691 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -49,7 +49,7 @@ float ArrowGetXPos( PlayerNumber pn, int iColNum, float fYPos ) float fPixelOffsetFromCenter = GAMESTATE->GetCurrentStyleDef()->m_ColumnInfo[pn][iColNum].fXOffset; if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_DRUNK] ) - fPixelOffsetFromCenter += cosf( TIMER->GetTimeSinceStart() + iColNum*0.2f + fYPos*6/SCREEN_HEIGHT) * ARROW_SIZE*0.5f; + fPixelOffsetFromCenter += cosf( RageTimer::GetTimeSinceStart() + iColNum*0.2f + fYPos*6/SCREEN_HEIGHT) * ARROW_SIZE*0.5f; if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_FLIP] ) fPixelOffsetFromCenter = -fPixelOffsetFromCenter; if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_TORNADO] ) @@ -114,7 +114,7 @@ float ArrowGetPercentVisible( PlayerNumber pn, float fYPos ) fAlpha = 0; break; case PlayerOptions::APPEARANCE_BLINK: // this is an Ez2dancer Appearance Mode - fAlpha = sinf( TIMER->GetTimeSinceStart()*12 ); + fAlpha = sinf( RageTimer::GetTimeSinceStart()*12 ); fAlpha = froundf( fAlpha, 0.3333f ); break; default: diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index 9663e13b01..b87c8c31de 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -453,7 +453,7 @@ void Background::DrawPrimitives() bool Background::DangerVisible() { - return m_bInDanger && PREFSMAN->m_bShowDanger && (TIMER->GetTimeSinceStart() - (int)TIMER->GetTimeSinceStart()) < 0.5f; + return m_bInDanger && PREFSMAN->m_bShowDanger && (RageTimer::GetTimeSinceStart() - (int)RageTimer::GetTimeSinceStart()) < 0.5f; } diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index fc0c36f378..a1786c04b8 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -326,7 +326,7 @@ void BitmapText::DrawPrimitives() ////////////////////// if( m_bRainbow ) { - int color_index = int(TIMER->GetTimeSinceStart() / 0.200) % NUM_RAINBOW_COLORS; + int color_index = int(RageTimer::GetTimeSinceStart() / 0.200) % NUM_RAINBOW_COLORS; for( int i=0; iGetTimeSinceStart(), 1/20.0f ) > 1/40.0f; + bool bZooomALittle = fmodf( RageTimer::GetTimeSinceStart(), 1/20.0f ) > 1/40.0f; SetZoom( bZooomALittle ? 1.04f : 1.0f ); } else diff --git a/stepmania/src/InputQueue.cpp b/stepmania/src/InputQueue.cpp index f7db7dc9b3..ad6fb23821 100644 --- a/stepmania/src/InputQueue.cpp +++ b/stepmania/src/InputQueue.cpp @@ -33,7 +33,7 @@ void InputQueue::RememberInput( const GameInput GameI ) /* XXX: this should be a deque, and just pop_back */ if( m_aQueue[c].size() >= MAX_INPUT_QUEUE_LENGTH ) // full m_aQueue[c].erase( m_aQueue[c].begin(), m_aQueue[c].begin() + (m_aQueue[c].size()-MAX_INPUT_QUEUE_LENGTH+1) ); - m_aQueue[c].push_back( GameButtonAndTime(GameI.button,TIMER->GetTimeSinceStart()) ); + m_aQueue[c].push_back( GameButtonAndTime(GameI.button,RageTimer::GetTimeSinceStart()) ); } bool InputQueue::MatchesPattern( const GameController c, const MenuButton* button_sequence, const int iNumButtons, float fMaxSecondsBack ) @@ -41,7 +41,7 @@ bool InputQueue::MatchesPattern( const GameController c, const MenuButton* butto if( fMaxSecondsBack == -1 ) fMaxSecondsBack = 0.4f + iNumButtons*0.15f; - float fOldestTimeAllowed = TIMER->GetTimeSinceStart() - fMaxSecondsBack; + float fOldestTimeAllowed = RageTimer::GetTimeSinceStart() - fMaxSecondsBack; int sequence_index = iNumButtons-1; // count down for( int queue_index=m_aQueue[c].size()-1; queue_index>=0; queue_index-- ) // iterate newest to oldest @@ -70,7 +70,7 @@ bool InputQueue::MatchesPattern( const GameController c, const GameButton* butto if( fMaxSecondsBack == -1 ) fMaxSecondsBack = 0.4f + iNumButtons*0.15f; - float fOldestTimeAllowed = TIMER->GetTimeSinceStart() - fMaxSecondsBack; + float fOldestTimeAllowed = RageTimer::GetTimeSinceStart() - fMaxSecondsBack; int sequence_index = iNumButtons-1; // count down for( int queue_index=m_aQueue[c].size()-1; queue_index>=0; queue_index-- ) // iterate newest to oldest diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 6e5849f70d..36207e9b7b 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -394,7 +394,7 @@ void LifeMeterBar::DrawPrimitives() rectSize.right = -m_iMeterWidth/2 + int(roundf(m_iMeterWidth*m_fTrailingLifePercentage)); rectSize.bottom = +m_iMeterHeight/2; - float fPrecentOffset = TIMER->GetTimeSinceStart(); + float fPrecentOffset = RageTimer::GetTimeSinceStart(); fPrecentOffset -= (int)fPrecentOffset; RectF frectCustomTexCoords( @@ -415,7 +415,7 @@ void LifeMeterBar::DrawPrimitives() m_pStream->m_fPercent = m_fTrailingLifePercentage; m_pStream->m_fHotAlpha = m_fHotAlpha; - float fPercentRed = (m_fTrailingLifePercentageGetTimeSinceStart()*PI*4 )/2+0.5f : 0; + float fPercentRed = (m_fTrailingLifePercentageGetTimeSinceStart()/0.3f* (m_bIsHot ? 2 : 1) )*LIFE_STREAM_SECTION_WIDTH; + float fPercentIntoSection = (RageTimer::GetTimeSinceStart()/0.3f* (m_bIsHot ? 2 : 1) )*LIFE_STREAM_SECTION_WIDTH; fPercentIntoSection -= (int)fPercentIntoSection; fPercentIntoSection = 1-fPercentIntoSection; fPercentIntoSection -= (int)fPercentIntoSection; diff --git a/stepmania/src/MusicStatusDisplay.cpp b/stepmania/src/MusicStatusDisplay.cpp index 521104577c..94fdb9ee31 100644 --- a/stepmania/src/MusicStatusDisplay.cpp +++ b/stepmania/src/MusicStatusDisplay.cpp @@ -73,7 +73,7 @@ void MusicStatusDisplay::DrawPrimitives() case crown1: case crown2: case crown3: - if( fmodf(TIMER->GetTimeSinceStart(), 1) > 0.5f ) + if( fmodf(RageTimer::GetTimeSinceStart(), 1) > 0.5f ) return; // blink break; default: diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index c09112814e..1307f9b467 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -114,7 +114,7 @@ void NoteField::DrawBPMText( const float fBeat, const float fBPM ) const float fYPos = ArrowGetYPos( m_PlayerNumber, fYOffset ); m_textMeasureNumber.SetDiffuse( RageColor(1,0,0,1) ); - m_textMeasureNumber.SetGlow( RageColor(1,1,1,cosf(TIMER->GetTimeSinceStart()*2)/2+0.5f) ); + m_textMeasureNumber.SetGlow( RageColor(1,1,1,cosf(RageTimer::GetTimeSinceStart()*2)/2+0.5f) ); m_textMeasureNumber.SetText( ssprintf("%.2f", fBPM) ); m_textMeasureNumber.SetXY( -m_rectMeasureBar.GetZoomedWidth()/2 - 60, fYPos ); m_textMeasureNumber.Draw(); @@ -126,7 +126,7 @@ void NoteField::DrawFreezeText( const float fBeat, const float fSecs ) const float fYPos = ArrowGetYPos( m_PlayerNumber, fYOffset ); m_textMeasureNumber.SetDiffuse( RageColor(0.8f,0.8f,0,1) ); - m_textMeasureNumber.SetGlow( RageColor(1,1,1,cosf(TIMER->GetTimeSinceStart()*2)/2+0.5f) ); + m_textMeasureNumber.SetGlow( RageColor(1,1,1,cosf(RageTimer::GetTimeSinceStart()*2)/2+0.5f) ); m_textMeasureNumber.SetText( ssprintf("%.2f", fSecs) ); m_textMeasureNumber.SetXY( -m_rectMeasureBar.GetZoomedWidth()/2 - 10, fYPos ); m_textMeasureNumber.Draw(); @@ -138,7 +138,7 @@ void NoteField::DrawBGChangeText( const float fBeat, const CString sNewBGName ) const float fYPos = ArrowGetYPos( m_PlayerNumber, fYOffset ); m_textMeasureNumber.SetDiffuse( RageColor(0,1,0,1) ); - m_textMeasureNumber.SetGlow( RageColor(1,1,1,cosf(TIMER->GetTimeSinceStart()*2)/2+0.5f) ); + m_textMeasureNumber.SetGlow( RageColor(1,1,1,cosf(RageTimer::GetTimeSinceStart()*2)/2+0.5f) ); m_textMeasureNumber.SetText( sNewBGName ); m_textMeasureNumber.SetXY( +m_rectMeasureBar.GetZoomedWidth()/2 + 10, fYPos ); m_textMeasureNumber.Draw(); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 1f53a2ff63..1b0cff136c 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -242,9 +242,9 @@ try_metric_again: // Is our metric cache out of date? // XXX: GTSS wraps every ~40 days. Need a better way to handler timers like this. - if (TIMER->GetTimeSinceStart() >= m_fNextReloadTicks) + if (RageTimer::GetTimeSinceStart() >= m_fNextReloadTicks) { - m_fNextReloadTicks = TIMER->GetTimeSinceStart()+1.0f; + m_fNextReloadTicks = RageTimer::GetTimeSinceStart()+1.0f; if( m_uHashForCurThemeMetrics != GetHashForFile(sCurMetricPath) || m_uHashForBaseThemeMetrics != GetHashForFile(sDefaultMetricPath) ) {