From 876a357bf29eedd693804a3b6c75f3861f7aad6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 11 Jun 2021 13:55:38 +0200
Subject: [PATCH 1/3] Add support for animated colour fill in new style legacy
 health bar

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 9d3bafd0b1..d463df5f80 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -148,9 +148,9 @@ namespace osu.Game.Skinning
             }
         }
 
-        internal class LegacyOldStyleFill : LegacyHealthPiece
+        internal abstract class LegacyFill : LegacyHealthPiece
         {
-            public LegacyOldStyleFill(ISkin skin)
+            protected LegacyFill(ISkin skin)
             {
                 // required for sizing correctly..
                 var firstFrame = getTexture(skin, "colour-0");
@@ -166,23 +166,25 @@ namespace osu.Game.Skinning
                     Size = new Vector2(firstFrame.DisplayWidth, firstFrame.DisplayHeight);
                 }
 
-                Position = new Vector2(3, 10) * 1.6f;
                 Masking = true;
             }
         }
 
-        internal class LegacyNewStyleFill : LegacyHealthPiece
+        internal class LegacyOldStyleFill : LegacyFill
+        {
+            public LegacyOldStyleFill(ISkin skin)
+                : base(skin)
+            {
+                Position = new Vector2(3, 10) * 1.6f;
+            }
+        }
+
+        internal class LegacyNewStyleFill : LegacyFill
         {
             public LegacyNewStyleFill(ISkin skin)
+                : base(skin)
             {
-                InternalChild = new Sprite
-                {
-                    Texture = getTexture(skin, "colour"),
-                };
-
-                Size = InternalChild.Size;
                 Position = new Vector2(7.5f, 7.8f) * 1.6f;
-                Masking = true;
             }
 
             protected override void Update()

From 550d566bf979521e86a16d62db1eb630ee60aca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 11 Jun 2021 14:03:21 +0200
Subject: [PATCH 2/3] Simplify member access

---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index d463df5f80..1da80f6613 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Skinning
                 }
                 else
                 {
-                    InternalChild = skin.GetAnimation("scorebar-colour", true, true, startAtCurrentTime: false, applyConfigFrameRate: true) ?? Drawable.Empty();
+                    InternalChild = skin.GetAnimation("scorebar-colour", true, true, startAtCurrentTime: false, applyConfigFrameRate: true) ?? Empty();
                     Size = new Vector2(firstFrame.DisplayWidth, firstFrame.DisplayHeight);
                 }
 

From d3a255fd8113eafeaa6de763ac8bcb99a85d6e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 11 Jun 2021 14:21:54 +0200
Subject: [PATCH 3/3] Add animated assets for legacy health display test

---
 .../Resources/special-skin/scorebar-bg.png       | Bin 0 -> 250 bytes
 .../Resources/special-skin/scorebar-colour-0.png | Bin 0 -> 1285 bytes
 .../Resources/special-skin/scorebar-colour-1.png | Bin 0 -> 1288 bytes
 .../Resources/special-skin/scorebar-colour-2.png | Bin 0 -> 1287 bytes
 .../Resources/special-skin/scorebar-colour-3.png | Bin 0 -> 1286 bytes
 .../Resources/special-skin/scorebar-marker.png   | Bin 0 -> 126 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/special-skin/scorebar-bg.png
 create mode 100644 osu.Game.Tests/Resources/special-skin/scorebar-colour-0.png
 create mode 100644 osu.Game.Tests/Resources/special-skin/scorebar-colour-1.png
 create mode 100644 osu.Game.Tests/Resources/special-skin/scorebar-colour-2.png
 create mode 100644 osu.Game.Tests/Resources/special-skin/scorebar-colour-3.png
 create mode 100644 osu.Game.Tests/Resources/special-skin/scorebar-marker.png

diff --git a/osu.Game.Tests/Resources/special-skin/scorebar-bg.png b/osu.Game.Tests/Resources/special-skin/scorebar-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a25274ed8bb9a3a5ea2cfd01445141b5f774292
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0y~yU}6Wd)j8OJ<m^eWRe%&*lDE4HkOqRE&b#Y@6lZ})
zWHAGSo-znCRxGtI0}8U2c>21sKV{?Q5ip7re$fgPYWH+;45_&F_S!~X1_c4;jR%s>
zoJ$F)cW<6B!PaS33=>cZe(+&qTGQ{eO=}nqWIz7!efLTRhC&904rT@i83u+&3=9J7
m3=I|x3`ZCl6!>r(w2Ig9Ig`kdJJ$<9YCK*2T-G@yGywqnV>P1y

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/special-skin/scorebar-colour-0.png b/osu.Game.Tests/Resources/special-skin/scorebar-colour-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c15449b039fe44b372fdb9b538be1601f6655d6
GIT binary patch
literal 1285
zcmV+g1^W7lP)<h;3K|Lk000e1NJLTq00Hy>000vR1^@s6X5jw>00006VoOIv00000
z008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<pv833<U?-5Z3?z1d>Ta
zK~#9!?b*MN9n}@U@$WfzX5M@I<E_^#%wmINj3BaD34x$MAssa2A4rilEq@Udh>|jp
zl!++lkdTmLBrI@ZyvW9Dd;NaS%)RGO%mX7jL=i1IpX$zNW_0Jw`B4mn5JCtcgb+dq
zA%qY@2qA<JLI?psA_TwQn}2?1+LwN+fQTZZs4C!CE{`MYj{C572N6M3IXFB|J*qjr
zeS(PKI9*$~`0UgC<!^5>oo@5#C)fG-!+(J&*^JZ0lD1vpW)u-Xa1m4-Trm}PwkB*%
zD(a>tC8bJ<B*J*opyJe(vcJ2{V%c)-+HIEWj;bCrZpKVTW18`Zi%;xwVXt9-0+>^Z
zQ3+Hk{Nd6rvlg!3YB@X@adc&myEEtdac12sDv-@-t)~<L6cMN7LM{b&W4)N+eT%q}
z+Z9(YRlN9gjb%fUpqscAGn%9{NihdiVQ0H$+|-m(aEDP{0m8|=#SKzbp{m@Ux2!wE
zN?~`q#x2uzJ&RROUyMc*f|Jbvr?bq%)tV%UtC#n=aBjlExe<nQa@ta>kgCMixZ?2q
zgeEDe8cJu`6&BeLb?!fGS<G8z%a+ADqd?yqAAWL^+b2t^O0W!O1-BtFL|~I5h!1NA
zhMfuKPSPO;vbkuvTw~^JZ%rN-vOlh9bHIoFxy$e*QQ9t3HHqo&9*0jo$<6;B4-G&-
zrNTYo?)auHm^to_sDh;7LP?0$i0Ee5)lW^tvCX{#VyHG~)gVdHYK)43_rnG~gA@e8
zg&`iE!43TJIhTYKa5pdkD_H3%Vh9YmV1g!RKAY1t6{FEMM@KL6<(Jp!dP4;iq02p%
zGbsthGN+FgSTUy43E6tYg(QL|CHFm;ZE~?kD5R>PsYbMYOR=6hB}&PdD#<I{91)?I
z^ZM&AarDAv-hKb?h#G=Y%n%h4iq?tIXpAOdHan#hXFgxBe{KhH$5e4QUVHh7<KyqS
zbMJ&vGa=Q9ZoMRLzPE^SFx}zmv(F%anW5@jJUC!f3-@OWzW(+*4Clh$?oYX<D!3I&
z$$WeF0pMJ{{3MRC?mE7@b%$Gb?(_U}m$~uH|1c|?CZ;G*%vh~k#-j#R9rD<rsS<Cz
ze1$*0@*I~gOnK(;Jp0oLl|tL~%;qb)zL2djX&R<mHPvWBRSByHr%ZRo-1&Znsxn`#
z`QpYs?mbv?a=K*Q_n6sGA7$tfzDay5#&|qov0k#CFZt6Ouc88<ef}TTUB=uopzjK8
z*JC#H-BJux*xQ>jdo-u-GbpGibzPHGNlEC7(RT$9%%R|j>*gDP;HU^qqcpXG2<}eF
z&N>^V4EI(FRnj5vajY1nfMJ{38|r@ZR+z!49{QkT!+T_>;J8~6_q+f2=z|gi{WtK3
z|MrMN2qA?3r?>z5-o<}@^uc#O9&3aogb+eFd(22bKaPPOLI@$8K_wSrpob7b2xr_c
z|NX{54<UpQeg|TphY&&tXOP4|4<UpQ&b~fd4D=8}2;r<-wK)cQ2qA=U)>+|EL?MI_
vLI@#*5JCtcgb+dqA%qY@2qA<J!tc@#>+nqUV>8`c00000NkvXXu0mjfBN9_U

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/special-skin/scorebar-colour-1.png b/osu.Game.Tests/Resources/special-skin/scorebar-colour-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a444723ef4023391257479a66c443a3e593dd019
GIT binary patch
literal 1288
zcmV+j1^4=iP)<h;3K|Lk000e1NJLTq00Hy>000vR1^@s6X5jw>00006VoOIv00000
z008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<pv833?NM1#E<|01eHld
zK~#9!?b$nz9aR#*@qg9n?tAY%?sz=H%-SFs5WBJ%X$6A7S~i1Z_Y3S7AR*v0@If|N
z5fbtWksOdAA+5Z&#B(to%f@3fzR&JHr;4C2c(oZKK!fTRoo;ovPFL3>Xb2&M5JCtc
zgb+dqA%qY@2qA<J0)Rvae!18F{?@cF{Zs)FMMP0mz_DB&N7fzpVeJkgf~azEc%FJx
zbA0;*5y5e~ws7&8r})PkuQQ!)^U1XveDLnaAWAmlbg`suSGXBP1Q1*V6$e*Lg`KSl
zTa${qsYywxQX+{ko;0X9b*1d@ZnIdnT)%#s<+`J)$BdgXlhK%FJmTULyIk07*q;FA
zlwwo@l?s2lw9Bl88@E~x4@Mk4yT`qmbK^L(?iCft=CsyRiU5j;Q*t4fg1fO^%<#TN
z+{o>UE0-!>c&f&-AxY3p+=>}ZQktZggQ~EzT{CWKN-4O*sICCvWZvQisj5&_9?V<T
zonfW0yItd!>AIf9s;4hTqY1&uW`NUK=7-gqB#A4R_qlLx!oj%_hI4Y-Qmc@v#MZdt
z@ce`(DXAJtXW11N*${Oe{Lr$Px6GC;i*-hUzBk^z_6@gBmQ<Bs8O#c9Lt==)CPfe*
z)(#9i6U?2YLkwhd(Q>)Q%-P<WJT7E^T+!x$5BqbM;Yp&jU8ZUh)7?D||L`Q={P%ch
z00Jr%?g@9tH*LYpad$)&Bn=lzLbOIiH@mKWZX%9t?iCP2wLz-}Ns3luR1CZyHs~3o
zAP6oD@$d|8;E&I_B&2}5feBc_N>33(V8{g%G&%FxoTjN5jkY;DdV!lauhaF03MfLC
zdn{*C5{hL`A1$zAOs5mF^@s~e1WiirdobJNVvkTrRYOyaX#198J#|Wyk}*}1SGYMM
zLNVv+)jxCe$IJZlU+*Dm2ud+SR7faVCq|<&nuOWxlv14ee8K*?9mE||#oc)2#UqZ7
zzvu4#6GqL1R42OilDzreBFe#ZhbzxKjR0nbs&nz+fKe?xm@W9~yE_=pg}vRMb4^un
zE0mJ??%qSdxpMhQ9An*ee17XLx9&dR`R6Y4#n<0rRyIvcQJ|QyTDOcx4XQfiu|rcO
zUVZUd{_@guT)Hsj>BIBvPbX9gZPzoKuju+hw!)-om~PcnqX|_dtR9{+-5GQD`x&ar
ze6{A^U)<;Z!zCxDOV)jlnGN+(h92RY#J6IM#}gLoCF}W;zrOl1D)8xN|6$!_%pC*z
zuF!TpW<%dC#XyC<y(zOtbNW7mf{IetHA$6}guWPkR{+5r3XZsLz5xi1iqJGlQ!9wz
z?v(7Tvr)=$Z>3Nr9r7N>icty}wyC|L?l*6R8I0<o4>~ryM|KL1yA^T2_u>2Rlo;s0
zf`9wAM-)N`A^ev9_U4xtKYIV2J3k$3gd~IzLO6TONdJ2r13iQgLO6p;F2q0&A%qal
zxc~q68v{Lr5JLDJh=CqL2qBz75(7Pi5JEWn`fM@KLkJ;+vu@Sq80aB{5W-n!g+~#E
y5JCtcgb+dqA%qY@2qA<JLI@#*5JCvQOFshbDopgIMz-bv0000<MNUMnLSTYPXHv8P

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/special-skin/scorebar-colour-2.png b/osu.Game.Tests/Resources/special-skin/scorebar-colour-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c6b41d9bba3488a8f64c73b4ed19eeb221b7b5
GIT binary patch
literal 1287
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7P3v;jm$+QRmS%4H<lDE4HkOqRE&b#Y@6lZ})
zWHAGSo-znCRxGtI0}8U2c>21sKV{?Q;n6f@tTAC=V433S;uunK>+Mb3e%Ys@2R{C{
zJb&g+_4lXiu4|u3N<Jwu@kEj;OA}M8hsXt$_y&Ck@3ZX-9j8oj2y$EG(JrD{*we!5
z*CT$jBKO+&(zJQcWx94IxU_3rSoC@IJjt^?^DK+wx*7$XI22n@2?mdr2h*z`uYd3J
z`;xz?K%k3AD67orr-dnZ3+1o9Q&8&AVsC%G(%tlUxu1Zb%<^n*@%fdrw%@Cp{IX<r
zeO*<vzuh19j!9=NVs$cai{`lrGO~y}9z7@;oS2?{=-QG+d09b0tEPA;^{De|`NeAf
z-hEqVn(p=W_Y-%%Tk*>9aoU*_lVy_qJANF|6aOalO})W#sl-%=rHAD8-x_5<Joa|l
z;buYi@b5d!i}PgCukBsLbaT$NDlb6?!9p*+CqV_~*SaO|ZSRoY8C&=^=;&wv>k(!u
zoVz-s4HtWQO%^E*5G~u5eazQaleJvps;I)8GtqYxLPb}dYOXxJ%Xp1Q+4k%^MzPm7
zM|}NqG{Z#E;wDdl)#;k;QIk~)-=4A)Kj&*<VScE<&o4SlG-&D#sc@Nj^Dn5VhC090
z*?mY!deOP&_fcY>r`_C?y78RGh407O=ihsD?&PFZLORWn2Xj4m1aB<icy#zyV`6&K
z&dDVmjX8Qzde>)I-j1Gpy!B1L_AQwYiS_S{Y&@rIJ00Siv}^bAhr#|uuj`LHGYbT)
zEb!l9y)TnHt#7yTDuv7)0YZyRm3G}M{hBOXm{YvIL1Gnel&MG17OBNa5B_d&Jg>m&
zSdiG!o?gIQUvo}Xk@XI*&jGHmsxAp8XT2E<PR>04%*6L-#+I`eFMh81_p@}@y#Pkn
z7e)O~eY~7Do_V>LHLT}liPJW@LdDJno+oSh(`LuK5#(B#m9a`N_kPft<$j$(M$5cD
zahbcjXgu5V>lL@m--lf9_x=}L)V4sx*rl~)QE8Hi)MC#WXZ<vf&O9&vX8vu*JBFcm
zdc)&v9{u<c{qCN9;uRl{(nZnwCuhIcT_odEzT?}OR2Bo{kh$IL>^)fz59S=49$(-5
zFy_YXzlPUCShqWA&RqZAmSs+M_`D;A*J6*0Z+~C(`yKPV>Tg`;`+wP|rCvTF!rCRd
zy7Y9#l?AJu<*ZFYA8i$1|7rR3c~393YEI`rzuA6nfaaFi^Evw#z2?5jHF;U$uF&9K
zwUDVBswz&Eq@TH)pT0ut^VM1P_xGIt+wSe>H+{`-Ib-Qpi+OAhnRn(NmFQR3x#oTC
zvub_a+tiQ;o9q8hFP&~!&huio)9tS_cx$(dFpGZsw(N}D*_Xe0xU{@tud9Rx3H?g?
z63fU^tYPtJ*H1PD3oWP18op~4nsx_o+I-GU^YGrOPE$)xRLf|)X(rrQ_N{H#{XL>-
z2CLfbUflQ~cT>~iUD%Po_wL*MTX4kTzvv(P_0=xG40|a5rT+W4eLueU+y8jhp4>YD
zl!w#%C0{N-Zg{~Nn5B(ZJaOXr0u+4M^ZV!i`w}len%+A=gm@-F_&2YocQ?ubOMp40
stIdu(@B`JHv(mQd(m*Q_VB8<EzvOHyy}#^YZv&TTp00i_>zopr0M~s-fB*mh

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/special-skin/scorebar-colour-3.png b/osu.Game.Tests/Resources/special-skin/scorebar-colour-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a5ca4716d3898929332a54b631ee604c017390
GIT binary patch
literal 1286
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7P3v;jm$+QRmS%4H<lDE4HkOqRE&b#Y@6lZ})
zWHAGSo-znCRxGtI0}8U2c>21sKV{?Q;W1RpeUik$z%tp>#WAGf*4vx5{jyI*4}AP@
zdH&3u>hDk2UDrO7)SS}85V@wMXMuyFtjQDZB@36FJ^mngNvDP;vuCHvLq1MU$!MlV
z;m59KakIbH&Yk((QvGO5!4$qgm+o`xtI|x2tDc>y)MRtwP;3!EB^VS0o8sTUwf~!X
zYkJ+Ph7P4gE3_U&==m$X?)$x=j9t(%#L~jX-*%PdzUroq2Nto>JAVAx{O9N2@)>^H
zcmBKSYxna-uz>39!d(%UwrSt#QDWlIYwBv&UUul*wU)J>u6M62SrVc-(M7^vDrC;C
zpl{{dBXy$l?(8^SbT{y7^0BisPG<NR%N2fH8LRik^o>75v6rD%qgU&6{kKNh51-AQ
zcDPy4J^b4a`{F#g^lN(;G2NVVt;$Q#L9ozE?@3UB`L%Azd)qstcg7Ze4LYiQ{#t~Y
z3g@oQXv4*xUXw+N14PTVWgqkP)nqM~xGJhJ=S=h+g;3E|rw&)1-etT-q-=Zk9i!Om
zn<Kt{IhtXjXmOLL!0Pm$Em4zI3cr4`6F=u`VPSr#z|Su_OEhTe4XJRMdGjx*sD?Vf
z)Y*MVNqW(_!}FuWK2N*3DRtvHjSJt8xzE4*?A^&ptAuo#BM;_!@Ce>m!tv<vt;WRk
zrk#^ZIvR8IqV%rMu)G~TS-tg*zt%084~g~fjBGroY&#v|o3v~9@rTC##lPc^J2MLe
ztSs=~VZAStJFRcG@+yVQ9RWg%OqF)sEdA;&T$oe5zCmIYZ<MJ=&=#r1Ne}*Ra6GTT
z>R6E2(VkwwTwiofRgv`$ug?Llu&OQzCTG1F3r@~F|IEbqXvUVa7cXkx*;U%S&OF3H
zaMzt=%gK`hbc%mfG>Rr$&7H8;J;p;RBdF+p^G!AJ>K3O}QnRvLZf_TPy)t;wl%AE7
z_8dAZDA;A0zwf7(yMFAm_4U847qu-AF?MNfSyY;2BDL6a##ukjqchKoznOpA@s45W
zonG^GvV}E&l)uZ(G00L|Vs&xt^e1P(iv{v6vyQ3#XUSq<95T0?oxLaP;lrGR+wcEx
zco=iz_FvWOA*|b-G-tklZ_hMm_4N7246nr=zh3^X@cBLGxSEGX_iMiApE<RxQ<F=?
zIPCSbk1HHQ+il7+Rvn4HzV1W&^|%L@S~bth&P%ViS{RhEd*00&*X!b&MAdu`m#khU
z<-0;F@#~8zFVD@Wwm%mT`fRmneBI{;_Wo&e=IBL!w@ov<;x1X$k}q_>%TUfgV$Jk5
z&%OWsxb}L*f#>lxM|Yi`Va@g>cH!HqGj02#yBfKwtAo?}pMR-kV-;PxE_;%eCTFeT
zuXPMfmLf8RcWamhWJDKcPFWTvaPY3?&B*k{Qy$*)TIgl<#I{d#v4}xVaJBQ@{Cix+
z5?7t&OL8ju--yVRYd@;{FE3vok+k4HTb*pb1~9+=sIU6o{9W(g=g0i@KYm6is{k|c
zp_|EWzurHVcmZNdh7>8XRRQyM!Lh&Z_uq#IzIWjH0?g|Vc_u;lH?OC6H_8Ds|D4j*
tX2%`)ff~<QY1{OHY``oQfVRf|;<wxE{pEe3?OITA=IQF^vd$@?2>@23MQ{KB

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/special-skin/scorebar-marker.png b/osu.Game.Tests/Resources/special-skin/scorebar-marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5af0b2148832b745caf04c4e2b5103efa43c913
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}blwj^(N7a$D;Kb?2i11Zh|kH}&M
z20djEW~^9hUj`IpFY)wsWq-=X%_F6M;8)Hypb)pGi(?4K_2dKwCI$vp2F6Efth0f_
N44$rjF6*2UngDK&89D#}

literal 0
HcmV?d00001