From 5ffdec22e56bdaa2b88c99ae299469f1e7d1995d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 Mar 2003 20:28:03 +0000 Subject: [PATCH] convert this screen to Menu, to get rid of old transitions --- .../ScreenStyleSplash background.redir | 1 + .../BGAnimations/ScreenStyleSplash in.redir | 1 + .../Graphics/ScreenStyleSplash footer.redir | 1 + .../Graphics/ScreenStyleSplash header.redir | 1 + stepmania/Themes/default/metrics.ini | 1 + stepmania/src/ScreenStyleSplash.cpp | 29 ++++++++++--------- stepmania/src/ScreenStyleSplash.h | 9 +++--- 7 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/ScreenStyleSplash background.redir create mode 100644 stepmania/Themes/default/BGAnimations/ScreenStyleSplash in.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenStyleSplash footer.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenStyleSplash header.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenStyleSplash background.redir b/stepmania/Themes/default/BGAnimations/ScreenStyleSplash background.redir new file mode 100644 index 0000000000..846a5e8ad3 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenStyleSplash background.redir @@ -0,0 +1 @@ +_missing diff --git a/stepmania/Themes/default/BGAnimations/ScreenStyleSplash in.redir b/stepmania/Themes/default/BGAnimations/ScreenStyleSplash in.redir new file mode 100644 index 0000000000..734b119593 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenStyleSplash in.redir @@ -0,0 +1 @@ +_fade in diff --git a/stepmania/Themes/default/Graphics/ScreenStyleSplash footer.redir b/stepmania/Themes/default/Graphics/ScreenStyleSplash footer.redir new file mode 100644 index 0000000000..5c9d0d269f --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenStyleSplash footer.redir @@ -0,0 +1 @@ +_blank.png diff --git a/stepmania/Themes/default/Graphics/ScreenStyleSplash header.redir b/stepmania/Themes/default/Graphics/ScreenStyleSplash header.redir new file mode 100644 index 0000000000..5c9d0d269f --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenStyleSplash header.redir @@ -0,0 +1 @@ +_blank.png diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 767c787297..7f13179ec3 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -119,6 +119,7 @@ FoldOnJoin=1 [ScreenStyleSplash] NextScreen=ScreenSelectGroup +HelpText= [ScreenSelectDifficulty] Choices=arcade-beginner,arcade-easy,arcade-medium,arcade-hard,nonstop,oni,endless diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index c7a172ff88..54f5842362 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -13,9 +13,8 @@ #include "ScreenStyleSplash.h" #include "GameConstantsAndTypes.h" #include "PrefsManager.h" -#include "AnnouncerManager.h" -#include "GameState.h" #include "RageSoundManager.h" +#include "ScreenManager.h" #include "ThemeManager.h" #include "GameState.h" #include "GameManager.h" @@ -44,11 +43,8 @@ ScreenStyleSplash::ScreenStyleSplash() m_Background.LoadFromAniDir( THEME->GetPathTo("BGAnimations",ssprintf("ScreenStyleSplash-%s-%s-%d",sGameName.GetString(),sStyleName.GetString(),iDifficulty) ) ); this->AddChild( &m_Background ); - m_Wipe.OpenWipingRight( SM_DoneOpening ); - this->AddChild( &m_Wipe ); - -// m_FadeWipe.SetOpened(); -// this->AddChild( &m_FadeWipe ); + m_Menu.Load( "ScreenStyleSplash" ); + this->AddChild( &m_Menu ); this->SendScreenMessage( SM_StartClosing, 2 ); } @@ -56,7 +52,7 @@ ScreenStyleSplash::ScreenStyleSplash() void ScreenStyleSplash::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) { - if( m_Wipe.IsClosing() ) + if( m_Menu.IsTransitioning() ) return; Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); @@ -68,8 +64,8 @@ void ScreenStyleSplash::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_StartClosing: - if( !m_Wipe.IsClosing() ) - m_Wipe.CloseWipingRight( SM_GoToNextScreen ); + if( !m_Menu.IsTransitioning() ) + m_Menu.StartTransitioning( SM_GoToNextScreen ); break; case SM_DoneOpening: @@ -85,15 +81,22 @@ void ScreenStyleSplash::HandleScreenMessage( const ScreenMessage SM ) void ScreenStyleSplash::MenuStart( PlayerNumber pn ) { - m_Wipe.CloseWipingRight( SM_GoToNextScreen ); + m_Menu.StartTransitioning( SM_GoToNextScreen ); } void ScreenStyleSplash::MenuBack( PlayerNumber pn ) { - if(m_FadeWipe.IsClosing()) + if(m_Menu.IsTransitioning()) return; this->ClearMessageQueue(); - m_FadeWipe.CloseWipingLeft( SM_GoToPrevScreen ); + m_Menu.Back( SM_GoToPrevScreen ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu back") ); } +void ScreenStyleSplash::DrawPrimitives() +{ + m_Menu.DrawBottomLayer(); + Screen::DrawPrimitives(); + m_Menu.DrawTopLayer(); +} + diff --git a/stepmania/src/ScreenStyleSplash.h b/stepmania/src/ScreenStyleSplash.h index 810760f1b7..859de6b054 100644 --- a/stepmania/src/ScreenStyleSplash.h +++ b/stepmania/src/ScreenStyleSplash.h @@ -14,10 +14,8 @@ #include "Screen.h" -#include "TransitionFade.h" -#include "TransitionFadeWipe.h" -#include "RandomSample.h" #include "BGAnimation.h" +#include "MenuElements.h" class ScreenStyleSplash : public Screen @@ -27,13 +25,14 @@ public: virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); + virtual void DrawPrimitives(); protected: void MenuStart( PlayerNumber pn ); void MenuBack( PlayerNumber pn ); + + MenuElements m_Menu; BGAnimation m_Background; - TransitionFade m_Wipe; - TransitionFadeWipe m_FadeWipe; }; #endif