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

TransitionBGAnimation -> Transition

Browse Source
This commit is contained in:
Chris Danford
2003-04-13 01:09:19 +00:00
parent 6f37a59b79
commit 5e4ec48c3f
19 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BGAnimationLayer.cpp
+3 -3
View File
@@ -477,11 +477,11 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
else if( sFile == "" ) else if( sFile == "" )
{ {
RageException::Throw( "In the ini file for BGAnimation '%s', '%s' is missing a the line 'File='.", sAniDir.GetString(), sLayer.GetString() ); RageException::Throw( "In the ini file for BGAnimation '%s', '%s' is missing a the line 'File='.", sAniDir.GetString(), sLayer.GetString() );
if( !DoesFileExist(sPath) )
RageException::Throw( "In the ini file for BGAnimation '%s', the specified File '%s' does not exist.", sAniDir.GetString(), sFile.GetString() );
} }
if( !DoesFileExist(sPath) )
RageException::Throw( "In the ini file for BGAnimation '%s', the specified File '%s' does not exist.", sAniDir.GetString(), sFile.GetString() );
ini.GetValueI( sLayer, "Type", (int&)m_Type ); ini.GetValueI( sLayer, "Type", (int&)m_Type );
ini.GetValue ( sLayer, "Command", m_sCommand ); ini.GetValue ( sLayer, "Command", m_sCommand );
ini.GetValueF( sLayer, "StretchTexCoordVelocityX", m_fStretchTexCoordVelocityX ); ini.GetValueF( sLayer, "StretchTexCoordVelocityX", m_fStretchTexCoordVelocityX );
stepmania/src/MenuElements.h
+4 -8
View File
@@ -12,18 +12,14 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
*/ */
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "MenuTimer.h" #include "MenuTimer.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "HelpDisplay.h" #include "HelpDisplay.h"
#include "BGAnimation.h" #include "BGAnimation.h"
const float MENU_ELEMENTS_TWEEN_TIME = 0.5f;
class MenuElements : public ActorFrame class MenuElements : public ActorFrame
{ {
public: public:
@@ -53,9 +49,9 @@ public: // let owner tinker with these objects
Sprite m_sprFooter; Sprite m_sprFooter;
HelpDisplay m_textHelp; HelpDisplay m_textHelp;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
TransitionBGAnimation m_Back; Transition m_Back;
RageSound m_soundBack; RageSound m_soundBack;
stepmania/src/ScreenAttract.h
+3 -3
View File
@@ -15,7 +15,7 @@
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "RandomSample.h" #include "RandomSample.h"
#include "BGAnimation.h" #include "BGAnimation.h"
#include "RageTimer.h" #include "RageTimer.h"
@@ -36,8 +36,8 @@ public:
protected: protected:
BGAnimation m_Background; BGAnimation m_Background;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
RandomSample m_soundStart; RandomSample m_soundStart;
}; };
stepmania/src/ScreenCaution.h
+4 -4
View File
@@ -16,7 +16,7 @@
#include "Screen.h" #include "Screen.h"
#include "RandomSample.h" #include "RandomSample.h"
#include "BGAnimation.h" #include "BGAnimation.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
class ScreenCaution : public Screen class ScreenCaution : public Screen
@@ -31,9 +31,9 @@ protected:
void MenuStart( PlayerNumber pn ); void MenuStart( PlayerNumber pn );
void MenuBack( PlayerNumber pn ); void MenuBack( PlayerNumber pn );
BGAnimation m_Background; BGAnimation m_Background;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
TransitionBGAnimation m_Back; Transition m_Back;
}; };
#endif #endif
stepmania/src/ScreenCredits.h
+3 -3
View File
@@ -10,7 +10,7 @@
*/ */
#include "Screen.h" #include "Screen.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "ActorScroller.h" #include "ActorScroller.h"
@@ -44,8 +44,8 @@ private:
BGAnimation m_Overlay; BGAnimation m_Overlay;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
}; };
stepmania/src/ScreenEdit.h
+3 -3
View File
@@ -11,7 +11,7 @@
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "Player.h" #include "Player.h"
#include "RandomSample.h" #include "RandomSample.h"
@@ -79,8 +79,8 @@ protected:
RageSound m_soundChangeSnap; RageSound m_soundChangeSnap;
RageSound m_soundMarker; RageSound m_soundMarker;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
// for MODE_RECORD // for MODE_RECORD
stepmania/src/ScreenGameOver.h
+3 -3
View File
@@ -11,7 +11,7 @@
#include "Screen.h" #include "Screen.h"
#include "BGAnimation.h" #include "BGAnimation.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
class ScreenGameOver : public Screen class ScreenGameOver : public Screen
@@ -25,8 +25,8 @@ public:
private: private:
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
BGAnimation m_Background; BGAnimation m_Background;
}; };
stepmania/src/ScreenGameplay.cpp
-3
View File
@@ -827,9 +827,6 @@ void ScreenGameplay::Update( float fDeltaTime )
if(m_soundMusic.IsPlaying()) if(m_soundMusic.IsPlaying())
GAMESTATE->UpdateSongPosition(m_soundMusic.GetPositionSeconds()); GAMESTATE->UpdateSongPosition(m_soundMusic.GetPositionSeconds());
if( m_bZeroDeltaOnNextUpdate )
int sdkjfskdf = 0;
if( m_bZeroDeltaOnNextUpdate ) if( m_bZeroDeltaOnNextUpdate )
{ {
Screen::Update( 0 ); Screen::Update( 0 );
stepmania/src/ScreenGameplay.h
+11 -11
View File
@@ -13,7 +13,7 @@
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "Player.h" #include "Player.h"
#include "RandomSample.h" #include "RandomSample.h"
@@ -97,8 +97,8 @@ protected:
Background m_Background; Background m_Background;
TransitionBGAnimation m_NextSongIn; // shows between songs in a course Transition m_NextSongIn; // shows between songs in a course
TransitionBGAnimation m_NextSongOut; // shows between songs in a course Transition m_NextSongOut; // shows between songs in a course
Sprite m_sprLifeFrame; Sprite m_sprLifeFrame;
LifeMeter* m_pLifeMeter[NUM_PLAYERS]; LifeMeter* m_pLifeMeter[NUM_PLAYERS];
@@ -120,14 +120,14 @@ protected:
BitmapText m_MaxCombo; BitmapText m_MaxCombo;
TransitionBGAnimation m_Ready; Transition m_Ready;
TransitionBGAnimation m_Go; Transition m_Go;
TransitionBGAnimation m_Cleared; Transition m_Cleared;
TransitionBGAnimation m_Failed; Transition m_Failed;
TransitionBGAnimation m_Extra; Transition m_Extra;
TransitionBGAnimation m_Toasty; // easter egg Transition m_Toasty; // easter egg
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Back; Transition m_Back;
BitmapText m_textSurviveTime; // used in extra stage BitmapText m_textSurviveTime; // used in extra stage
BitmapText m_textSongTitle; BitmapText m_textSongTitle;
stepmania/src/ScreenJukebox.h
+2 -2
View File
@@ -29,8 +29,8 @@ public:
static bool SetSong(); static bool SetSong();
protected: protected:
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
static bool PrepareForJukebox(); static bool PrepareForJukebox();
}; };
stepmania/src/ScreenMiniMenu.h
+3 -3
View File
@@ -12,7 +12,7 @@
#include "Screen.h" #include "Screen.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "Quad.h" #include "Quad.h"
#include "RandomSample.h" #include "RandomSample.h"
@@ -100,8 +100,8 @@ protected:
int m_iCurLine; int m_iCurLine;
int m_iCurAnswers[MAX_MENU_ROWS]; int m_iCurAnswers[MAX_MENU_ROWS];
ScreenMessage m_SMSendOnOK, m_SMSendOnCancel; ScreenMessage m_SMSendOnOK, m_SMSendOnCancel;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
public: public:
static int s_iLastLine; static int s_iLastLine;
stepmania/src/ScreenMusicScroll.h
+3 -3
View File
@@ -11,7 +11,7 @@
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "RageSoundManager.h" #include "RageSoundManager.h"
#include "MenuElements.h" #include "MenuElements.h"
@@ -42,8 +42,8 @@ private:
unsigned m_iNumLines; unsigned m_iNumLines;
float m_fTimeLeftInScreen; float m_fTimeLeftInScreen;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
}; };
stepmania/src/ScreenNameEntry.h
+3 -3
View File
@@ -11,7 +11,7 @@
#include "Screen.h" #include "Screen.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "RandomSample.h" #include "RandomSample.h"
#include "GrayArrowRow.h" #include "GrayArrowRow.h"
#include "BGAnimation.h" #include "BGAnimation.h"
@@ -41,8 +41,8 @@ private:
BitmapText m_textCategory[NUM_PLAYERS]; BitmapText m_textCategory[NUM_PLAYERS];
MenuTimer m_Timer; MenuTimer m_Timer;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
RageSound m_soundStep; RageSound m_soundStep;
stepmania/src/ScreenPrompt.h
+3 -3
View File
@@ -12,7 +12,7 @@
#include "Screen.h" #include "Screen.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "Quad.h" #include "Quad.h"
#include "RandomSample.h" #include "RandomSample.h"
@@ -44,7 +44,7 @@ protected:
ScreenMessage m_SMSendWhenDone; ScreenMessage m_SMSendWhenDone;
void(*m_pOnYes)(); void(*m_pOnYes)();
void(*m_pOnNo)(); void(*m_pOnNo)();
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
}; };
stepmania/src/ScreenSelectStyle5th.cpp
+2
View File
@@ -24,6 +24,8 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
const float MENU_ELEMENTS_TWEEN_TIME = 0.5;
#define HELP_TEXT THEME->GetMetric("ScreenSelectStyle5th","HelpText") #define HELP_TEXT THEME->GetMetric("ScreenSelectStyle5th","HelpText")
#define TIMER_SECONDS THEME->GetMetricI("ScreenSelectStyle5th","TimerSeconds") #define TIMER_SECONDS THEME->GetMetricI("ScreenSelectStyle5th","TimerSeconds")
#define NEXT_SCREEN THEME->GetMetric("ScreenSelectStyle5th","NextScreen") #define NEXT_SCREEN THEME->GetMetric("ScreenSelectStyle5th","NextScreen")
stepmania/src/ScreenStage.h
+2 -2
View File
@@ -10,7 +10,7 @@
*/ */
#include "Screen.h" #include "Screen.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
class ScreenStage : public Screen class ScreenStage : public Screen
{ {
@@ -51,7 +51,7 @@ private:
Quad m_quadMask; // write this into ZBuffer as a mask Quad m_quadMask; // write this into ZBuffer as a mask
*/ */
TransitionBGAnimation m_In, m_Out, m_Back; Transition m_In, m_Out, m_Back;
BGAnimation m_Background; BGAnimation m_Background;
protected: protected:
stepmania/src/ScreenTextEntry.h
+3 -3
View File
@@ -12,7 +12,7 @@
#include "Screen.h" #include "Screen.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "TransitionBGAnimation.h" #include "Transition.h"
#include "Quad.h" #include "Quad.h"
#include "RandomSample.h" #include "RandomSample.h"
@@ -46,7 +46,7 @@ protected:
void(*m_pOnOK)( CString sAnswer ); void(*m_pOnOK)( CString sAnswer );
void(*m_pOnCancel)(); void(*m_pOnCancel)();
bool m_bCancelled; bool m_bCancelled;
TransitionBGAnimation m_In; Transition m_In;
TransitionBGAnimation m_Out; Transition m_Out;
}; };
stepmania/src/StepMania.dsp
+4 -4
View File
@@ -60,7 +60,7 @@ IntDir=.\../Release6
TargetDir=\stepmania\stepmania TargetDir=\stepmania\stepmania
TargetName=StepMania TargetName=StepMania
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool # End Special Build Tool
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
TargetDir=\stepmania\stepmania TargetDir=\stepmania\stepmania
TargetName=StepMania-debug TargetName=StepMania-debug
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool # End Special Build Tool
@@ -1028,11 +1028,11 @@ SOURCE=.\CroppedSprite.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\TransitionBGAnimation.cpp SOURCE=.\Transition.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\TransitionBGAnimation.h SOURCE=.\Transition.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Actors used in Gameplay" # Begin Group "Actors used in Gameplay"
stepmania/src/StepMania.vcproj
+2 -2
View File
@@ -1036,10 +1036,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
RelativePath="CroppedSprite.h"> RelativePath="CroppedSprite.h">
</File> </File>
<File <File
RelativePath="TransitionBGAnimation.cpp"> RelativePath="Transition.cpp">
</File> </File>
<File <File
RelativePath="TransitionBGAnimation.h"> RelativePath="Transition.h">
</File> </File>
</Filter> </Filter>
<Filter <Filter