[Stepmania-cvs] stepmania/src ScreenNameEntry.cpp,1.32,1.33 ScreenNameEntry.h,1.5,1.6

[Chris D. <chr...@us...>]

Update of /cvsroot/stepmania/stepmania/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25498

Modified Files:
	ScreenNameEntry.cpp ScreenNameEntry.h 
Log Message:
replace uses of TransitionFade with TransitionBGAnimation

Index: ScreenNameEntry.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenNameEntry.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ScreenNameEntry.cpp	12 Apr 2003 17:39:26 -0000	1.32
+++ ScreenNameEntry.cpp	12 Apr 2003 19:40:55 -0000	1.33
@@ -238,8 +238,12 @@
 	m_Timer.SetXY( TIMER_X, TIMER_Y );
 	this->AddChild( &m_Timer );
 
-	m_Fade.OpenWipingRight();
-//	this->AddChild( &m_Fade );	// draw and update this manually too
+	m_In.Load( THEME->GetPathToB("ScreenNameEntry in") );
+	m_In.StartTransitioning();
+//	this->AddChild( &m_In );	// draw and update this manually too
+
+	m_Out.Load( THEME->GetPathToB("ScreenNameEntry out") );
+//	this->AddChild( &m_Out );	// draw and update this manually too
 
 	m_soundStep.Load( THEME->GetPathToS("ScreenNameEntry step") );
 
@@ -260,7 +264,8 @@
 	GAMESTATE->m_fSongBeat = m_fFakeBeat;
 	Screen::Update(fDelta);
 
-	m_Fade.Update( fDelta );
+	m_In.Update( fDelta );
+	m_Out.Update( fDelta );
 }
 
 void ScreenNameEntry::DrawPrimitives()
@@ -315,19 +320,20 @@
 	}
 
 
-	m_Fade.Draw();
+	m_In.Draw();
+	m_Out.Draw();
 }
 
 void ScreenNameEntry::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	LOG->Trace( "ScreenNameEntry::Input()" );
 
+	if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
+		return;	
+
 	if( type != IET_FIRST_PRESS )
 		return;		// ignore
 
-	if( m_Fade.IsClosing() )
-		return;
-
 	if( StyleI.IsValid() && m_bStillEnteringName[StyleI.player])
 	{
 		int StringIndex = m_ColToStringIndex[StyleI.player][StyleI.col];
@@ -349,11 +355,11 @@
 	switch( SM )
 	{
 	case SM_MenuTimer:
-		if( !m_Fade.IsClosing() )
+		if( !m_Out.IsTransitioning() )
 		{
 			for( int p=0; p<NUM_PLAYERS; p++ )
 				this->MenuStart( (PlayerNumber)p );
-			m_Fade.CloseWipingRight( SM_GoToNextScreen );
+			m_Out.StartTransitioning( SM_GoToNextScreen );
 		}
 		break;
 	case SM_GoToNextScreen:
@@ -408,6 +414,6 @@
 	bool bAnyStillEntering = false;
 	for( int p=0; p<NUM_PLAYERS; p++ )
 		bAnyStillEntering |= m_bStillEnteringName[p];
-	if( !bAnyStillEntering && !m_Fade.IsClosing() )
-		m_Fade.CloseWipingRight( SM_GoToNextScreen );
+	if( !bAnyStillEntering && !m_Out.IsTransitioning() )
+		m_Out.StartTransitioning( SM_GoToNextScreen );
 }

Index: ScreenNameEntry.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenNameEntry.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ScreenNameEntry.h	16 Feb 2003 23:20:52 -0000	1.5
+++ ScreenNameEntry.h	12 Apr 2003 19:40:56 -0000	1.6
@@ -11,7 +11,7 @@
 
 #include "Screen.h"
 #include "BitmapText.h"
-#include "TransitionFade.h"
+#include "TransitionBGAnimation.h"
 #include "RandomSample.h"
 #include "GrayArrowRow.h"
 #include "BGAnimation.h"
@@ -41,7 +41,8 @@
 	BitmapText		m_textCategory[NUM_PLAYERS];
 	MenuTimer		m_Timer;
 
-	TransitionFade	m_Fade;
+	TransitionBGAnimation	m_In;
+	TransitionBGAnimation	m_Out;
 
 	RageSound		m_soundStep;