diff --git a/stepmania/src/TransitionBGAnimation.cpp b/stepmania/src/Transition.cpp similarity index 81% rename from stepmania/src/TransitionBGAnimation.cpp rename to stepmania/src/Transition.cpp index f3c5804f21..c51d57670f 100644 --- a/stepmania/src/TransitionBGAnimation.cpp +++ b/stepmania/src/Transition.cpp @@ -1,7 +1,7 @@ #include "global.h" /* ----------------------------------------------------------------------------- - Class: TransitionBGAnimation + Class: Transition Desc: See header @@ -10,19 +10,19 @@ ----------------------------------------------------------------------------- */ -#include "TransitionBGAnimation.h" +#include "Transition.h" #include "RageUtil.h" #include "ScreenManager.h" #include "IniFile.h" -TransitionBGAnimation::TransitionBGAnimation() +Transition::Transition() { m_State = waiting; m_fSecsIntoTransition = 0.0f; } -void TransitionBGAnimation::Load( CString sBGAniDir ) +void Transition::Load( CString sBGAniDir ) { if( !sBGAniDir.empty() && sBGAniDir.Right(1) != "/" ) sBGAniDir += "/"; @@ -45,7 +45,7 @@ void TransitionBGAnimation::Load( CString sBGAniDir ) } -void TransitionBGAnimation::Update( float fDeltaTime ) +void Transition::Update( float fDeltaTime ) { Actor::Update( fDeltaTime ); @@ -63,7 +63,7 @@ void TransitionBGAnimation::Update( float fDeltaTime ) } } -void TransitionBGAnimation::DrawPrimitives() +void Transition::DrawPrimitives() { // Unless we're transitioning, don't draw because we'll waste resources drawing things // that aren't visible. -Chris @@ -73,7 +73,7 @@ void TransitionBGAnimation::DrawPrimitives() m_BGAnimation.Draw(); } -void TransitionBGAnimation::StartTransitioning( ScreenMessage send_when_done ) +void Transition::StartTransitioning( ScreenMessage send_when_done ) { ASSERT( m_State == waiting ); // can't call this more than once m_MessageToSendWhenDone = send_when_done; @@ -82,7 +82,7 @@ void TransitionBGAnimation::StartTransitioning( ScreenMessage send_when_done ) m_fSecsIntoTransition = 0.0; } -float TransitionBGAnimation::GetLengthSeconds() +float Transition::GetLengthSeconds() { return m_BGAnimation.GetLengthSeconds(); } diff --git a/stepmania/src/TransitionBGAnimation.h b/stepmania/src/Transition.h similarity index 80% rename from stepmania/src/TransitionBGAnimation.h rename to stepmania/src/Transition.h index 894d5a8978..3f2c347ccd 100644 --- a/stepmania/src/TransitionBGAnimation.h +++ b/stepmania/src/Transition.h @@ -1,10 +1,10 @@ -#ifndef TransitionBGAnimation_H -#define TransitionBGAnimation_H +#ifndef Transition_H +#define Transition_H /* ----------------------------------------------------------------------------- - Class: TransitionBGAnimation + Class: Transition - Desc: TransitionBGAnimation that draws BGAnimation. + Desc: Transition that draws BGAnimation. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Chris Danford @@ -17,10 +17,10 @@ #include "RandomSample.h" -class TransitionBGAnimation : public Actor +class Transition : public Actor { public: - TransitionBGAnimation(); + Transition(); void Load( CString sBGAniDir );