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

remove Actor:: qualifier

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-23 04:42:12 +00:00
parent fb9219e93b
commit 9e53044d00
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PlayerScoreList.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ void PlayerScoreList::Refresh()
int i = iter - v.begin(); int i = iter - v.begin();
PlayerScoreItem &psi = m_vScoreItem[iter->iEnabledPlayerIndex]; PlayerScoreItem &psi = m_vScoreItem[iter->iEnabledPlayerIndex];
psi.SetDrawOrder( -i ); psi.SetDrawOrder( -i );
psi.BeginTweening( 0.5f, Actor::TWEEN_DECELERATE ); psi.BeginTweening( 0.5f, TWEEN_DECELERATE );
psi.DestTweenState() = m_vtsPositions[i]; psi.DestTweenState() = m_vtsPositions[i];
} }
stepmania/src/ScreenDebugOverlay.cpp
+1 -1
View File
@@ -291,7 +291,7 @@ bool ScreenDebugOverlay::OverlayInput( const InputEventPlus &input )
txt1.FinishTweening(); txt1.FinishTweening();
float fZoom = txt1.GetZoom(); float fZoom = txt1.GetZoom();
txt1.SetZoom( fZoom * 1.2f ); txt1.SetZoom( fZoom * 1.2f );
txt1.BeginTweening( 0.2f, Actor::TWEEN_LINEAR ); txt1.BeginTweening( 0.2f, TWEEN_LINEAR );
txt1.SetZoom( fZoom ); txt1.SetZoom( fZoom );
RString sMessage; RString sMessage;
stepmania/src/ScreenEz2SelectPlayer.cpp
+4 -4
View File
@@ -204,12 +204,12 @@ void ScreenEz2SelectPlayer::TweenOnScreen()
fOriginalX = m_sprJoinMessage[p].GetX(); fOriginalX = m_sprJoinMessage[p].GetX();
m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); m_sprJoinMessage[p].BeginTweening( 0.5f, TWEEN_BOUNCE_END );
m_sprJoinMessage[p].SetX( fOriginalX ); m_sprJoinMessage[p].SetX( fOriginalX );
fOriginalX = m_sprJoinFrame[p].GetX(); fOriginalX = m_sprJoinFrame[p].GetX();
m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); m_sprJoinFrame[p].BeginTweening( 0.5f, TWEEN_BOUNCE_END );
m_sprJoinFrame[p].SetX( fOriginalX ); m_sprJoinFrame[p].SetX( fOriginalX );
} }
@@ -224,9 +224,9 @@ void ScreenEz2SelectPlayer::TweenOffScreen()
{ {
float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH ); float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH );
m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_DECELERATE ); m_sprJoinMessage[p].BeginTweening( 0.5f, TWEEN_DECELERATE );
m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_DECELERATE ); m_sprJoinFrame[p].BeginTweening( 0.5f, TWEEN_DECELERATE );
m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
} }
} }
stepmania/src/ScreenSyncOverlay.cpp
+4 -4
View File
@@ -262,19 +262,19 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
void ScreenSyncOverlay::ShowHelp() void ScreenSyncOverlay::ShowHelp()
{ {
m_quad.StopTweening(); m_quad.StopTweening();
m_quad.BeginTweening( 0.3f, Actor::TWEEN_LINEAR ); m_quad.BeginTweening( 0.3f, TWEEN_LINEAR );
m_quad.SetDiffuseAlpha( 0.5f ); m_quad.SetDiffuseAlpha( 0.5f );
m_textHelp.StopTweening(); m_textHelp.StopTweening();
m_textHelp.BeginTweening( 0.3f, Actor::TWEEN_LINEAR ); m_textHelp.BeginTweening( 0.3f, TWEEN_LINEAR );
m_textHelp.SetDiffuseAlpha( 1 ); m_textHelp.SetDiffuseAlpha( 1 );
m_quad.Sleep( 4 ); m_quad.Sleep( 4 );
m_quad.BeginTweening( 0.3f, Actor::TWEEN_LINEAR ); m_quad.BeginTweening( 0.3f, TWEEN_LINEAR );
m_quad.SetDiffuseAlpha( 0 ); m_quad.SetDiffuseAlpha( 0 );
m_textHelp.Sleep( 4 ); m_textHelp.Sleep( 4 );
m_textHelp.BeginTweening( 0.3f, Actor::TWEEN_LINEAR ); m_textHelp.BeginTweening( 0.3f, TWEEN_LINEAR );
m_textHelp.SetDiffuseAlpha( 0 ); m_textHelp.SetDiffuseAlpha( 0 );
} }
stepmania/src/WheelBase.cpp
+2 -2
View File
@@ -428,7 +428,7 @@ void WheelBase::TweenOnScreen( bool bChangingSort )
m_ScrollBar.BeginTweening( 0.2f ); // sleep m_ScrollBar.BeginTweening( 0.2f ); // sleep
else else
m_ScrollBar.BeginTweening( 0.7f ); // sleep m_ScrollBar.BeginTweening( 0.7f ); // sleep
m_ScrollBar.BeginTweening( 0.2f , Actor::TWEEN_ACCELERATE ); m_ScrollBar.BeginTweening( 0.2f , TWEEN_ACCELERATE );
m_ScrollBar.AddX( -30 ); m_ScrollBar.AddX( -30 );
TweenOnScreenUpdateItems( bChangingSort ); TweenOnScreenUpdateItems( bChangingSort );
@@ -477,7 +477,7 @@ void WheelBase::TweenOffScreen( bool bChangingSort )
} }
m_ScrollBar.BeginTweening( 0 ); m_ScrollBar.BeginTweening( 0 );
m_ScrollBar.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE ); m_ScrollBar.BeginTweening( 0.2f, TWEEN_ACCELERATE );
m_ScrollBar.SetX( SCROLL_BAR_X+30 ); m_ScrollBar.SetX( SCROLL_BAR_X+30 );
TweenOffScreenUpdateItems( bChangingSort ); TweenOffScreenUpdateItems( bChangingSort );