remove old scroll effect
This commit is contained in:
@@ -7,22 +7,6 @@
|
||||
#include "arch/Dialog/Dialog.h"
|
||||
#include "RageLog.h"
|
||||
|
||||
|
||||
const float SCROLL_TIME = 5.0f;
|
||||
const float QUICK_SCROLL_TIME = .25f;
|
||||
const int NUM_GRADE_FRAMES = 8;
|
||||
const float GRADE_FRAME_HEIGHT = 1/(float)NUM_GRADE_FRAMES;
|
||||
const float GRADES_TO_SCROLL = NUM_GRADE_FRAMES*4;
|
||||
|
||||
|
||||
GradeDisplay::GradeDisplay()
|
||||
{
|
||||
m_fTimeLeftInScroll = 0;
|
||||
m_bDoScrolling = 0;
|
||||
|
||||
SetGrade( PLAYER_1, Grade_NoData );
|
||||
}
|
||||
|
||||
void GradeDisplay::Load( RageTextureID ID )
|
||||
{
|
||||
ID.bStretch = true;
|
||||
@@ -40,38 +24,6 @@ void GradeDisplay::Load( RageTextureID ID )
|
||||
}
|
||||
}
|
||||
|
||||
void GradeDisplay::Update( float fDeltaTime )
|
||||
{
|
||||
Sprite::Update( fDeltaTime );
|
||||
|
||||
if( m_bDoScrolling )
|
||||
{
|
||||
m_fTimeLeftInScroll -= fDeltaTime;
|
||||
m_fTimeLeftInScroll = max( 0, m_fTimeLeftInScroll );
|
||||
|
||||
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;
|
||||
|
||||
this->SetCustomTextureRect( m_frectCurTexCoords );
|
||||
}
|
||||
}
|
||||
|
||||
int GradeDisplay::GetFrameIndex( PlayerNumber pn, Grade g )
|
||||
{
|
||||
if( Sprite::GetNumStates() == 1 )
|
||||
@@ -111,9 +63,6 @@ void GradeDisplay::SetGrade( PlayerNumber pn, Grade g )
|
||||
m_PlayerNumber = pn;
|
||||
m_Grade = g;
|
||||
|
||||
m_bDoScrolling = false;
|
||||
StopUsingCustomCoords();
|
||||
|
||||
if( g != Grade_NoData )
|
||||
{
|
||||
SetState( GetFrameIndex(pn,g) );
|
||||
@@ -125,69 +74,6 @@ void GradeDisplay::SetGrade( PlayerNumber pn, Grade g )
|
||||
}
|
||||
}
|
||||
|
||||
void GradeDisplay::Scroll()
|
||||
{
|
||||
m_bDoScrolling = true;
|
||||
|
||||
int iFrameNo = GetFrameIndex( m_PlayerNumber, m_Grade );
|
||||
|
||||
m_frectDestTexCoords = *GetTextureCoordRectForState( iFrameNo );
|
||||
m_frectStartTexCoords = m_frectDestTexCoords;
|
||||
m_frectStartTexCoords.top += GRADES_TO_SCROLL * GRADE_FRAME_HEIGHT;
|
||||
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;
|
||||
|
||||
/* If we're in the last phase of scrolling, don't do this. */
|
||||
if( 1 - (m_fTimeLeftInScroll/SCROLL_TIME) >= 0.9 )
|
||||
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;
|
||||
}
|
||||
|
||||
// lua start
|
||||
#include "LuaBinding.h"
|
||||
|
||||
class LunaGradeDisplay: public Luna<GradeDisplay>
|
||||
{
|
||||
public:
|
||||
static int scroll( T* p, lua_State *L ) { p->Scroll(); return 0; }
|
||||
|
||||
LunaGradeDisplay()
|
||||
{
|
||||
ADD_METHOD( scroll );
|
||||
}
|
||||
};
|
||||
|
||||
LUA_REGISTER_DERIVED_CLASS( GradeDisplay, Sprite )
|
||||
// lua end
|
||||
|
||||
/*
|
||||
* (c) 2001-2002 Chris Danford
|
||||
* All rights reserved.
|
||||
|
||||
Reference in New Issue
Block a user