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

move the banner, frame and mask into the overlay

Browse Source 
remove size metrics; crop it yourself
This commit is contained in:
Glenn Maynard
2006-08-14 22:46:48 +00:00
parent b63d8ec48c
commit 5f614f128d
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
-19
View File
@@ -65,8 +65,6 @@ ScreenSelectMusic::ScreenSelectMusic()
void ScreenSelectMusic::Init() void ScreenSelectMusic::Init()
{ {
BANNER_WIDTH.Load( m_sName, "BannerWidth" );
BANNER_HEIGHT.Load( m_sName, "BannerHeight" );
SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" ); SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" );
SHOW_RADAR.Load( m_sName, "ShowRadar" ); SHOW_RADAR.Load( m_sName, "ShowRadar" );
SHOW_COURSE_CONTENTS.Load( m_sName, "ShowCourseContents" ); SHOW_COURSE_CONTENTS.Load( m_sName, "ShowCourseContents" );
@@ -128,25 +126,12 @@ void ScreenSelectMusic::Init()
SET_XY( m_MusicWheel ); SET_XY( m_MusicWheel );
this->AddChild( &m_MusicWheel ); this->AddChild( &m_MusicWheel );
m_sprBannerMask.SetName( "BannerMask" );
m_sprBannerMask.Load( THEME->GetPathG(m_sName,"banner mask") );
m_sprBannerMask.SetBlendMode( BLEND_NO_EFFECT ); // don't draw to color buffer
m_sprBannerMask.SetZWrite( true ); // do draw to the zbuffer
SET_XY( m_sprBannerMask );
this->AddChild( &m_sprBannerMask );
// this is loaded SetSong and TweenToSong // this is loaded SetSong and TweenToSong
m_Banner.SetName( "Banner" ); m_Banner.SetName( "Banner" );
m_Banner.SetZTestMode( ZTEST_WRITE_ON_PASS ); // do have to pass the z test m_Banner.SetZTestMode( ZTEST_WRITE_ON_PASS ); // do have to pass the z test
m_Banner.ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT );
SET_XY( m_Banner ); SET_XY( m_Banner );
this->AddChild( &m_Banner ); this->AddChild( &m_Banner );
m_sprBannerFrame.Load( THEME->GetPathG(m_sName,"banner frame") );
m_sprBannerFrame->SetName( "BannerFrame" );
SET_XY( m_sprBannerFrame );
this->AddChild( m_sprBannerFrame );
m_BPMDisplay.SetName( "BPMDisplay" ); m_BPMDisplay.SetName( "BPMDisplay" );
m_BPMDisplay.Load(); m_BPMDisplay.Load();
SET_XY( m_BPMDisplay ); SET_XY( m_BPMDisplay );
@@ -331,9 +316,7 @@ void ScreenSelectMusic::BeginScreen()
break; break;
} }
ON_COMMAND( m_sprBannerMask );
ON_COMMAND( m_Banner ); ON_COMMAND( m_Banner );
ON_COMMAND( m_sprBannerFrame );
ON_COMMAND( m_BPMDisplay ); ON_COMMAND( m_BPMDisplay );
ON_COMMAND( m_DifficultyDisplay ); ON_COMMAND( m_DifficultyDisplay );
ON_COMMAND( m_sprCDTitleFront ); ON_COMMAND( m_sprCDTitleFront );
@@ -461,9 +444,7 @@ void ScreenSelectMusic::TweenOffScreen()
break; break;
} }
OFF_COMMAND( m_sprBannerMask );
OFF_COMMAND( m_Banner ); OFF_COMMAND( m_Banner );
OFF_COMMAND( m_sprBannerFrame );
OFF_COMMAND( m_BPMDisplay ); OFF_COMMAND( m_BPMDisplay );
OFF_COMMAND( m_DifficultyDisplay ); OFF_COMMAND( m_DifficultyDisplay );
OFF_COMMAND( m_sprCDTitleFront ); OFF_COMMAND( m_sprCDTitleFront );
stepmania/src/ScreenSelectMusic.h
-4
View File
@@ -74,8 +74,6 @@ protected:
vector<Trail*> m_vpTrails; vector<Trail*> m_vpTrails;
int m_iSelection[NUM_PLAYERS]; int m_iSelection[NUM_PLAYERS];
ThemeMetric<float> BANNER_WIDTH;
ThemeMetric<float> BANNER_HEIGHT;
ThemeMetric<float> SAMPLE_MUSIC_DELAY; ThemeMetric<float> SAMPLE_MUSIC_DELAY;
ThemeMetric<bool> SHOW_RADAR; ThemeMetric<bool> SHOW_RADAR;
ThemeMetric<bool> SHOW_COURSE_CONTENTS; ThemeMetric<bool> SHOW_COURSE_CONTENTS;
@@ -94,9 +92,7 @@ protected:
RString m_sCourseMusicPath; RString m_sCourseMusicPath;
RString m_sFallbackCDTitlePath; RString m_sFallbackCDTitlePath;
Sprite m_sprBannerMask;
FadingBanner m_Banner; FadingBanner m_Banner;
AutoActor m_sprBannerFrame;
BPMDisplay m_BPMDisplay; BPMDisplay m_BPMDisplay;
Sprite m_sprCDTitleFront, m_sprCDTitleBack; Sprite m_sprCDTitleFront, m_sprCDTitleBack;
Sprite m_sprDifficultyFrame[NUM_PLAYERS]; Sprite m_sprDifficultyFrame[NUM_PLAYERS];