replace uses of TransitionFade with TransitionBGAnimation

This commit is contained in:
Chris Danford
2003-04-12 18:34:05 +00:00
parent f982d75691
commit 5e0f9956f2
20 changed files with 81 additions and 142 deletions
+10 -8
View File
@@ -47,11 +47,8 @@ ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuesti
m_sAnswer = CStringToWstring(sInitialAnswer);
m_bCancelled = false;
m_Fade.SetTransitionTime( 0.5f );
m_Fade.SetDiffuse( RageColor(0,0,0,0.7f) );
m_Fade.SetOpened();
m_Fade.CloseWipingRight();
this->AddChild( &m_Fade );
m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenPrompt background") );
this->AddChild( &m_Background );
m_textQuestion.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textQuestion.SetText( sQuestion );
@@ -71,7 +68,12 @@ ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuesti
UpdateText();
this->AddChild( &m_textAnswer );
SOUNDMAN->PlayOnce( THEME->GetPathToS("Common prompt") );
m_In.Load( THEME->GetPathToB("ScreenPrompt in") );
m_In.StartTransitioning();
this->AddChild( &m_In );
m_Out.Load( THEME->GetPathToB("ScreenPrompt out") );
this->AddChild( &m_Out );
}
void ScreenTextEntry::UpdateText()
@@ -93,7 +95,7 @@ void ScreenTextEntry::DrawPrimitives()
void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( m_Fade.IsOpening() )
if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
return;
if( type != IET_FIRST_PRESS )
@@ -188,7 +190,7 @@ void ScreenTextEntry::MenuRight( PlayerNumber pn )
void ScreenTextEntry::MenuStart( PlayerNumber pn )
{
m_Fade.OpenWipingRight( SM_DoneOpeningWipingRight );
m_Out.StartTransitioning( SM_DoneOpeningWipingRight );
m_textQuestion.BeginTweening( 0.2f );
m_textQuestion.SetDiffuse( RageColor(1,1,1,0) );