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

Changed RollingNumbers to not set NAN velocity.

Browse Source
This commit is contained in:
Kyzentun
2014-08-03 22:38:01 -06:00
parent bffeda6dc0
commit f3f7af7045
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RollingNumbers.cpp
+10 -2
View File
@@ -72,7 +72,7 @@ void RollingNumbers::DrawPrimitives()
void RollingNumbers::Update( float fDeltaTime ) void RollingNumbers::Update( float fDeltaTime )
{ {
if( m_fCurrentNumber != m_fTargetNumber ) if(m_fCurrentNumber != m_fTargetNumber && m_fScoreVelocity > 0)
{ {
fapproach( m_fCurrentNumber, m_fTargetNumber, fabsf(m_fScoreVelocity) * fDeltaTime ); fapproach( m_fCurrentNumber, m_fTargetNumber, fabsf(m_fScoreVelocity) * fDeltaTime );
UpdateText(); UpdateText();
@@ -86,7 +86,15 @@ void RollingNumbers::SetTargetNumber( float fTargetNumber )
if( fTargetNumber == m_fTargetNumber ) // no change if( fTargetNumber == m_fTargetNumber ) // no change
return; return;
m_fTargetNumber = fTargetNumber; m_fTargetNumber = fTargetNumber;
m_fScoreVelocity = (m_fTargetNumber-m_fCurrentNumber) / APPROACH_SECONDS.GetValue(); float approach_secs= APPROACH_SECONDS.GetValue();
if(approach_secs > 0)
{
m_fScoreVelocity= (m_fTargetNumber-m_fCurrentNumber) / approach_secs;
}
else
{
m_fScoreVelocity= (m_fTargetNumber-m_fCurrentNumber);
}
} }
void RollingNumbers::UpdateText() void RollingNumbers::UpdateText()