From 87b4e72bc29dd8d7d0e15cd4293a97b0c9a3c5c0 Mon Sep 17 00:00:00 2001 From: Rob Campbell Date: Mon, 28 Jul 2008 00:38:27 +0000 Subject: [PATCH] bugfix (p2 panes always visible) beginnings of the bpm meter --- .../bpm meter 1x2 (doubleres).png | Bin 0 -> 7353 bytes .../ScreenSelectMusic decorations/default.lua | 35 +++++++++++++++++- ...es).png => temp bpm meter (doubleres).png} | Bin 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/bpm meter 1x2 (doubleres).png rename stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/{bpm meter (doubleres).png => temp bpm meter (doubleres).png} (100%) diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/bpm meter 1x2 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/bpm meter 1x2 (doubleres).png new file mode 100644 index 0000000000000000000000000000000000000000..8fa5b1acfb8c5f9acd7f3d9b2ebfedbaf4ce4584 GIT binary patch literal 7353 zcmYLucQhPK*sl^LdhaaJJJCg~=w6*fc@ad7DA8A4E$Xs}5(H5~M56azR%cm}5Ou8{ zZC71vxZdx(_uM~b=K0N2&dhJ-JTqq|$;3#9l8lWE4-b!0Pgm3IzD3^`HB#dHny>hJ z=e~L1_RR1Z9$xLJ0#WkbJ!TEivI;QwaSaG|^mD;`=Iryzg(=}Oxh+XiV%!n&ZQ zE|>j{)mb&Mbjp)_s?fHqwmj@HY$+*hJ?Rx}ht8OH7~D+b!@a8Yu?d-yR7qDnHs3-! zPpd#zDTWooIHQuny+|0k+@39SP%6 zwE{2Ix^midaMTRzv5;O97Tj7QcqE>K86-620#l&3hiT)vgcV_-umTD}{17*Ka29q2 z#t6Gf%B8zYYU_VXCzZ(xYo)ROMj0}Z=AfQr}o9K_5M zfkrr<;XzYz=R7J_ZNed7DhA*xh+)Fq(May}yrtOq?utvrv8J6e!$iN-cF3mRFvs7> zp`fG*G1r{jk%?Gv(vsE{_D+&+txp@^7^~B%G8wo_1DZSjAvUo$5M5f##TyyTnOi~j ztGQr7udLT5X`c2j{`|{QDR3r%{A8{;#Twv>xhtue_A8cSxi+8NS{(=_iCECbx&2C5 z$+;csJCR0-{uU-U<-^eBOdYIYAiYIPXX4%kTXXh>6^@yyFZ?2a16zc55B`XG)$gu` z9lwz5LJ!>Ro^q;O=QIrDG}5UrbTEoqaLh7K<;m>ODdXrBjFc4A_=B}S=!`S*P(%Lc z!*bs`4Y&QMJUu>#B@l6G-$=racZMPLW`)y~=F^-t4~^DEOQrSOGF%%r-{o{n%-=!*WiwU@$D(mKQ!tu}Is6Icv43>(_?HjzB#cM>dSS#v z$)su@RDy)E|6v^2z%&#U6@9(9xPW>tw_(h@oegvA>Y1cf|G}D}zNV$6vH#iMU(Td4h)wM4g{F!Tgew=O@x32oLEG8cDR?inc*(D)Jcy)9 z*zsoVE29daMEeIHE(T^q_hvGhZlrM2`x5;O@pf|Bc=8aygr%-8)eLz~z5z^}sDk@b zb0|vv=(8V8euUBLdvBn?sTvLU9xY@AHIFaroCv27lSHK(6(5=}J=E^Y1ezp~z_dLFIR<)7&J%oDABE zNw5E{VzK`RD}pjlbnC_pvrD1t2iz+f1%nG8F4DTtLwR~Yf3MFi%bvy|K2GpNnLS?K^`GvtJ$M@3}ct6*0zDZ#USzZ1Mcv&GNSj=SSZ2QR=5qL3`*}CO^xH z_oMJU6HRe_R%afiVOr>jFQQZ{nEt{8WlF62KqsxkL&ffiHwHBnOn2djqAO|R8P28Y zN#0kc!hY7zUDaL)e)u=ZL*)!Vf*&)HD_N|+u%`}w^$MN*M}8KR>`=pV;Ed?y??|2L zb>~I4M-126w$n9C+;Y0S;YC(SZ2bCWEtA4a>(Za_pTSY9Z*z0AOp|#05C=D8y!4sg z7ojj4g}G8wkU#?Ed*^r2KR`lUHP4({o13RxaeHRm$kC{1$sFvjU%&K2BBc<0I-e%_ zEDexlQ&UrxZ*{+PdsYpX`I6c{LJuWSadyOG=rylcR#G0QmSSW}AI)9G$D;b#eRdil_HUq!q z8!CXC$EAG6Crs&3KbGaX)4Gmz-;68@)l(Ul%)O3s($}B3QPezqm*AvbNTlkAMm~eQ zx`Ue<5L0uk>-cj%fe;iXcernuL4RtOc6W+>`M5DPr|Y+=ew&sC zgnSiccSDHiEJ5PIEoEkZXV&WK>durcprDv!)Md0;aag+qLl*6?+mg)IQeU-~>)|?XXc~{3bJRIx5Glo6HXuM#^q=~Z3Psf#pbr+%U z7zD@Ggo$#dK39%?{H)pCU-aXwv@=IZ9^R~9*jEL&G^(C)vr6ZwE&&>Qb-x{R+PJ_- zv^&ED$ua1%LLgD9Mu-~sT0Q!tzZlMInnSSFXDotOyAz!~8=Gvp5)UpgnJKjeStK@! zV{OS43?U0w$VzfT(wz>*5+DBL>>uG6Vc}`K4GjW7&MAfiWPY1YIekdqGWwp}o^O1b z1fWFRHBK^3B`PBNZ*QY3<+S*eOp$eG>!2}!QqF}Wcg*et@HRc3a=&6SOfGG0PLMMlb=8Ee0r-&l54S5L@FsZ=a_S05KW4Wqk1CIq;Q0ztza41Y^G?gysWIslSmvkNlQzs zWP5viGhgnFa`4eItKd6%4D~=_@WBFRMA~WC0I!HaiO5ae z1|*b8wrZ^EOH;1Z3DO*=XWg!jsiJ*!7iGjMwl$cDfrxMs zie2XM4!^jNX)sJ-5?}lR8;*#jBY@uhKAAH&?k?$~l#&lOYofk=b3X8nT;Z*qXNKlK zSx|)c9=)*&CjX>}ta1GZ0W_CEW%RaWgidk@i8Vb0DaiQPlZ#K;;jxXtE zY&0bo9DnufP{Y;P#t8-d48>ctPcmT(D-vXzSI1!Lu#sk5NjgHQ;?;7*s$;#JvS`xJ z^)7+mqK)^Zmilk; z*3dSxiU_*4_+ZtMBw4(*ObitF`*2{r^cc-??i_d~tfmLLZLgl83AK{wv_TI>kj=~| z9=i4Q3Pu`*P_Nm;lM`|!Rbb<3g^iMXGJ-kTUlc3jU(}{2O`7 zqmbnaPgpj|R|5EHyxtDKpG)4USHVr*|7b>-HX;o$1o?+g{ZbE>(cGr|8|$){Cy#QS z()zCAokv2;!mT_f71PY4y8bM!2}ijEDt@BZp{mslW<)YvRvlQLISZ|&a>TN!14hzM ztQ7nxvZwaPoDOQEw1wVj32k8C`Q*?@SaYjpi>in{IF@3JY0Wy`OfufyFcrs|6k)@I z*cg*7iN*mlq*6%YUn?(@6WD*`Xni`2#OCDWWVygV8%Ap1LxN%^e_>Is0#dPauk*o?4PW-2L2Bp{ML%iy2`kzs+eMHp z%W*KC(k|z_7x{naZ5yjkJL0ZMe48Y4V>s0=M=KX7I$^{B5xdVFe_D{t)vKbV5|O9d zQ!7kYxnB-0N!_&9#BEy6tk71?5Sy1?CdAU%R zZ`R?U%ephjizH}RN|grd^QELcyc9I;QSCtN3 zwcQv0GUrNO?xVI=r<+<^1sx0=*!0X7hFc^5hNc=Po%l|lUfrkga;o+EQ{r*sz}+S! zKrphovQqFfW+5cjE2OsP`s;8d5m&3>s+wKkD0G@(s@&rHzn?K_eNI39pFAPZNtjCH zs%zBwnEND;D%o$DH}z;Q_ho2RH}u7Blr~L!3eP=9Zwi6n+xO0OtvZh~PBk?CvT8aF|n};vwQt|k6|=+hJ#q_V(f^aOvqw)8?k%We{$mI$@jMPq+h8|inUP( zS+8=}tgse-+K`-_{6n?~(yD*3v?7Tn-RsqazYcow;^%_{NI#P%OYOqNJm2O>H*9Ht ze}DdkrDdm2%W^Lm?6)$c)i_$xwrZ6us5~* zBq0=L)my)BNdX=z7AnkYR#7O_K|3H(#Xf_Y9?H7!#4pg;&btdKZgod7WC9RQfo1HR1+Sk z`aC2)`E3|(O@NDP9VmtcV88_+MSv%tl>O#yIyDzg6p84?huX?Bx+{r3TJ;YXsI53M z(ecO2gF<++hDl?YON{AwSMG#;+#vtu($*I!t*uJmt5CN|fSA90+$<2zyV_1Bs-ptaga4L-9v2f-;xaZuc>?sk0Zc5X^W zO%dfJ>^>8(+G%p~i$USiXENkmC1+yZ6JJPUX(@4<=RLpgxaVK^1kOPboZFEG4>aaR z1r*v@)uo;-NL)&6eeNMWO+H-9p58DYUs4FIlG6P~+FRb>Pp%h(vLB0QMIm;re})wl z3LL2Q3!DmzQERVhi9Aur(b8k!bl9gV#5fO;*!wo)reX2v3uCGGD*3}ao>M(Iy z3pHLu6d{?=C&#YDEeU)qSzyq%p#TYUlo2|8CDp&(;Vs?W-Idmu3eusyLu1 z(zZ!h9P;hL^-=wV-$0#RS+XC8e5ea96fIjK8?q09M*^=9)m1%dxd5vP=w9OBRdk~Z z=Ey{GhR}@xY&=u{<2y-TLrnu*#QX`yrnaGR+9fURk6q1ldw4D58mIk7#p0hkN^s%g zwW-tblPmYIss;Myzkuj5mYYdx1MOvTNHFrA0^zPe4i-OK7PQcHI4kSUR6ti^+E&03 zH)nC>24Jr(Ns))5Eso7u9-~wBE%--$3<#L_(@gm`2`*RnY8@dZPf#ByiYE7VsO%So;g~I^Gm%U*o-(gf_ z?8US-je4<{_lmy_vg7oysMd=S8;mA9(;~3%KXrY6nm!I!AXnPT6b zXlkc$aPm8=&s|NjJ13!2m(MTg%@rDZ3O}cL7jTXof;lC*YnZY7A)K2Wj`nh0znZ#s z%w@m~H(rPA1E5;e6OmaigaoMEU;6JYH>+=jj zSfb+sfR&4&+BSxfLEWXEEFq9l>Y(3orCvn4SX!-QRNmVgT7?@D{-dzxA?~ zG?Ak+0wbX4vL(@VisV%5Kq*d_s>^zb{80%I+&a&qnjo9~7ZO7fUTyBXB$o7n*uNzGiOdidUbWjz z6FF=NojSCMR`P9PvZcBWO?hbe2(8X_B(1mr9znBsSesbE-b#l(2eLZz>=Hhki(|noU^T)CBd3bjU88 zGst|eab*||$MtE<^b_#}aD$Dy3IGeGb9v>i!yyX5I-+7d57&>u^tsmP*O&sn`yQxo zyWSM!)cbxJIy&wp|9c70RWLWH*vdn4D@VSn0F=6O?fE!xZ~HhiU;1jB#Ny-JWYd`g z!u`QCCK=eed5O`frOM1t{Z#H+@#sMc4R3W%_o}uv?u!3cxhp22_C%Cd*JIn5FlSEe zLer~uPu=sGm(%ojnTYrKh-0G?Vvgkz_SF=Lp6B6iJ@T|Bz^eN|&gDw)^YfDF?^XRg z0cyOt1A_rDa*GmjiV{M$-}f#F9KX$@qKy0qsaj6%XR4;L5cMA~_j}f?-wHHz)EiqOn^d2qwkDHj5ojwIChF$TkUh|O) zuDul{^y8|$if$!zm>8B&34J4ut>8HKY8YM1BwTy-y7(6dR-U|vmqb<9BZ!WzP7YXi zlG6otGBtS<>9BRkW$hr1_n)+~bRGLS{9cl{d`-TZ5BT7lB1YylMLpRz#Dw!#1wkPC z;wRtG(xpwt*5FgtbI#(1mt(a2IB_ZD`-C%F5jV3&cjss6b7Hz4Ofxj)2Ht!|-)BXu zSXpZWrv=wZ1gfm_)io1-lsQ*gR6Q5o2~{>Karyx7)*8_Y@C{x9x;TG@?td0dbLK=q zH~0S!GS)?u0Y{YqDh}nki1{?ZTjj#j%zUMe_}&`P(0DZF*D5 zy(i17YTxgfr4srS6@Sd3_$i8jjN<>-<0-fHQTTXf6i%_`q+sFuzehYhEhEhub%&V$ E1AfDoAOHXW literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 3304b98925..e0a2e3bbdc 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -136,7 +136,7 @@ for pn in ivalues(PlayerNumber) do t[#t+1] = Def.PaneDisplay { MetricsGroup="PaneDisplay"; PlayerNumber=pn; - InitCommand=function(self) self:player(PLAYER_1); self:playcommand("Set"); self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end; + InitCommand=function(self) self:player(pn); self:playcommand("Set"); self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end; SetCommand=function(self) self:SetFromGameState() end; CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); @@ -159,11 +159,42 @@ t[#t+1] = LoadActor( "_bpm label" ) .. { OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); }; -t[#t+1] = LoadActor( "bpm meter" ) .. { + +t[#t+1] = LoadActor( "temp bpm meter" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y-22); OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); }; + +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); + OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); + + BeginCommand=cmd(visible,false); + + LoadActor( "bpm meter" ) .. { + InitCommand=cmd(setstate,0;pause) + }; + + Def.Quad { + InitCommand=cmd(diffuse,color("#FFFFFF");setsize,120,16;horizalign,right;addx,60); + BeginCommand=cmd(zwrite,1;z,1;blend,"BlendMode_NoEffect"); + UpdateCommand=function(self) + local function CalcZoomX(width) + local spacing = 10; + local width2 = math.floor( (width + spacing/2)/spacing ) * spacing; + return width2/120; + end; + end; + }; + LoadActor( "bpm meter" ) .. { + InitCommand=cmd(setstate,1;pause); + BeginCommand=cmd(ztest,1); + }; + + +}; t[#t+1] = LoadActor( "stop icon" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X+296;y,SCREEN_CENTER_Y-4); OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/bpm meter (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/temp bpm meter (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/bpm meter (doubleres).png rename to stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/temp bpm meter (doubleres).png