From 886084ca3401a390f891c4c2e19f9ed67b606fd8 Mon Sep 17 00:00:00 2001 From: EkeEke Date: Sun, 2 Dec 2012 20:34:40 +0100 Subject: [PATCH] [GC/Wii] . fixed CD Leds positioning when using NTSC filter . improved CD Leds images (thanks to Iceknight) --- source/gx/gx_video.c | 4 ++-- source/gx/images/CD_access_off.png | Bin 971 -> 877 bytes source/gx/images/CD_access_on.png | Bin 1215 -> 1812 bytes source/gx/images/CD_ready_off.png | Bin 901 -> 837 bytes source/gx/images/CD_ready_on.png | Bin 1510 -> 1858 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/gx/gx_video.c b/source/gx/gx_video.c index b82e455..21b9860 100644 --- a/source/gx/gx_video.c +++ b/source/gx/gx_video.c @@ -725,8 +725,8 @@ static void gxDrawCdLeds(gx_texture *texture_l, gx_texture *texture_r) int ywidth = square[4] - square[10]; /* adjust texture coordinates to EFB */ - int xl = (((bitmap.viewport.x + 4) * xwidth) / vwidth) + square[9]; - int xr = (((bitmap.viewport.x + bitmap.viewport.w - 4) * xwidth) / vwidth) + square[9] - w; + int xl = (((bitmap.viewport.x + 4) * xwidth) / (bitmap.viewport.w + 2*bitmap.viewport.x)) + square[9]; + int xr = xwidth - xl + 2*square[9] - w; int y = (((bitmap.viewport.y + bitmap.viewport.h - 4) * ywidth) / vheight) + square[10] - h; /* reset GX rendering */ diff --git a/source/gx/images/CD_access_off.png b/source/gx/images/CD_access_off.png index 70d52c5d4be8392cf92091894bd4fa7b85171c6a..d7e5f7930837af3302de5227b9a8ff09910d9e89 100644 GIT binary patch delta 757 zcmVMc{K~#90)t0?W>rfcRe@PXG z8r@Xfs!|6R&8Rr~*-hNk#YLf_OLY>xy9oUQ3f5H$4lW&w&@S5Jv16OXK^r@#f`d7C zD2a{fg?qUdu6-bo^L{*epS*9*2>?4gJ8E!nQ0cnf71zMPfZE#HQUKb<#)c{uiyR*x zGc`4TMQ?8}07@y8QvSV%ueMGxuIti{KjHbEXIPfS$;k=x^YduBuB)r7D`K%&h~&Ep z0H{Cc(!2bSz&d$y_JUqm4oREKY zb(QDmXC59NLcW!i6)el5R;z`4dwYB2^LZ?P%L0NUn@lE=Qc^4yLwO4e3oI=y`DI(w*B1p`PX$FP1Amv=N0d*y;x1tXfzsuT(6$5d_C;} zuIrLYrHIGlD5a=YtDK*o`$Z)Z2@;7!fKVyL&CLz*c$|ZSgOG@7wFk^GdSzB8R6g)OI)>(k#I0zvq6bcjy1(Z_M>ve<>G@DI? z5SXUf@oh>e1Kn#!tyV)y$^QPnZ=0T;CY?@W+cr{4a=Ba}Cz(vrXf!C5N|Z{afNybe zkyI)b7U01&O?G#8I~F5^Ad|@iwlmXzG%*Z=dc962lL>J_>pNOsUk~_RUta^W46Sj^ z<#ITV!|d#=-z8{u=lc2@+qMHaApx4Eaesf0Qi^i9?29oB10e)Lh>)kgr`7&^pNO?(Te*?TWwiK?bnAyxclm2R=SN zLQ20o-rwH=(3Mg=Jw5&Ba{e5ZN(F$(=H}*)Y&Of#&=8}eqeLQ+zb60M>VJv1w>Qe= nGU;^sa}(&c-)X}z{NL%HfyX4w6{#}N00000NkvXXu0mjfa(-+% delta 852 zcmV-a1FQV)2FnMKI|~aE000XT0n*)m{E>1bkw`3m10P95K~#90)s{_Y6j>0*f3MY? zW@h&oy@-<5H7qQSi5~}J^khaP;%1Ep5kK&QH6)`bCMt+1Mh^?J%1YRn+X@bQP+X%Z zelRgQZYI+?_>q|rL`pyi<_-P6g4dNL_!UcdTR{a;me*Lx3uolS=%^uv#$ zY1*`ZctW9&?AX3t0951FJ@TaY9<3+-VA0RNFl$yBARtn56!2zY%kI2qXD~3C={;Zy=i(-rMg`N_oag0L6Pd&&%|4 z7nfo}B`Bq^%wbT<3tpUerIf?zVqStuDYDs20dv+Gw^B-BS*E8^-lCq>gakwc5h2=t zdJ_GoN)RDC_>^;Jju$Y9)He{RZ$@ zB?~os_8hvquVbWAlQ3QPZ~01_F+(0c&3)BDGnEc95Nc{`(GcO|hYuwyF_mR>bQAzh zM0ow`<#!I}+r=0d06=Tpx`$&s`*-p1{%yv_#=dh{UzU-P5qf)jIo;mQZw*d=PP^-L eFc@^N)1LrStwtq9UGeGw0000QcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e z7jKeZ#YO-C2AWAkK~#9!OqRc|WmOf&Ki{?YIrrCl^Jd0jAR{1R?*JO3CR(W>(Z+}SnOTw?6b4h zI^SP<1~}>J4{nylj}PfpFl?|JkmZ87?9&z-Q#VA`lDS%2@c|kUN9$^Sh|q>^Sptb< zRZ1Dsb1hRNtD%#P>Y)$TGHfE{i5DrWgh<krJ5^_PE zh)+J6hSxuB!>{Z0f4+a^Zom5NDw5L(MDPTKwB*!bEpgL2w&|pjo7S;&$EUM&KkNe+LDLfTTlo8KeSBv67)o zR$1ssHZmS#MOH8gGLfJMFfr0_6DrP54fmvlF#*+}$QaTo6l95IQY2RM+rO-R=CJ`L zLj;oMCV-;EC|74mA*mQf(3vO_MzEsNTr8||Or-K=OH73g9afCX7}%Ey!_d_}7g+J) zG!rIKvS0)Sr=N$gsK8d5e@!U)S2*u`VU!(>9Pw29kX`KRbS!XMk6CAM-)GWUpXL5S~20SaDJc zZ|u*w7meWx8Kk&dI=<7dm{Qclsw*dE*t3t|-Em@V#*?*@8SEwgHV)i17&CdNjohl0 z8#2;Fe-(H-e>yzmzm|NX-ylzV6&^1O?s?;Phx`2G+7moyNBA^R3Ov=Vc=h3jyw=Wm z>Ez2?pOP&T+ZcJQ?|AQU!P{-%x%Dwihc(7Z;|*tgjIWL?{W8 zB6xo~@X>fcfa}0zBq|+|GrNsM8C1;p9vQ*w3FFDsaa@hK%{0#l!Pao zl*(gPIYc8&Y^RY_vJhOfrx|QCF=g=Gbgof&b9ltE!sLyviD$bdZjeBxC=Tm@ zlz7k%d_0|V>I26vJYZu+P0>tz;uEJHe~ctS(C{xL)HCr+5?V!RP5`0+Pnhw1*YlKB z9yXv`>SK#954B+pAjVH;!$b*sK3E4>^5&*JmjC{ zl+0NMyDr&HBY$pNMv^gu(UWJoo^LLW`E(rkHxohN0m{acwet1F0%q7y&`vKdf7gHi zs_BKiDh$DGt0(zN*eVwu^a&@m=R78QgX`9@nHY@iKG0QT?*pA?mrjYGa@t0=ZO^3z=i!8c%jVqZR}3++jmFvveSz?#W?@3S-41Wn z5L3pL4@eXO<=mkmswXvrngL2kf2VrTB^XZ0z&-H{N^2O2r!xTQP+UCl9fxQvN6~1g zbc~S$eP$$Q1thl;#95 zF9FIqT;#kaB_VOhKxQ1Sth^`b2ud6nGuR_SL79A3y@W}PeI)x3lg-BHe?XHMB5~## zpg}I&LN#i5Wr;f8zIB53jcqHHWiTZ8OeX9>9x9@{5KykEgmo3 zOGDZBH5622(nXXm6PqmW7{U1l2qcIyzIhT!DN}9ppIm8 z_aY0+l%z3;bm6Uq9GC)ciaJ^jmfDj^m%*U)47Bnvp*Cd1XnF7BHvI7{+Ux%t09Jo1 U@+GF0%m4rY07*qoM6N<$g6JbXfdBvi delta 1174 zcmV;H1Zn$}4!;SIBn<>}LP=Bz2nYy#2xN$nAsBxabVXQnLvm$dbZKvHAXI5>WdJcT zFEKbTF*19>y?6is03dWlSaefwW^{L9a%BKbVPkS{ZDnL>VIW3na%FdKa%*!SO<22; zDkJ~^1QSU_K~#90jh0VnTtytmKeO-cCM5|K3w2FsE>T+TNmEZky$B*`J$MuBtrR?Y zRS$nf@Z_NfPtxMScrcw3APC|x+B$2%L;63U+>KqyfsB>r_rV)Ion<9Lv%1ig|X})F* z7meYVF&L6k+laVXx@qjM5zrdwAp*ez(MAbAC1LG=OaLA|Fek!!RlZOqS5=;lK#YIE zsFvz$N+1})xq))AO+nQ_S3FTCQS(5leBy;v`7&fhm=CsdiAJCw5=rc%Ish7!ATgMF zrxG4d2%`u-hMp$&QcqL}gn5#Pl!Z3;)|LuifB29qckT?S_h!4z8^@3H;jLRE!{h47 zlU&%?7!Xg&r4uLk^udF{nowSxoMeBd(ctF(el^5^kB=T@>+q1Tld*{9?L6mPo}*!} z+*#XaZVa0{JAHM+WD_QBb~^kL6t9Fsn76sRI|!j#@kKFMmmV?a=!`ihVlBJYViMp6 zP{4%j6-#b=JtTz9W~YOC&-aUqWqe<{dl#`5DGJ0nzFkUI(D`Q(4tFR9!PUL@WZ1=gV+S- zvJABrfX}wKnF;QU3cu290`TMB9yc3}%7*7!Edb8sIcJiM+ak2HjOQmN$`Ddju2_qz z@|-bT$g+wM--)oNiiD5?$Xy^1(-Xiqv$JJZcz=5v6=5*|TS|zxG!2bli3goj33#PTPp-UnhB*4puT5|QL7fy8LD4^x0 oPXIigi4Lu;Tb>NyvsTOe2cC1u!oGH!zyJUM07*qoM6N<$f>wGa-2eap diff --git a/source/gx/images/CD_ready_off.png b/source/gx/images/CD_ready_off.png index f317cf9eae9d09115908b952dde11117baa9cc88..b13a8711a5c16615a0f43d787fdeda306854e367 100644 GIT binary patch delta 717 zcmV;;0y6!D2gL@EI|~Z%000W`0Ya=an2~5Mkw_wc0+~rfK~#90)t0|AD^V23KYPO{ zh;$~Si>xRVCe)O>`~lLSQcz%MRK`4`F$xsu{1~O4Ny=qX7?Vw;lo+Ftt=X7Sa9@$h zeQ#~z$5TA{&fJ-^XV3ZGbM8I&+zY_e)RYW`LQ)9P5Tm`lT~16)NC0hYY)q!pX_l6j z=N+nnER#(gB_4Sp%@fDuW%uy^BSzcadaBvV!2qBM;kBLMgK9ZlB z06;#UXK`^60T78qXf*Wn^Z-;6XhgKMv;fdl&*1+4o|TmqpT4cFjrH|)PEJlZJw5f6 z%l!O2mSvI6W_`Y+qoZWAS&GG??_XbEAEs%4vbMHHG#X`QW(KI#`|j>8hGAeBhR?6= z4wTDfG)+^Z3fFZh6becwgzyYa({LQ8Ca3GV9$xmPD>gPZJl*Hh2~;sK zFu?Tmv`5$7-AyKw0bp`+(sK?W$QQ&;c)n)P-^1C1OP5BE&y0v zUB$929v&VD27>_X?d^GN`}_Nqe13ioRLW#%Xvmj9b*G@R>i+^w2q7;oFV#d<{Pc?q zV0d`A(uH1LUOt!Z55n{FGXO$L$=%)Ee-7vC$mjC_1jfh5e;pnk($UdDXJ;ogfk5Ef z0mIZp3}bpMS=t~v8V_D00000NkvXXu0mjfXuVyp delta 781 zcmV+o1M>XE289QZI|~aE000XT0n*)m{E>1bkw`3m0@+DKK~#90)s{<0R8bhmf9Gbd zoT+8DiNZVC5JYAX1X1n0+Rlt1qKqC3$&rfe1xinfQbVJp+_kHPmPQgv(p1unSE#J< z3eiKa+nTEjrM?z3bH_<1&5inp!+Ct)cfbGtJnlIF94tF2-X%*#)3gOqyk4)A9ylNX zYWKc>Bhnr0ptAY~Yu2t~@#0KCKxE2VAgwKKO!jBuGocpJ+a|{LMdZG!nC01(mB|J-?(@-@Ykr2 zK1kc^fDwEaK9I zDsw0!f~PuL_VUF0tIn{Ta;1^+k?c7 zDLx~PlZG&~yEN zAcFPj1GU$x5n?t3O7`x@ljR|C$Z~wS*hAmZeQPK`QRyDQvcvn`I9*>&dBsT*2ePi_ zdgAv$fl)+Gj!s?eO27K4%;@%va_e7G9@xl>Yolu zDPFz%3L;!Of1DQ`?L>e6Aj{*8k-T#&#Xm29liLo4``j(GC4X(IfYuhwo{-yg*LB~l z1SoCMB6<0KXhs*!e7eX$*t%^S8Y2Au^=nq@=MrOMV*qF(!k5njb4=&|VfOX{pzYpw zgmV>#c-h&``1tr7)0!TmqoV|aK`vjp!mi@t*x*8YPJ28a_c{Fs`D`Gv%pmR~00000 LNkvXXu0mjf=NN!@ diff --git a/source/gx/images/CD_ready_on.png b/source/gx/images/CD_ready_on.png index e5b797ceb24e7bbe0c0e38645497cbb9f1f6a133..c4865963e1cb74a5d7726dbaf22b9cd10ab21106 100644 GIT binary patch delta 1825 zcmV++2j2MR3&IYNB#|@~e;{K>QcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e z7jKeZ#YO-C2FOW7K~#9!M3&31CRG*1e`}vpRo~-2`ek>6fQls8K!S-OB({Qv5Ov@q z@sao!_y;g^;)v)32TqJ3I&({Wa1z1EQ)G*YtNG|P`Nv5Q_q^mQGkhKzy015HWlY%d1iC`(M$d7;Qinn(5$ zq`ju~OF`?2X!&+uPlp<>vhx zH}bs6HHK9pw*<8we{I%A4qK<=)pLty>OuL7nuoi)+xw@_tefR$nSn^u4+cn(E@tqc zo&-7t>2#tTS2P7Xm#K>Zn1DWsiDr9f-g9GLFX+MOhB zXTbp?;atPW1Ovtc)be{$PLz`knq-v0-`=2X*ff(~O2_5NfAzOg_xb6Qn|p?@*X0IM z5URx5AqC8Z<3t&VNkAu}FGK>SB8CAP5uJ$Aqlw|+sDrSIvIuubBD_EnYJ$)%^Wiqm z`+1J6(#9Ezj)6H%Z8%>a=4iMIjl-%y0>X&H0RT@=jUZxVpcM=WGFS^B76)g)nP3NAJVI|(?3*pl8XUrXWH%ra z5Dxx@1X|hnJZYjo~j&xCBdhZVQe^5(V52UwY`KJ%@1BVcKH#2$UH2t}r zv~PGfP_Os+Ta~@_*Z`PkTrCc`5e9~VIT&mXR_Mxxs7|>Fnuzx7 ze}v(^HFfQ*UcLzpcoMqLNcSdaVfFe6{xn1aT@MI|O~3%;pzJR=ZVwsKjQ-34nu^pl zbdT?|c;bLRf9F@YdWKlye|NfvreixE26TW0Yy#F^G7)PC@EH4xxTPE#1Pg(SC;>I7 z!vGGJ6Y~f58O{!9*C=fzPRe-HHOHzEe{4ZlP#K3XR-os5%H}4EX+^KzB>oZ9zM#h& zx~KN&{?&2(qiZx@*ulPS#C^eL*uZL(y@)LXgCa+%y?iS`vT=~jAwhny#UB)PS!mu# zY@S_GheC5t%kavY<3AjNfdX{OXdj)UMohjoqkN^{4)(55e_BR$OJJSR|Lg?Ke-@~@ zMl3~l-wb=CrQdu2UvzBIV81Z*nAkkFrXCJ(q;1=b1)&HPCFSpTfAsV9vL8FLG@8bt zVCTu@r zbAy?P>~Jx$X&0y(-dA$d5-;~Of1jSR{O=L;+n)F^Mrm$F$xpAQzvUPxgt65pK*Y?c zdyaMz@;H-rLBgv|xBLfXw} zE-Hms2XUi<8`L1Ch0+c9(qS|YeoEXc@?P^LX8HzG-C?aY zzN~!^#*R(Y$YN8WOVZTZSUaJR%?%%_tO?O6qW5BL>b!(0BP>E85N&uQjKI`~BB|As zOd@L;igsj&LScxYmC1cmhcr($dheqIhzwMcNSpL;f2sbuzB~Nx7k>i)kR-sx%@ch9 P00000NkvXXu0mjfH*RYP delta 1472 zcmV;x1wZ=24(1DxBn<>}LP=Bz2nYy#2xN$nAsBxabVXQnLvm$dbZKvHAXI5>WdJcT zFEKbTF*19>y?6is03dWlSaefwW^{L9a%BKbVPkS{ZDnL>VIW3na%FdKa%*!SO<22; zDkJ~^1v*JYK~#90g_cdIUDXxGe{1c1-bbFvdoeL4MGe@ZiC`u50|h(m2OV@09M}pX z9Tk6^h|mtIgP- zW&&ldh@mLBoilykWPI@f7huDlND;T&=?Nh;t$L@~)8FwbC(4lrfR zFi8Z7s1yRbJp8@qTB)3vOa$iB;ds9S#yvjM}U;*b3BIt5KW9^X2RZi8VLo~Iv)+ZxoA1A4h2y{b0T-V9vPU34)q%(lpSXq3&wMq7 zNAK&@pMT8Ne{Hb-+9mFN<|iDv^9Ux!*{45bdwqvrz3@wx*Y*_;IEh5EgqnXC=0-B3 zwcOcS%j8l!b))s#=6`mm(L0i(7NwbzV&%)}eo)Dm4Bvtla&mwYMBjCh-J{U4UH ztV!g%=Y}L}8MQTL#`4Jp)_#9>U8f~1-dr)-8ewMK^wbfSPc8!R{TrKn|N0hnJ0w}+ z(CIY}onAu_>dz*uKl?SKG^E-WIPvn2`0C6>-hcE%RFnt*{s4=s3+$u;L9!xsB4Mo+ z0^aktfQT{q!hyt<7e^%ymF+htES`wesb+94x6A+7nuf~_j~`&)eT#o=pB-}fovZM6 z-gtO!%<$}(!RCm;*&$2!EwJ2HAVR${Vf*6&gN*^&3PB<(KVM<}ZEpN|IuSGPGbO;?u{(nQ_TjC8sjv{m+Nl$=CQ50 zwUe^Wk0rkT%Xa{z|7L%!u2W5Dv$E8w$z$HK-EL9o0+lRKd6ko>#4NuJ#Ef`$*{q*_ z91edR5fSVgxboWub7PVkbiYuaYpKu82rk|exbF8kY#M7gdVW6ugO?@@UK%qg!0c#Z z^H0M$a?MJ^D2-4FG^s5F5`%V-31~&-3q7AEK>Mhn07ZArvjpbx{H|-?cavdaDc++}9Qy}g;DGWYv zmQO)EmXq16j=6>vJ1_J|O_Qu&+w$|&g}pRo`s?H(%#FEvtjo~eICjagcb#yT5hsU( zELO>f|8%TjZ}D}_SnyIh{GVsH(|VoLOzho$rFih{AN43)C?+?8BqD-KX-fikJI8N6 aF8>47V6ftkCXm+v0000