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

add quick settling

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-21 10:04:25 +00:00
parent 3197e723f5
commit 8f80256fc4
4 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GradeDisplay.cpp
+45 -15
View File
@@ -18,6 +18,7 @@
const float SCROLL_TIME = 5.0f;
const float QUICK_SCROLL_TIME = .25f;
const int NUM_GRADE_FRAMES = 7;
const float GRADE_FRAME_HEIGHT = 1/(float)NUM_GRADE_FRAMES;
const float GRADES_TO_SCROLL = NUM_GRADE_FRAMES*4;
@@ -29,7 +30,7 @@ GradeDisplay::GradeDisplay()
StopAnimating();
m_fTimeLeftInScroll = 0;
m_bDoScrolling = false;
m_bDoScrolling = 0;
SetGrade( PLAYER_1, GRADE_NO_DATA );
}
@@ -43,21 +44,26 @@ void GradeDisplay::Update( float fDeltaTime )
m_fTimeLeftInScroll -= fDeltaTime;
m_fTimeLeftInScroll = max( 0, m_fTimeLeftInScroll );
float fPercentIntoScrolling = 1 - (m_fTimeLeftInScroll/SCROLL_TIME);
if( fPercentIntoScrolling < 0.75 )
fPercentIntoScrolling = (fPercentIntoScrolling/0.75f) * (1 + 1.0f/NUM_GRADE_FRAMES);
else if( fPercentIntoScrolling < 0.9 )
fPercentIntoScrolling = 1 + 1.0f/NUM_GRADE_FRAMES;
else
fPercentIntoScrolling = (1 + 1.0f/NUM_GRADE_FRAMES) - ((fPercentIntoScrolling-0.9f)/0.1f) * 1.0f/NUM_GRADE_FRAMES;
float fPercentIntoScrolling;
if( m_bDoScrolling == 1)
{
fPercentIntoScrolling = 1 - (m_fTimeLeftInScroll/SCROLL_TIME);
if( fPercentIntoScrolling < 0.75 )
fPercentIntoScrolling = (fPercentIntoScrolling/0.75f) * (1 + 1.0f/NUM_GRADE_FRAMES);
else if( fPercentIntoScrolling < 0.9 )
fPercentIntoScrolling = 1 + 1.0f/NUM_GRADE_FRAMES;
else
fPercentIntoScrolling = (1 + 1.0f/NUM_GRADE_FRAMES) - ((fPercentIntoScrolling-0.9f)/0.1f) * 1.0f/NUM_GRADE_FRAMES;
} else {
fPercentIntoScrolling = 1 - (m_fTimeLeftInScroll/QUICK_SCROLL_TIME);
}
m_frectCurTexCoords.left = m_frectStartTexCoords.left*(1-fPercentIntoScrolling) + m_frectDestTexCoords.left*fPercentIntoScrolling;
m_frectCurTexCoords.top = m_frectStartTexCoords.top*(1-fPercentIntoScrolling) + m_frectDestTexCoords.top*fPercentIntoScrolling;
m_frectCurTexCoords.right = m_frectStartTexCoords.right*(1-fPercentIntoScrolling) + m_frectDestTexCoords.right*fPercentIntoScrolling;
m_frectCurTexCoords.bottom = m_frectStartTexCoords.bottom*(1-fPercentIntoScrolling) + m_frectDestTexCoords.bottom*fPercentIntoScrolling;
RectF frectCurrentTextureCoords;
frectCurrentTextureCoords.left = m_frectStartTexCoords.left*(1-fPercentIntoScrolling) + m_frectDestTexCoords.left*fPercentIntoScrolling;
frectCurrentTextureCoords.top = m_frectStartTexCoords.top*(1-fPercentIntoScrolling) + m_frectDestTexCoords.top*fPercentIntoScrolling;
frectCurrentTextureCoords.right = m_frectStartTexCoords.right*(1-fPercentIntoScrolling) + m_frectDestTexCoords.right*fPercentIntoScrolling;
frectCurrentTextureCoords.bottom = m_frectStartTexCoords.bottom*(1-fPercentIntoScrolling) + m_frectDestTexCoords.bottom*fPercentIntoScrolling;
this->SetCustomTextureRect( frectCurrentTextureCoords );
this->SetCustomTextureRect( m_frectCurTexCoords );
}
}
@@ -120,9 +126,33 @@ void GradeDisplay::SpinAndSettleOn( Grade g )
m_frectStartTexCoords.bottom += GRADES_TO_SCROLL * GRADE_FRAME_HEIGHT;
m_fTimeLeftInScroll = SCROLL_TIME;
/* Set the initial position. */
Update(0);
}
void GradeDisplay::SettleImmediately()
{
m_fTimeLeftInScroll = 0;
}
void GradeDisplay::SettleQuickly()
{
if(m_bDoScrolling != 1)
return;
/* m_frectDestTexCoords.top is between 0 and 1 (inclusive). m_frectCurTexCoords
* is somewhere above that. Shift m_frectCurTexCoords downwards so it's pointing
* at the same physical place (remember, the grade texture is tiled) but no more
* than one rotation away from the destination. */
while(m_frectCurTexCoords.top > m_frectDestTexCoords.top + 1.0f)
{
m_frectCurTexCoords.top -= 1.0f;
m_frectCurTexCoords.bottom -= 1.0f;
}
m_frectStartTexCoords = m_frectCurTexCoords;
m_bDoScrolling = 2;
m_fTimeLeftInScroll = QUICK_SCROLL_TIME;
}