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

phase out param

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-16 18:31:00 +00:00
parent 2877e7ef0f
commit 47a62d7db6
7 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorScroller.cpp
+3 -1
View File
@@ -41,6 +41,7 @@ ActorScroller::ActorScroller()
void ActorScroller::Load2( float fNumItemsToDraw ) void ActorScroller::Load2( float fNumItemsToDraw )
{ {
if( fNumItemsToDraw != -1 )
m_fNumItemsToDraw = fNumItemsToDraw; m_fNumItemsToDraw = fNumItemsToDraw;
m_iNumItems = m_SubActors.size(); m_iNumItems = m_SubActors.size();
@@ -121,7 +122,8 @@ void ActorScroller::LoadFromNode( const RString &sDir, const XNode *pNode )
#undef GET_VALUE #undef GET_VALUE
Load2( fNumItemsToDraw ); SetNumItemsToDraw( fNumItemsToDraw );
Load2();
float fSecondsPerItem = 0; float fSecondsPerItem = 0;
if( pNode->GetAttrValue("SecondsPerItem", fSecondsPerItem) ) if( pNode->GetAttrValue("SecondsPerItem", fSecondsPerItem) )
stepmania/src/ActorScroller.h
+2 -1
View File
@@ -16,7 +16,7 @@ public:
void SetTransformFromExpression( const RString &sTransformFunction ); void SetTransformFromExpression( const RString &sTransformFunction );
void SetTransformFromHeight( float fItemHeight ); void SetTransformFromHeight( float fItemHeight );
void Load2( float fNumItemsToDraw ); void Load2( float fNumItemsToDraw = -1 );
void EnableMask( float fWidth, float fHeight ); void EnableMask( float fWidth, float fHeight );
void DisableMask(); void DisableMask();
@@ -30,6 +30,7 @@ public:
virtual Actor *Copy() const; virtual Actor *Copy() const;
void SetLoop( bool bLoop ) { m_bLoop = bLoop; } void SetLoop( bool bLoop ) { m_bLoop = bLoop; }
void SetNumItemsToDraw( float fNumItemsToDraw ) { m_fNumItemsToDraw = fNumItemsToDraw; }
void SetDestinationItem( float fItemIndex ) { m_fDestinationItem = fItemIndex; } void SetDestinationItem( float fItemIndex ) { m_fDestinationItem = fItemIndex; }
void SetCurrentAndDestinationItem( float fItemIndex ) { m_fCurrentItem = m_fDestinationItem = fItemIndex; } void SetCurrentAndDestinationItem( float fItemIndex ) { m_fCurrentItem = m_fDestinationItem = fItemIndex; }
float GetCurrentItem() const { return m_fCurrentItem; } float GetCurrentItem() const { return m_fCurrentItem; }
stepmania/src/CourseContentsList.cpp
+2 -1
View File
@@ -73,7 +73,8 @@ void CourseContentsList::SetFromGameState()
bool bLoop = pMasterTrail->m_vEntries.size() > uNumEntriesToShow; bool bLoop = pMasterTrail->m_vEntries.size() > uNumEntriesToShow;
this->SetLoop( bLoop ); this->SetLoop( bLoop );
this->Load2( (float)MAX_VISIBLE_ITEMS ); this->SetNumItemsToDraw( (float)MAX_VISIBLE_ITEMS );
this->Load2();
this->SetTransformFromHeight( m_vpDisplay[0]->GetUnzoomedHeight() ); this->SetTransformFromHeight( m_vpDisplay[0]->GetUnzoomedHeight() );
this->SetSecondsPerItem( 0.7f ); this->SetSecondsPerItem( 0.7f );
this->EnableMask( m_vpDisplay[0]->GetUnzoomedWidth(), m_vpDisplay[0]->GetUnzoomedHeight() ); this->EnableMask( m_vpDisplay[0]->GetUnzoomedWidth(), m_vpDisplay[0]->GetUnzoomedHeight() );
stepmania/src/ScreenMapControllers.cpp
+2 -1
View File
@@ -150,7 +150,8 @@ void ScreenMapControllers::Init()
m_LineScroller.SetName( "LineScroller" ); m_LineScroller.SetName( "LineScroller" );
ActorUtil::LoadAllCommands( m_LineScroller, m_sName ); ActorUtil::LoadAllCommands( m_LineScroller, m_sName );
m_LineScroller.Load2( (float) m_LineScroller.GetNumChildren()*2 ); m_LineScroller.SetNumItemsToDraw( (float) m_LineScroller.GetNumChildren()*2 );
m_LineScroller.Load2();
this->AddChild( &m_LineScroller ); this->AddChild( &m_LineScroller );
} }
stepmania/src/ScreenNameEntryTraditional.cpp
+2 -1
View File
@@ -116,7 +116,8 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
" self:y(math.sin(radians)*90); " " self:y(math.sin(radians)*90); "
" self:z(math.cos(radians)*90); " " self:z(math.cos(radians)*90); "
"end"; "end";
ActorScroller::Load2( 10.5 ); ActorScroller::SetNumItemsToDraw( 10.5f );
ActorScroller::Load2();
ActorScroller::SetTransformFromExpression( sTransformFunction ); ActorScroller::SetTransformFromExpression( sTransformFunction );
ActorScroller::SetSecondsPerItem( 0.2f ); ActorScroller::SetSecondsPerItem( 0.2f );
Scroll(); Scroll();
stepmania/src/ScreenRanking.cpp
+2 -1
View File
@@ -389,7 +389,8 @@ void ScoreScroller::Load(
for( int i=0; i<iNumCopies; ++i ) for( int i=0; i<iNumCopies; ++i )
this->AddChild( new ScoreRowItem(ItemTemplate) ); this->AddChild( new ScoreRowItem(ItemTemplate) );
DynamicActorScroller::Load2( (float) m_metricSongScoreRowsToDraw ); DynamicActorScroller::SetNumItemsToDraw( (float) m_metricSongScoreRowsToDraw );
DynamicActorScroller::Load2();
DynamicActorScroller::SetTransformFromHeight( fItemHeight ); DynamicActorScroller::SetTransformFromHeight( fItemHeight );
DynamicActorScroller::SetSecondsPerItem( SONG_SCORE_SECONDS_PER_ROW ); DynamicActorScroller::SetSecondsPerItem( SONG_SCORE_SECONDS_PER_ROW );
DynamicActorScroller::EnableMask( SCREEN_WIDTH, fItemHeight ); DynamicActorScroller::EnableMask( SCREEN_WIDTH, fItemHeight );
stepmania/src/ScreenSelectMaster.cpp
+2 -1
View File
@@ -153,7 +153,8 @@ void ScreenSelectMaster::Init()
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
m_Scroller[*p].SetLoop( LOOP_SCROLLER ); m_Scroller[*p].SetLoop( LOOP_SCROLLER );
m_Scroller[*p].Load2( SCROLLER_NUM_ITEMS_TO_DRAW ); m_Scroller[*p].SetNumItemsToDraw( SCROLLER_NUM_ITEMS_TO_DRAW );
m_Scroller[*p].Load2();
m_Scroller[*p].SetTransformFromExpression( SCROLLER_TRANSFORM ); m_Scroller[*p].SetTransformFromExpression( SCROLLER_TRANSFORM );
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].SetNumSubdivisions( SCROLLER_SUBDIVISIONS );