Merge branch 'taiko_hitobject_drawable' into use_more_accentcolour

osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs

@@ -1,39 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transforms;
-using OpenTK;
-
-namespace osu.Game.Modes.Taiko.Objects.Drawable
-{
-    internal class DrawableTaikoHit : Sprite
-    {
-        private readonly TaikoHitObject h;
-
-        public DrawableTaikoHit(TaikoHitObject h)
-        {
-            this.h = h;
-
-            Origin = Anchor.Centre;
-            Scale = new Vector2(0.2f);
-            RelativePositionAxes = Axes.Both;
-            Position = new Vector2(1.1f, 0.5f);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            Texture = textures.Get(@"Menu/logo");
-
-            const double duration = 0;
-
-            Transforms.Add(new TransformPositionX { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = 1.1f, EndValue = 0.1f });
-            Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });
-            Expire(true);
-        }
-    }
-}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs

@@ -0,0 +1,46 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable
+{
+    public abstract class DrawableTaikoHitObject : DrawableHitObject<TaikoHitObject, TaikoJudgementInfo>
+    {
+        protected DrawableTaikoHitObject(TaikoHitObject hitObject)
+            : base(hitObject)
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.Centre;
+
+            RelativePositionAxes = Axes.X;
+        }
+
+        protected override void LoadComplete()
+        {
+            LifetimeStart = HitObject.StartTime - HitObject.PreEmpt * 2;
+            LifetimeEnd = HitObject.StartTime + HitObject.PreEmpt;
+
+            base.LoadComplete();
+        }
+
+        protected override TaikoJudgementInfo CreateJudgementInfo() => new TaikoJudgementInfo();
+
+        /// <summary>
+        /// Sets the scroll position of the DrawableHitObject relative to the offset between
+        /// a time value and the HitObject's StartTime.
+        /// </summary>
+        /// <param name="time"></param>
+        protected virtual void UpdateScrollPosition(double time)
+        {
+            MoveToX((float)((HitObject.StartTime - time) / HitObject.PreEmpt));
+        }
+
+        protected override void Update()
+        {
+            UpdateScrollPosition(Time.Current);
+        }
+    }
+}

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

@@ -51,11 +51,11 @@
     <Compile Include="Beatmaps\TaikoBeatmapProcessor.cs" />
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
     <Compile Include="Judgements\TaikoHitResult.cs" />
+    <Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
     <Compile Include="Objects\Bash.cs" />
     <Compile Include="Objects\DrumRoll.cs" />
     <Compile Include="Objects\DrumRollTick.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
-    <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TaikoScoreProcessor.cs" />

osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs

@@ -11,6 +11,7 @@
 using osu.Game.Modes.Judgements;
 using Container = osu.Framework.Graphics.Containers.Container;
 using osu.Game.Modes.Objects.Types;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Objects.Drawables
 {
@@ -76,6 +77,11 @@ public abstract class DrawableHitObject<TObject, TJudgement> : DrawableHitObject
 
         public TObject HitObject;
 
+        /// <summary>
+        /// The colour used for various elements of this DrawableHitObject.
+        /// </summary>
+        public Color4 AccentColour { get; protected set; }
+
         protected DrawableHitObject(TObject hitObject)
         {
             HitObject = hitObject;