Merge branch 'general-slider-improvements' into editor-hitobject-overlays

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -7,9 +7,11 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Framework.Graphics.Primitives;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
@@ -88,6 +90,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.SnakingInSliders, Body.SnakingIn);
+            config.BindWith(OsuSetting.SnakingOutSliders, Body.SnakingOut);
+        }
+
         private int currentSpan;
         public bool Tracking;
 

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs

@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Configuration;
 using OpenTK;
 using OpenTK.Graphics.ES30;
 using OpenTK.Graphics;
@@ -30,6 +29,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             set { path.PathWidth = value; }
         }
 
+        public readonly Bindable<bool> SnakingIn = new Bindable<bool>();
+        public readonly Bindable<bool> SnakingOut = new Bindable<bool>();
+
         public double? SnakedStart { get; private set; }
         public double? SnakedEnd { get; private set; }
 
@@ -51,6 +53,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
+        private Color4 borderColour = Color4.White;
+        /// <summary>
+        /// Used to colour the path border.
+        /// </summary>
+        public new Color4 BorderColour
+        {
+            get { return borderColour; }
+            set
+            {
+                if (borderColour == value)
+                    return;
+                borderColour = value;
+
+                if (LoadState == LoadState.Ready)
+                    Schedule(reloadTexture);
+            }
+        }
+
         public Quad PathDrawQuad => container.ScreenSpaceDrawQuad;
 
         private int textureWidth => (int)PathWidth * 2;
@@ -97,15 +117,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
-        private Bindable<bool> snakingIn;
-        private Bindable<bool> snakingOut;
-
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load()
         {
-            snakingIn = config.GetBindable<bool>(OsuSetting.SnakingInSliders);
-            snakingOut = config.GetBindable<bool>(OsuSetting.SnakingOutSliders);
-
             reloadTexture();
         }
 
@@ -130,10 +144,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
                 if (progress <= border_portion)
                 {
-                    bytes[i * 4] = 255;
+                    bytes[i * 4] = (byte)(BorderColour.R * 255);
-                    bytes[i * 4 + 1] = 255;
+                    bytes[i * 4 + 1] = (byte)(BorderColour.G * 255);
-                    bytes[i * 4 + 2] = 255;
+                    bytes[i * 4 + 2] = (byte)(BorderColour.B * 255);
-                    bytes[i * 4 + 3] = (byte)(Math.Min(progress / aa_portion, 1) * 255);
+                    bytes[i * 4 + 3] = (byte)(Math.Min(progress / aa_portion, 1) * (BorderColour.A * 255));
                 }
                 else
                 {
@@ -170,18 +184,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         public void UpdateProgress(double progress, int span)
         {
             double start = 0;
-            double end = snakingIn ? MathHelper.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / slider.TimeFadein, 0, 1) : 1;
+            double end = SnakingIn ? MathHelper.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / slider.TimeFadein, 0, 1) : 1;
 
             if (span >= slider.SpanCount() - 1)
             {
                 if (Math.Min(span, slider.SpanCount() - 1) % 2 == 1)
                 {
                     start = 0;
-                    end = snakingOut ? progress : 1;
+                    end = SnakingOut ? progress : 1;
                 }
                 else
                 {
-                    start = snakingOut ? progress : 0;
+                    start = SnakingOut ? progress : 0;
                 }
             }
 

osu.Game/Online/API/APIAccess.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Threading;
-using osu.Framework;
 using osu.Framework.Configuration;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
@@ -16,7 +15,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
-    public class APIAccess : IUpdateable
+    public class APIAccess : IAPIProvider
     {
         private readonly OAuth authentication;
 
@@ -34,7 +33,7 @@ namespace osu.Game.Online.API
 
         public string Password;
 
-        public Bindable<User> LocalUser = new Bindable<User>(createGuestUser());
+        public Bindable<User> LocalUser { get; } = new Bindable<User>(createGuestUser());
 
         public string Token
         {

osu.Game/Online/API/DummyAPIAccess.cs

@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API
+{
+    public class DummyAPIAccess : IAPIProvider
+    {
+        public Bindable<User> LocalUser { get; } = new Bindable<User>(new User
+        {
+            Username = @"Dummy",
+            Id = 1,
+        });
+
+        public bool IsLoggedIn => true;
+
+        public void Update()
+        {
+        }
+
+        public virtual void Queue(APIRequest request)
+        {
+        }
+
+        public void Register(IOnlineComponent component)
+        {
+        }
+    }
+}

osu.Game/Online/API/IAPIProvider.cs

@@ -0,0 +1,34 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework;
+using osu.Framework.Configuration;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API
+{
+    public interface IAPIProvider : IUpdateable
+    {
+        /// <summary>
+        /// The local user.
+        /// </summary>
+        Bindable<User> LocalUser { get; }
+
+        /// <summary>
+        /// Returns whether the local user is logged in.
+        /// </summary>
+        bool IsLoggedIn { get; }
+
+        /// <summary>
+        /// Queue a new request.
+        /// </summary>
+        /// <param name="request">The request to perform.</param>
+        void Queue(APIRequest request);
+
+        /// <summary>
+        /// Register a component to receive state changes.
+        /// </summary>
+        /// <param name="component">The component to register.</param>
+        void Register(IOnlineComponent component);
+    }
+}

osu.Game/OsuGameBase.cs

@@ -108,6 +108,7 @@ namespace osu.Game
                 Username = LocalConfig.Get<string>(OsuSetting.Username),
                 Token = LocalConfig.Get<string>(OsuSetting.Token)
             });
+            dependencies.CacheAs<IAPIProvider>(API);
 
             dependencies.Cache(RulesetStore = new RulesetStore(contextFactory));
             dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage));

osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
             this.capturedObjects = capturedObjects;
 
             Masking = true;
-            BorderThickness = 3;
+            BorderThickness = SelectionBox.BORDER_RADIUS;
 
             InternalChild = new Box
             {

osu.Game/Rulesets/Edit/Layers/Selection/SelectionBox.cs

@@ -14,32 +14,21 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
     /// </summary>
     public class SelectionBox : VisibilityContainer
     {
+        public const float BORDER_RADIUS = 2;
+
         /// <summary>
         /// Creates a new <see cref="SelectionBox"/>.
         /// </summary>
         public SelectionBox()
         {
-            InternalChildren = new Drawable[]
+            Masking = true;
-            {
+            BorderColour = Color4.White;
-                new Container
+            BorderThickness = BORDER_RADIUS;
-                {
+
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding(-1),
-                    Child = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        BorderColour = Color4.White,
-                        BorderThickness = 2,
-                        MaskingSmoothness = 1,
             Child = new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                            Alpha = 0.1f,
+                Alpha = 0.1f
-                            AlwaysPresent = true
-                        },
-                    }
-                }
             };
         }
 

osu.Game/osu.Game.csproj

@@ -290,6 +290,8 @@
     <Compile Include="IO\Archives\ArchiveReader.cs" />
     <Compile Include="IO\Archives\LegacyFilesystemReader.cs" />
     <Compile Include="IO\Archives\ZipArchiveReader.cs" />
+    <Compile Include="Online\API\DummyAPIAccess.cs" />
+    <Compile Include="Online\API\IAPIProvider.cs" />
     <Compile Include="Online\API\APIDownloadRequest.cs" />
     <Compile Include="Online\API\Requests\GetUserRequest.cs" />
     <Compile Include="Migrations\20180125143340_Settings.cs" />