From e721fde9b759ae756864033fdb2655db55dd7624 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 12 Apr 2009 16:53:49 +0000 Subject: [PATCH] theme touchup --- .../BGAnimations/ScreenPlayerOptions out.lua | 8 ++++---- .../ScreenSelectMusic decorations/default.lua | 9 ++++----- .../glow bar (doubleres).png | Bin 1635 -> 4318 bytes .../Fonts/ScreenGameplay StageDisplay.redir | 1 + .../ScreenSelectMusic OptionsMessage.redir | 1 + .../Fonts/ScreenSyncOverlay Adjustments.redir | 1 + .../Fonts/ScreenSyncOverlay Status.redir | 1 + .../ScreenWithMenuElements StageDisplay.redir | 2 +- .../_sf sports night ns upright 16px.ini | 3 ++- .../default/Fonts/_venacti Bold 13px.ini | 4 ++-- .../ScreenPlayerOptions ask options.png | Bin 8896 -> 0 bytes .../ScreenPlayerOptions entering options.png | Bin 5209 -> 0 bytes .../ScreenSelectMusic options message 1x2.png | Bin 4912 -> 0 bytes stepmania/Themes/default/metrics.ini | 3 +-- stepmania/src/ScreenSyncOverlay.cpp | 14 +++++++------- stepmania/src/ScreenSyncOverlay.h | 2 +- 16 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenSelectMusic OptionsMessage.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenSyncOverlay Adjustments.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenSyncOverlay Status.redir delete mode 100644 stepmania/Themes/default/Graphics/ScreenPlayerOptions ask options.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenPlayerOptions entering options.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenSelectMusic options message 1x2.png diff --git a/stepmania/Themes/default/BGAnimations/ScreenPlayerOptions out.lua b/stepmania/Themes/default/BGAnimations/ScreenPlayerOptions out.lua index e1cd46c6cd..4328de431f 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenPlayerOptions out.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenPlayerOptions out.lua @@ -6,8 +6,8 @@ end local t = Def.ActorFrame { LoadActor( THEME:GetPathB("", "_fade out with sound") ); - LoadActor( THEME:GetPathG(Var "LoadingScreen", "ask options") ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false); + LoadFont( "common normal" ) .. { + InitCommand=cmd(settext,"Press &START; for options";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false); AskForGoToOptionsCommand=cmd( visible,true; diffusealpha,0; @@ -21,8 +21,8 @@ local t = Def.ActorFrame { ); GoToOptionsCommand=cmd(visible,false); }; - LoadActor( THEME:GetPathG(Var "LoadingScreen", "entering options") ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false); + LoadFont( "common normal" ) .. { + InitCommand=cmd(settext,"entering options...";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false); AskForGoToOptionsCommand=cmd( visible,false; linear,0.15; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index d4895ee1f6..aa6046343e 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -101,12 +101,11 @@ t[#t+1] = Def.ActorFrame { }; }; -t[#t+1] = LoadActor( THEME:GetPathG(Var 'LoadingScreen','options message 1x2') ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;pause); +t[#t+1] = LoadFont( Var "LoadingScreen", "OptionsMessage" ) .. { + InitCommand=cmd(settext,"Press &START; again for options";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.5;pause); OnCommand=cmd(hidden,1;draworder,111); - ShowPressStartForOptionsCommand=cmd(hidden,0;setstate,0; - faderight,.3;fadeleft,.3;cropleft,-0.3;cropright,1.3;linear,0.4;cropright,-0.3); - ShowEnteringOptionsCommand=cmd(finishtweening;setstate,1;sleep,0.25;playcommand,"HidePressStartForOptions"); + ShowPressStartForOptionsCommand=cmd(hidden,0;setstate,0;faderight,.3;fadeleft,.3;cropleft,-0.3;cropright,1.3;linear,0.4;cropright,-0.3); + ShowEnteringOptionsCommand=cmd(settext,"entering options...";finishtweening;setstate,1;sleep,0.25;playcommand,"HidePressStartForOptions"); HidePressStartForOptionsCommand=cmd(linear,0.4;cropleft,1.3); }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenStage decorations/glow bar (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenStage decorations/glow bar (doubleres).png index 3c188152bbff6be1faf1599d2d3debd192cf23f7..df2fc21da07a595920df74f973f6686a793c1d4e 100644 GIT binary patch literal 4318 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 Zq=4)#CxgPL$adl(V4!27T?=u3`Y-)~@1Xzy literal 1635 zcmXX`dpy%?7+>0`{c4mfVirE>Vzf?aK5i#-??n4Z%yqxzmQJ%==2Dy(LoGWxPELhf zx=c$Na!aa(QgS9oM6`pb-efdS@p) zHv|HS1^v%QbN>+o%fA(m@f~e@c*jxK@0G&EX1Mi>%y> zWz9?^FxFpUbK*)=pcz?-;6;GR{?o&?tm4l_f+_Jj?7wGl3X%>QLquM%41G3BI%+(- z9-0luswR=qSm{AOh>ZdOOtt!^AtaeWW{YVSd<&xNfYPOS{@-UL#k6_uav_&rO>!1X1AQAn-b=>89RWzY+o}DkSf$MNhp-qLX&q zVR+kl|1K(3160HknBKi{mrhj*I?kmE1c@jAp}xUhe1QSK74 zT`AqY`Wq7ByHHMbrznTK{RTj;$Q96KSdV3NGG{5Xt&TCt?i#U}DupFx9(gJuWdoIz zXrixaA-SuTC>Wp}C7D$`Qv!jfyIcJlXBdqUIul*^ml)3LQjdR+-90(MmHvv z>F*f7+Z{M0>IFex8tfZo?Z+w`MfO<3Tvp)f+eOAy&53z8^K2H;*ViGQHLe04D^YKu zYD*v9FPQ#xEZg!!jj?ZYGRH58{B=$mOruFxq7@1vQ+Cq=lb%+kCQr^g2!+goOk7<# z#Q;#P>urg6b@u)?s@Y2(6A7t!;jsA@yo|+VMIky|U+R1i-t6TiWU4?dCD^7L zb3CEE`T9goQVm#qzF+&KGBjoNIJQn8lcm3Zl?Kd-HVZem^tH=CWmBN)Gs8+_Qx3vY z_`a-jq0w0jx3bda9xr)WHSf#uSBP!eJI`QoA8&prU)oxu_36)wMEU~*gZbkA?n2`X zCmfpJn&Db5c<1==w*S(D^cq219LpDHK5YPe54=Al*t6Joy0!5{?&D%@y4R5 z2CBMqpdJ)*cx_|UZv~l;{_#jFY0LLiot_&lB>!latagvfrbFK?eKkW&&$VJwD`zx% z*_=A6oT6EcL|-4LV_Q)nZ_6HF7CpcnJ1n?VxusLrR_W=@vOI`^Ti2D4%qh2()NFHi z+Ub}eat`Ogiewh>ghLgd3xL3NO>SUP#aMz}>;6Anbg~fLK3<5F6oeTn`f(}lYX&-C(( z@Z@EPckQ!UXq$aKkL=m=)5tfX7Qf$}A0g`8ZvASXhmoyrN|QEVENGvcFwAcn)xw9p uwG{Wu6+FwT=885?+^((|Wr)MG`H0nsx!wM&+cSp$Qk*#3yV{kKVfOzcqskEg diff --git a/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir b/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir new file mode 100644 index 0000000000..e3efea95aa --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir @@ -0,0 +1 @@ +_terminator two 18px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenSelectMusic OptionsMessage.redir b/stepmania/Themes/default/Fonts/ScreenSelectMusic OptionsMessage.redir new file mode 100644 index 0000000000..9a077acb3a --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenSelectMusic OptionsMessage.redir @@ -0,0 +1 @@ +_venacti Bold 15px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenSyncOverlay Adjustments.redir b/stepmania/Themes/default/Fonts/ScreenSyncOverlay Adjustments.redir new file mode 100644 index 0000000000..b3cb413b36 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenSyncOverlay Adjustments.redir @@ -0,0 +1 @@ +_venacti Bold 13 \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenSyncOverlay Status.redir b/stepmania/Themes/default/Fonts/ScreenSyncOverlay Status.redir new file mode 100644 index 0000000000..8c98197b09 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenSyncOverlay Status.redir @@ -0,0 +1 @@ +_venacti Bold 15 \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir b/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir index 695562aab4..6d33ff9170 100644 --- a/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir +++ b/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir @@ -1 +1 @@ -_sf square head 13px \ No newline at end of file +_terminator two 13px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini index c80a40a226..a48028a812 100644 --- a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini @@ -1,10 +1,11 @@ -[common] +[common] Baseline=14 Top=2 LineSpacing=17 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +DefaultStrokeColor=#FFFFFF00 [main] Line 0= !"#$%&'()*+,-. diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini b/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini index b2f890b8d1..bc4af8d872 100644 --- a/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini +++ b/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini @@ -1,9 +1,9 @@ -[common] +[common] Baseline=15 Top=5 LineSpacing=16 DrawExtraPixelsLeft=1 -DrawExtraPixelsRight=0 +DrawExtraPixelsRight=1 AdvanceExtraPixels=0 DefaultStrokeColor=#FFFFFF00 diff --git a/stepmania/Themes/default/Graphics/ScreenPlayerOptions ask options.png b/stepmania/Themes/default/Graphics/ScreenPlayerOptions ask options.png deleted file mode 100644 index c239250aed73a2dec04e0a19fa7fcb276d9b1f0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8896 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"Common", "normal") ); + m_textStatus.LoadFromFont( THEME->GetPathF(m_sName, "status") ); ActorUtil::LoadAllCommandsAndOnCommand( m_textStatus, m_sName ); this->AddChild( &m_textStatus ); - m_textSyncInfo.SetName( "SyncInfo" ); - m_textSyncInfo.LoadFromFont( THEME->GetPathF("Common","normal") ); - ActorUtil::LoadAllCommandsAndOnCommand( m_textSyncInfo, m_sName ); - this->AddChild( &m_textSyncInfo ); + m_textAdjustments.SetName( "Adjustments" ); + m_textAdjustments.LoadFromFont( THEME->GetPathF(m_sName,"Adjustments") ); + ActorUtil::LoadAllCommandsAndOnCommand( m_textAdjustments, m_sName ); + this->AddChild( &m_textAdjustments ); Update( 0 ); } @@ -135,7 +135,7 @@ void ScreenSyncOverlay::UpdateText() // Update SyncInfo // bool bVisible = GAMESTATE->m_SongOptions.GetCurrent().m_AutosyncType != SongOptions::AUTOSYNC_OFF; - m_textSyncInfo.SetVisible( bVisible ); + m_textAdjustments.SetVisible( bVisible ); if( bVisible ) { float fNew = PREFSMAN->m_fGlobalOffsetSeconds; @@ -146,7 +146,7 @@ void ScreenSyncOverlay::UpdateText() s += NEW_OFFSET.GetValue() + ssprintf( ": %0.3f\n", fNew ); s += STANDARD_DEVIATION.GetValue() + ssprintf( ": %0.3f\n", fStdDev ); s += COLLECTING_SAMPLE.GetValue() + ssprintf( ": %d / %d", AdjustSync::s_iAutosyncOffsetSample+1, AdjustSync::OFFSET_SAMPLE_COUNT ); - m_textSyncInfo.SetText( s ); + m_textAdjustments.SetText( s ); } } diff --git a/stepmania/src/ScreenSyncOverlay.h b/stepmania/src/ScreenSyncOverlay.h index 38c3b978e4..cfb730b170 100644 --- a/stepmania/src/ScreenSyncOverlay.h +++ b/stepmania/src/ScreenSyncOverlay.h @@ -25,7 +25,7 @@ private: Quad m_quad; BitmapText m_textHelp; BitmapText m_textStatus; - BitmapText m_textSyncInfo; + BitmapText m_textAdjustments; };