Merge remote-tracking branch 'refs/remotes/ppy/master' into page-selector

osu.Android.props

@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputPath>bin\$(Configuration)</OutputPath>
     <WarningLevel>4</WarningLevel>
     <SchemaVersion>2.0</SchemaVersion>
@@ -35,7 +37,7 @@
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
     <ErrorReport>prompt</ErrorReport>
-	<EnableLLVM>true</EnableLLVM>
+    <EnableLLVM>true</EnableLLVM>
     <AndroidManagedSymbols>false</AndroidManagedSymbols>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>

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

@@ -26,12 +26,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load(AudioManager audio, SkinManager skinManager)
         {
             var dllStore = new DllResourceStore("osu.Game.Rulesets.Osu.Tests.dll");
 
             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);
+            defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
             specialSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
         }
 

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

@@ -6,23 +6,68 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing.Input;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
     public class TestSceneGameplayCursor : SkinnableTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(CursorTrail) };
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuCursorContainer),
+            typeof(CursorTrail)
+        };
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new OsuCursorContainer
+            SetContents(() => new MovingCursorInputManager
             {
-                RelativeSizeAxes = Axes.Both,
+                Child = new ClickingCursorContainer
-                Masking = true,
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                }
             });
         }
+
+        private class ClickingCursorContainer : OsuCursorContainer
+        {
+            protected override void Update()
+            {
+                base.Update();
+
+                double currentTime = Time.Current;
+
+                if (((int)(currentTime / 1000)) % 2 == 0)
+                    OnPressed(OsuAction.LeftButton);
+                else
+                    OnReleased(OsuAction.LeftButton);
+            }
+        }
+
+        private class MovingCursorInputManager : ManualInputManager
+        {
+            public MovingCursorInputManager()
+            {
+                UseParentInput = false;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                const double spin_duration = 5000;
+                double currentTime = Time.Current;
+
+                double angle = (currentTime % spin_duration) / spin_duration * 2 * Math.PI;
+                Vector2 rPos = new Vector2((float)Math.Cos(angle), (float)Math.Sin(angle));
+
+                MoveMouseTo(ToScreenSpace(DrawSize / 2 + DrawSize / 3 * rPos));
+            }
+        }
     }
 }

osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs

@@ -22,28 +22,14 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
     internal class CursorTrail : Drawable, IRequireHighFrequencyMousePosition
     {
-        private int currentIndex;
-
-        private IShader shader;
-        private Texture texture;
-
-        private Vector2 size => texture.Size * Scale;
-
-        private double timeOffset;
-
-        private float time;
-
-        public override bool IsPresent => true;
-
         private const int max_sprites = 2048;
 
         private readonly TrailPart[] parts = new TrailPart[max_sprites];
-
+        private int currentIndex;
-        private Vector2? lastPosition;
+        private IShader shader;
-
+        private Texture texture;
-        private readonly InputResampler resampler = new InputResampler();
+        private double timeOffset;
-
+        private float time;
-        protected override DrawNode CreateDrawNode() => new TrailDrawNode(this);
 
         public CursorTrail()
         {
@@ -60,8 +46,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             }
         }
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders, TextureStore textures)
         {
@@ -76,6 +60,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             resetTime();
         }
 
+        public override bool IsPresent => true;
+
         protected override void Update()
         {
             base.Update();
@@ -101,6 +87,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             timeOffset = Time.Current;
         }
 
+        private Vector2 size => texture.Size * Scale;
+
+        private Vector2? lastPosition;
+        private readonly InputResampler resampler = new InputResampler();
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             Vector2 pos = e.ScreenSpaceMousePosition;
@@ -127,21 +120,19 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 for (float d = interval; d < distance; d += interval)
                 {
                     lastPosition = pos1 + direction * d;
-                    addPosition(lastPosition.Value);
+
+                    parts[currentIndex].Position = lastPosition.Value;
+                    parts[currentIndex].Time = time;
+                    ++parts[currentIndex].InvalidationID;
+
+                    currentIndex = (currentIndex + 1) % max_sprites;
                 }
             }
 
             return base.OnMouseMove(e);
         }
 
-        private void addPosition(Vector2 pos)
+        protected override DrawNode CreateDrawNode() => new TrailDrawNode(this);
-        {
-            parts[currentIndex].Position = pos;
-            parts[currentIndex].Time = time;
-            ++parts[currentIndex].InvalidationID;
-
-            currentIndex = (currentIndex + 1) % max_sprites;
-        }
 
         private struct TrailPart
         {

osu.Game/Rulesets/Scoring/ScoreProcessor.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The current health.
         /// </summary>
-        public readonly BindableDouble Health = new BindableDouble { MinValue = 0, MaxValue = 1 };
+        public readonly BindableDouble Health = new BindableDouble(1) { MinValue = 0, MaxValue = 1 };
 
         /// <summary>
         /// The current combo.
@@ -233,6 +233,8 @@ namespace osu.Game.Rulesets.Scoring
             drawableRuleset.OnRevertResult += revertResult;
 
             ApplyBeatmap(drawableRuleset.Beatmap);
+
+            Reset(false);
             SimulateAutoplay(drawableRuleset.Beatmap);
             Reset(true);