From 6bf3c9ed37edf0bb6a054417d1f0e0652b409212 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Fri, 28 Dec 2012 17:49:53 -0800 Subject: [PATCH 1/3] Fix mouse events being eaten on SSMusic. --- src/ScreenSelectMusic.cpp | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 7c594519a6..7205408c8a 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -394,6 +394,18 @@ void ScreenSelectMusic::Update( float fDeltaTime ) } void ScreenSelectMusic::Input( const InputEventPlus &input ) { + // HACK: This screen eats mouse inputs if we don't check for them first. + bool mouse_evt = false; + for (int i = MOUSE_LEFT; i <= MOUSE_WHEELDOWN; i++) + { + if (input.DeviceI == DeviceInput( DEVICE_MOUSE, (DeviceButton)i )) + mouse_evt = true; + } + if (mouse_evt) + { + ScreenWithMenuElements::Input(input); + return; + } // LOG->Trace( "ScreenSelectMusic::Input()" ); // reset announcer timer @@ -505,23 +517,6 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) m_bStepsChosen[input.pn] ) return; // ignore - // todo: Allow mousewheel to scroll MusicWheel -aj - /* - if( input.DeviceI.device == DEVICE_MOUSE ) - { - if( input.DeviceI.button == MOUSE_WHEELUP ) - { - MESSAGEMAN->Broadcast( "PreviousSong" ); - m_MusicWheel.Move( -1 ); - } - else if( input.DeviceI.button == MOUSE_WHEELDOWN ) - { - MESSAGEMAN->Broadcast( "NextSong" ); - m_MusicWheel.Move( +1 ); - } - } - */ - if( USE_PLAYER_SELECT_MENU ) { if( input.type == IET_RELEASE && input.MenuI == GAME_BUTTON_SELECT ) From a20d7722a2d1f01a30090fc3619bad0087d8e8f1 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Fri, 28 Dec 2012 19:00:19 -0800 Subject: [PATCH 2/3] Update theme (Autogen, general annoynaces) --- .../default.lua | 5 ----- .../Graphics/StepsDisplay autogen.redir | 1 - .../Graphics/StepsDisplay autogen/_badge.png | Bin 0 -> 3196 bytes .../Graphics/StepsDisplay autogen/default.lua | 11 +++++++++++ .../Graphics/StepsDisplayListRow autogen.png | Bin 532 -> 0 bytes Themes/default/metrics.ini | 18 +++++++++++++----- 6 files changed, 24 insertions(+), 11 deletions(-) delete mode 100644 Themes/default/Graphics/StepsDisplay autogen.redir create mode 100644 Themes/default/Graphics/StepsDisplay autogen/_badge.png create mode 100644 Themes/default/Graphics/StepsDisplay autogen/default.lua delete mode 100644 Themes/default/Graphics/StepsDisplayListRow autogen.png diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index bb37abf203..f1f9335318 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -20,11 +20,6 @@ t[#t+1] = Def.ActorFrame { --[[ LoadActor("_particles") .. { InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y); }; --]] - - Def.Quad { - InitCommand=cmd(vertalign,bottom;scaletoclipped,SCREEN_WIDTH+1,96;y,SCREEN_CENTER_Y-32;fadetop,0.75); - OnCommand=cmd(diffuse,color("#FFCB05")); - }; --[[ LoadActor("_pattern") .. { InitCommand=cmd(z,32;x,4;y,4;;rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256); OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,Color("Black");diffusealpha,0.5); diff --git a/Themes/default/Graphics/StepsDisplay autogen.redir b/Themes/default/Graphics/StepsDisplay autogen.redir deleted file mode 100644 index 04b2ead777..0000000000 --- a/Themes/default/Graphics/StepsDisplay autogen.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/Themes/default/Graphics/StepsDisplay autogen/_badge.png b/Themes/default/Graphics/StepsDisplay autogen/_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..6655de25f109c2ac6b1c2d0c4e09e15e46c08dd4 GIT binary patch literal 3196 zcmV-?41@EDP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0004}NklY5Qd*qi5#SsgS06`2&9mJAfysZ6aP*sE5SOYh2URECs+jp z38WALVv$BLAf`!3$YCIi%?Kj-*!$c>^1>F!-R(Tgva_?VBO;k zuB5T%YS9wsfL9=!Qav66hq~lO8LXuUhsLUzW-tqU0&dEunhzXkHkW3wY5@+7Sv6VW zvc=w@Yyw!Y2v{%y%v%J^n{1M=WrZ_gO@aN5@2H0sd4?u{U5kKS6Tpr|z>W!E(;{H= zUmSH~;Lbw!ZvVnM3TgJ`ZkL27kJXHgJ?M+>72z{Gctr4_pBK1mXG`!w>7t zbb-pE^v7_ctE@a2{=>!nxAk!?B9jPU6P?3N!ke*T9yt*#;EY;t=fKGV`|Sz1SNm-m iCWy23sJDQY^*sPp5Eu>Japw#G0000_ z-r>>?F}$&{(b(7+q9#2(JtQRL#*G`uTBM|;-n@AO6v@ucj*E-S%*_1Cap)9KvvEm~ zUob<1fnGHK41t+(Vr((FIrjVZ%vr9e(Xey2L#y%{7F}V66^V6>?OFYs6jrvW*Y8}F zJt@1_%IP*x`*%+l$B>G+x7Xa)9aZ3I3p7x1@Oc09+r8WW#J?|5>ALsEPd9eHXpQh` z``>K>PA9VVy%B4;v?%&qZlE`NORb)swJ*>8;> zRgLy>e%riC=aRg+zb^fwVe6=zjJ3~tuLRNV!Cf-Si0xeI^N*3W%DN~ht};%{IYIMIERC$ h$h_410!|!1neQj7ITzoYrv(fG22WQ%mvv4FO#n`B9)17- diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 3c534b782d..d5639d7026 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -458,11 +458,11 @@ DescriptionSetCommand=%function(self,param) \ end; \ end; # -ShowAutogen=true +ShowAutogen=false AutogenX=0 AutogenY=0 #AutogenOnCommand=diffuseshift;effectcolor1,Color.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); -AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); +AutogenOnCommand=zoom,0.75; # ShowStepsType=ThemePrefs.Get("AutoSetStyle") StepsTypeX=-64-8 @@ -1150,11 +1150,19 @@ DescriptionSetCommand=%function(self,param) \ end; \ end; # -ShowAutogen=false -AutogenX=40-32 +ShowAutogen=true +AutogenX=-132 AutogenY=0 AutogenOnCommand= -AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end +AutogenSetCommand=%function(self,param) \ + if param.Steps:IsAutogen() then \ + self:finishtweening(); \ + else \ + self:finishtweening(); \ + end \ +end; +AutogenTweenOnCommand=finishtweening;decelerate,0.25;zoom,1; +AutogenTweenOffCommand=finishtweening;bounceend,0.2;zoomx,8;zoomy,0 # ShowStepsType=ThemePrefs.Get("AutoSetStyle") StepsTypeX=-20-32 From 7ea1b21bb36ae5092daec90b0011d17ed140a5a5 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Fri, 28 Dec 2012 19:01:40 -0800 Subject: [PATCH 3/3] Fix lives. --- .../LifeMeterBattery lives/default.lua | 42 +------------------ 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/Themes/default/Graphics/LifeMeterBattery lives/default.lua b/Themes/default/Graphics/LifeMeterBattery lives/default.lua index e042e41c79..8fd1c40f0e 100755 --- a/Themes/default/Graphics/LifeMeterBattery lives/default.lua +++ b/Themes/default/Graphics/LifeMeterBattery lives/default.lua @@ -7,44 +7,7 @@ local LifeMeter, MaxLives, CurLives; local LifeRatio; local t = Def.ActorFrame { - Def.Quad { - Name="LifeFill"; - InitCommand=cmd(zoomto,barWidth,barHeight); - --OnCommand=cmd(diffuseramp;effectcolor2,PlayerColor(player);effectcolor1,ColorMidTone(PlayerColor(player)); - -- effectclock,'beatnooffset';effectperiod,1); - }; - InitCommand=function(self) - --c = self:GetChildren(); - end; - - BeginCommand=function(self,param) - local screen = SCREENMAN:GetTopScreen() or nil; - if screen ~= nil then - LifeMeter = screen:GetLifeMeter(player); - MaxLives = LifeMeter:GetTotalLives(); - CurLives = LifeMeter:GetLivesLeft(); - MESSAGEMAN:Broadcast("SystemMessage", - { Message = "(" .. MaxLives .. ", " .. CurLives ")", NoAnimate = true }); - else - MESSAGEMAN:Broadcast("SystemMessage", { Message = "WE DONE FUCKED UP"}); - end - end; - LifeChangedMessageCommand=function(self,param) - if param.Player == player then - LifeRatio = CurLives / MaxLives; - end - end; - StartCommand=function(self,param) - if param.Player == player then - LifeRatio = CurLives / MaxLives; - end - end; - FinishCommand=function(self,param) - if param.Player == player then - LifeRatio = CurLives / MaxLives; - end - end; - --[[ LoadActor("_lives")..{ + LoadActor("_lives")..{ InitCommand=cmd(pause;horizalign,left;x,-(barWidth/2)); BeginCommand=function(self,param) local screen = SCREENMAN:GetTopScreen(); @@ -74,8 +37,7 @@ local t = Def.ActorFrame { end end; FinishCommand=cmd(playcommand,"Start"); - }; ]] - + }; }; return t; \ No newline at end of file