Merge branch 'taiko_note_circle' into taiko_drawable_drawing

Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/BashCirclePiece.cs

@@ -16,6 +16,15 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
     {
         private Sprite icon;
 
+        protected override Framework.Graphics.Drawable CreateIcon()
+        {
+            return icon ?? (icon = new Sprite
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, TextureStore textures)
         {
@@ -23,14 +32,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
 
             icon.Texture = textures.Get(@"Play/Taiko/bash-hit-inner");
         }
-
-        protected override Framework.Graphics.Drawable CreateIcon()
-        {
-            return icon = new Sprite
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            };
-        }
     }
 }

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitCirclePiece.cs

@@ -15,12 +15,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
     /// </summary>
     public class CentreHitCirclePiece : CirclePiece
     {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            AccentColour = colours.PinkDarker;
-        }
-
         protected override Framework.Graphics.Drawable CreateIcon()
         {
             return new CircularContainer
@@ -39,5 +33,11 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
                 }
             };
         }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.PinkDarker;
+        }
     }
 }

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CirclePiece.cs

@@ -15,13 +15,13 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
     /// A circle piece which is used uniformly through osu!taiko to visualise hitobjects.
     /// <para>
     /// The body of this piece will overshoot it by Height/2 on both sides of its length, such that
-    /// a regular "circle" the result of setting Width to 0.
+    /// a regular "circle" is the result of setting Width to 0.
     /// </para>
     /// <para>
     /// Hitobjects that have a length need only to set Width and the extra corner radius will be added internally.
     /// </para>
     /// </summary>
-    public abstract class CirclePiece : ScrollingCirclePiece
+    public abstract class CirclePiece : ScrollingPiece
     {
         /// <summary>
         /// The colour of the inner circle and outer glows.
@@ -30,7 +30,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
 
         private bool kiaiMode;
         /// <summary>
-        /// Whether Kiai mode is active for this object.
+        /// Whether Kiai mode effects are enabled for this circle piece.
         /// </summary>
         public bool KiaiMode
         {
@@ -44,7 +44,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
             }
         }
 
-        public override Vector2 Size => new Vector2(base.Size.X, 128);
+        public override Vector2 Size => new Vector2(base.Size.X, TaikoHitObject.CIRCLE_RADIUS * 2);
 
         private readonly Container innerLayer;
         private readonly Container backingGlowContainer;

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/FinisherPiece.cs

@@ -11,9 +11,9 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
     /// Finisher hitobjects are 1.5x larger, while maintaining the same length.
     /// </para>
     /// </summary>
-    public class FinisherPiece : ScrollingCirclePiece
+    public class FinisherPiece : ScrollingPiece
     {
-        public FinisherPiece(ScrollingCirclePiece original)
+        public FinisherPiece(ScrollingPiece original)
         {
             // First we scale the note up
             Scale = new Vector2(1.5f);

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitCirclePiece.cs

@@ -16,12 +16,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
     /// </summary>
     public class RimHitCirclePiece : CirclePiece
     {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            AccentColour = colours.BlueDarker;
-        }
-
         protected override Framework.Graphics.Drawable CreateIcon()
         {
             return new CircularContainer
@@ -43,5 +37,11 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
                 }
             };
         }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.BlueDarker;
+        }
     }
 }

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/ScrollingPiece.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
     /// A scrolling circle piece must always have a centre-left origin due to how scroll position is calculated.
     /// </para>
     /// </summary>
-    public class ScrollingCirclePiece : Container
+    public class ScrollingPiece : Container
     {
         public override Anchor Origin => Anchor.CentreLeft;
     }

osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

@@ -63,7 +63,7 @@
     <Compile Include="Objects\Drawable\Pieces\DrumRollCirclePiece.cs" />
     <Compile Include="Objects\Drawable\Pieces\FinisherPiece.cs" />
     <Compile Include="Objects\Drawable\Pieces\RimHitCirclePiece.cs" />
-    <Compile Include="Objects\Drawable\Pieces\ScrollingCirclePiece.cs" />
+    <Compile Include="Objects\Drawable\Pieces\ScrollingPiece.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -94,7 +94,6 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.