Merge branch 'animated-legacy-skins' into animated-slider-ball

osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs

@@ -2,12 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
+using System.Text.RegularExpressions;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
@@ -28,11 +28,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            var skins = new SkinManager(LocalStorage, ContextFactory, null, audio);
+            var dllStore = new DllResourceStore("osu.Game.Rulesets.Osu.Tests.dll");
 
-            metricsSkin = getSkinFromResources(skins, "metrics_skin");
+            metricsSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
-            defaultSkin = getSkinFromResources(skins, "default_skin");
+            defaultSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/default_skin"), audio, false);
-            specialSkin = getSkinFromResources(skins, "special_skin");
+            specialSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
         }
 
         public void SetContents(Func<Drawable> creationFunction)
@@ -43,23 +43,28 @@ namespace osu.Game.Rulesets.Osu.Tests
             Cell(3).Child = new LocalSkinOverrideContainer(specialSkin) { RelativeSizeAxes = Axes.Both }.WithChild(creationFunction());
         }
 
-        private static Skin getSkinFromResources(SkinManager skins, string name)
+        private class TestLegacySkin : LegacySkin
         {
-            using (var storage = new DllResourceStore("osu.Game.Rulesets.Osu.Tests.dll"))
+            private readonly bool extrapolateAnimations;
+
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
+                : base(skin, storage, audioManager, "skin.ini")
             {
-                var tempName = Path.GetTempFileName();
+                this.extrapolateAnimations = extrapolateAnimations;
+            }
 
-                File.Delete(tempName);
+            public override Texture GetTexture(string componentName)
-                Directory.CreateDirectory(tempName);
+            {
+                // extrapolate frames to test longer animations
+                if (extrapolateAnimations)
+                {
+                    var match = Regex.Match(componentName, "-([0-9]*)");
 
-                var files = storage.GetAvailableResources().Where(f => f.StartsWith($"Resources/{name}"));
+                    if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"));
+                }
 
-                foreach (var file in files)
+                return base.GetTexture(componentName);
-                    using (var stream = storage.GetStream(file))
-                    using (var newFile = File.Create(Path.Combine(tempName, Path.GetFileName(file))))
-                        stream.CopyTo(newFile);
-
-                return skins.GetSkin(skins.Import(tempName).Result);
             }
         }
     }

osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -21,19 +22,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         public TestSceneDrawableJudgement()
         {
-            foreach (HitResult result in Enum.GetValues(typeof(HitResult)))
+            foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
-            {
+                AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                JudgementResult judgement = new JudgementResult(null)
+                    new DrawableOsuJudgement(new JudgementResult(null) { Type = result }, null)
-                {
+                    {
-                    Type = result,
+                        Anchor = Anchor.Centre,
-                };
+                        Origin = Anchor.Centre,
-
+                    }));
-                AddStep("Show " + result.GetDescription(), () => SetContents(() => new DrawableOsuJudgement(judgement, null)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                }));
-            }
         }
     }
 }

osu.Game/Skinning/LegacySkin.cs

@@ -164,22 +164,33 @@ namespace osu.Game.Skinning
 
             Texture getFrameTexture(int frame) => GetTexture($"{componentName}{animationSeparator}{frame}");
 
-            if (animatable && (texture = getFrameTexture(0)) != null)
+            TextureAnimation animation = null;
+
+            if (animatable)
             {
-                var animation = new TextureAnimation { DefaultFrameLength = default_frame_time };
+                for (int i = 0;; i++)
-
-                for (int i = 1; texture != null; i++)
                 {
+                    if ((texture = getFrameTexture(i)) == null)
+                        break;
+
+                    if (animation == null)
+                        animation = new TextureAnimation
+                        {
+                            DefaultFrameLength = default_frame_time,
+                            Repeat = looping
+                        };
+
                     animation.AddFrame(texture);
-                    texture = getFrameTexture(i);
                 }
-
-                animation.Repeat = looping;
-
-                return animation;
             }
 
-            return (texture = GetTexture(componentName)) == null ? null : new Sprite { Texture = texture };
+            if (animation != null)
+                return animation;
+
+            if ((texture = GetTexture(componentName)) != null)
+                return new Sprite { Texture = texture };
+
+            return null;
         }
 
         public override Texture GetTexture(string componentName)