Merge branch 'master' into update-framework-blending

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.Linq;
+using System.Text.RegularExpressions;
 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");
-            defaultSkin = getSkinFromResources(skins, "default_skin");
-            specialSkin = getSkinFromResources(skins, "special_skin");
+            metricsSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
+            defaultSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/default_skin"), audio, false);
+            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);
-                Directory.CreateDirectory(tempName);
+            public override Texture GetTexture(string componentName)
+            {
+                // 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)
-                    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);
+                return base.GetTexture(componentName);
             }
         }
     }

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

@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneDrawableJudgement : SkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableJudgement),
+            typeof(DrawableOsuJudgement)
+        };
+
+        public TestSceneDrawableJudgement()
+        {
+            foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
+                AddStep("Show " + result.GetDescription(), () => SetContents(() =>
+                    new DrawableOsuJudgement(new JudgementResult(null) { Type = result }, null)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }));
+        }
+    }
+}

osu.Game/Screens/Menu/IntroScreen.cs

@@ -28,11 +28,18 @@ namespace osu.Game.Screens.Menu
 
         private Bindable<bool> menuVoice;
 
+        private LeasedBindable<WorkingBeatmap> beatmap;
+
+        public new Bindable<WorkingBeatmap> Beatmap => beatmap;
+
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
         {
+            // prevent user from changing beatmap while the intro is still runnning.
+            beatmap = base.Beatmap.BeginLease(false);
+
             menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             seeya = audio.Samples.Get(@"seeya");
         }
@@ -107,6 +114,8 @@ namespace osu.Game.Screens.Menu
 
         protected void LoadMenu()
         {
+            beatmap.Return();
+
             DidLoadMenu = true;
             this.Push(mainMenu);
         }

osu.Game/Skinning/LegacySkin.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -11,6 +11,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -76,8 +77,13 @@ namespace osu.Game.Skinning
             Samples?.Dispose();
         }
 
+        private const double default_frame_time = 1000 / 60d;
+
         public override Drawable GetDrawableComponent(string componentName)
         {
+            bool animatable = false;
+            bool looping = true;
+
             switch (componentName)
             {
                 case "Play/osu/cursor":
@@ -98,20 +104,32 @@ namespace osu.Game.Skinning
 
                     return null;
 
+                case "Play/osu/sliderfollowcircle":
+                    animatable = true;
+                    break;
+
                 case "Play/Miss":
                     componentName = "hit0";
+                    animatable = true;
+                    looping = false;
                     break;
 
                 case "Play/Meh":
                     componentName = "hit50";
+                    animatable = true;
+                    looping = false;
                     break;
 
                 case "Play/Good":
                     componentName = "hit100";
+                    animatable = true;
+                    looping = false;
                     break;
 
                 case "Play/Great":
                     componentName = "hit300";
+                    animatable = true;
+                    looping = false;
                     break;
 
                 case "Play/osu/number-text":
@@ -125,15 +143,42 @@ namespace osu.Game.Skinning
                         };
             }
 
-            // temporary allowance is given for skins the fact that stable handles non-animatable items such as hitcircles (incorrectly)
-            // by (incorrectly) displaying the first frame of animation rather than the non-animated version.
-            // users have used this to "hide" certain elements like hit300.
-            var texture = GetTexture($"{componentName}-0") ?? GetTexture(componentName);
+            return getAnimation(componentName, animatable, looping);
+        }
 
-            if (texture == null)
-                return null;
+        private Drawable getAnimation(string componentName, bool animatable, bool looping, string animationSeparator = "-")
+        {
+            Texture texture;
 
-            return new Sprite { Texture = texture };
+            Texture getFrameTexture(int frame) => GetTexture($"{componentName}{animationSeparator}{frame}");
+
+            TextureAnimation animation = null;
+
+            if (animatable)
+            {
+                for (int i = 0;; i++)
+                {
+                    if ((texture = getFrameTexture(i)) == null)
+                        break;
+
+                    if (animation == null)
+                        animation = new TextureAnimation
+                        {
+                            DefaultFrameLength = default_frame_time,
+                            Repeat = looping
+                        };
+
+                    animation.AddFrame(texture);
+                }
+            }
+
+            if (animation != null)
+                return animation;
+
+            if ((texture = GetTexture(componentName)) != null)
+                return new Sprite { Texture = texture };
+
+            return null;
         }
 
         public class LegacySliderBall : Sprite