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

BGAnimation -> AutoActor

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-15 21:03:26 +00:00
parent b1227b4372
commit 4ce9b72e41
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Transition.cpp
+7 -7
View File
@@ -16,9 +16,9 @@ void Transition::Load( CString sBGAniDir )
if( !sBGAniDir.empty() && sBGAniDir.Right(1) != "/" ) if( !sBGAniDir.empty() && sBGAniDir.Right(1) != "/" )
sBGAniDir += "/"; sBGAniDir += "/";
m_BGAnimation.LoadFromAniDir( sBGAniDir ); m_sprTransition.Load( sBGAniDir );
m_BGAnimation.PlayCommand( "On" ); m_sprTransition->PlayCommand( "On" );
m_fLengthSeconds = m_BGAnimation.GetTweenTimeLeft(); m_fLengthSeconds = m_sprTransition->GetTweenTimeLeft();
m_State = waiting; m_State = waiting;
@@ -53,13 +53,13 @@ void Transition::Update( float fDeltaTime )
Actor::Update( fDeltaTime ); Actor::Update( fDeltaTime );
if( m_BGAnimation.GetTweenTimeLeft() == 0 ) // over if( m_sprTransition->GetTweenTimeLeft() == 0 ) // over
{ {
SCREENMAN->SendMessageToTopScreen( m_MessageToSendWhenDone ); SCREENMAN->SendMessageToTopScreen( m_MessageToSendWhenDone );
m_State = finished; m_State = finished;
} }
m_BGAnimation.Update( fDeltaTime ); m_sprTransition->Update( fDeltaTime );
} }
bool Transition::EarlyAbortDraw() bool Transition::EarlyAbortDraw()
@@ -69,7 +69,7 @@ bool Transition::EarlyAbortDraw()
void Transition::DrawPrimitives() void Transition::DrawPrimitives()
{ {
m_BGAnimation.Draw(); m_sprTransition->Draw();
} }
void Transition::StartTransitioning( ScreenMessage send_when_done ) void Transition::StartTransitioning( ScreenMessage send_when_done )
@@ -91,7 +91,7 @@ float Transition::GetTweenTimeLeft() const
if( m_State != transitioning ) if( m_State != transitioning )
return 0; return 0;
return m_BGAnimation.GetTweenTimeLeft(); return m_sprTransition->GetTweenTimeLeft();
} }
/* /*
stepmania/src/Transition.h
+2 -2
View File
@@ -4,7 +4,7 @@
#define TRANSITION_H #define TRANSITION_H
#include "Actor.h" #include "Actor.h"
#include "BGAnimation.h" #include "ActorUtil.h"
#include "ScreenMessage.h" #include "ScreenMessage.h"
#include "RandomSample.h" #include "RandomSample.h"
@@ -35,7 +35,7 @@ protected:
finished finished
} m_State; } m_State;
BGAnimation m_BGAnimation; AutoActor m_sprTransition;
float m_fLengthSeconds; float m_fLengthSeconds;
RandomSample m_sound; RandomSample m_sound;