simplify Load3. (Most scrollers use one subdivision.)

This commit is contained in:
Glenn Maynard
2005-12-07 04:22:47 +00:00
parent 5cb8148d30
commit c5766b32aa
4 changed files with 3 additions and 7 deletions
+2 -4
View File
@@ -43,19 +43,17 @@ void ActorScroller::Load2(
bool bLoop ) bool bLoop )
{ {
Load3( fNumItemsToDraw, Load3( fNumItemsToDraw,
ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), 1, bLoop ); ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), bLoop );
} }
void ActorScroller::Load3( void ActorScroller::Load3(
float fNumItemsToDraw, float fNumItemsToDraw,
const CString &sTransformFunction, const CString &sTransformFunction,
int iSubdivisions,
bool bLoop bool bLoop
) )
{ {
m_fNumItemsToDraw = fNumItemsToDraw; m_fNumItemsToDraw = fNumItemsToDraw;
m_exprTransformFunction.SetFromExpression( sTransformFunction ); m_exprTransformFunction.SetFromExpression( sTransformFunction );
m_exprTransformFunction.SetNumSubdivisions( iSubdivisions );
m_bLoop = bLoop; m_bLoop = bLoop;
m_iNumItems = m_SubActors.size(); m_iNumItems = m_SubActors.size();
} }
@@ -118,9 +116,9 @@ void ActorScroller::LoadFromNode( const CString &sDir, const XNode *pNode )
Load3( Load3(
fNumItemsToDraw, fNumItemsToDraw,
sTransformFunction, sTransformFunction,
iSubdivisions,
false ); false );
ActorScroller::SetSecondsPerItem( fSecondsPerItem ); ActorScroller::SetSecondsPerItem( fSecondsPerItem );
ActorScroller::SetNumSubdivisions( iSubdivisions );
if( bUseMask ) if( bUseMask )
EnableMask( 10, 10 ); // XXX EnableMask( 10, 10 ); // XXX
-1
View File
@@ -21,7 +21,6 @@ public:
void Load3( void Load3(
float fNumItemsToDraw, float fNumItemsToDraw,
const CString &sTransformFunction, const CString &sTransformFunction,
int iSubdivisions,
bool bLoop ); bool bLoop );
void EnableMask( float fWidth, float fHeight ); void EnableMask( float fWidth, float fHeight );
@@ -118,7 +118,6 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
ActorScroller::Load3( ActorScroller::Load3(
10.5, 10.5,
sTransformFunction, sTransformFunction,
1,
false ); false );
ActorScroller::SetSecondsPerItem( 0.2f ); ActorScroller::SetSecondsPerItem( 0.2f );
Scroll(); Scroll();
+1 -1
View File
@@ -131,9 +131,9 @@ void ScreenSelectMaster::Init()
m_Scroller[*p].Load3( m_Scroller[*p].Load3(
SCROLLER_NUM_ITEMS_TO_DRAW, SCROLLER_NUM_ITEMS_TO_DRAW,
SCROLLER_TRANSFORM, SCROLLER_TRANSFORM,
SCROLLER_SUBDIVISIONS,
LOOP_SCROLLER ); LOOP_SCROLLER );
m_Scroller[*p].SetSecondsPerItem( SCROLLER_SECONDS_PER_ITEM ); m_Scroller[*p].SetSecondsPerItem( SCROLLER_SECONDS_PER_ITEM );
m_Scroller[*p].SetNumSubdivisions( SCROLLER_SUBDIVISIONS );
m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) ); m_Scroller[*p].SetName( "Scroller"+PLAYER_APPEND_NO_SPACE(*p) );
this->AddChild( &m_Scroller[*p] ); this->AddChild( &m_Scroller[*p] );
} }