From 7eab50b989cca6faa2bb0a696871d254b3ca1eed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Jan 2017 16:01:53 +0800
Subject: [PATCH] Add basic HP display support.

---
 osu.Game/Modes/Score.cs           |  1 +
 osu.Game/Modes/ScoreProcesssor.cs |  5 +++-
 osu.Game/Modes/UI/HPDisplay.cs    | 42 +++++++++++++++++++++++++++++++
 osu.Game/Modes/UI/ScoreOverlay.cs | 11 ++++++++
 osu.Game/osu.Game.csproj          |  3 ++-
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Modes/UI/HPDisplay.cs

diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index ee90a9a0f9..b5dcf63028 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -15,5 +15,6 @@ namespace osu.Game.Modes
         public double Accuracy { get; set; }
         public double Combo { get; set; }
         public double MaxCombo { get; set; }
+        public double Health { get; set; }
     }
 }
diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcesssor.cs
index a34915eaef..b90e24a0ff 100644
--- a/osu.Game/Modes/ScoreProcesssor.cs
+++ b/osu.Game/Modes/ScoreProcesssor.cs
@@ -18,13 +18,16 @@ namespace osu.Game.Modes
             TotalScore = TotalScore,
             Combo = Combo,
             MaxCombo = HighestCombo,
-            Accuracy = Accuracy
+            Accuracy = Accuracy,
+            Health = Health,
         };
 
         public readonly BindableDouble TotalScore = new BindableDouble { MinValue = 0 };
 
         public readonly BindableDouble Accuracy = new BindableDouble { MinValue = 0, MaxValue = 1 };
 
+        public readonly BindableDouble Health = new BindableDouble { MinValue = 0, MaxValue = 1 };
+
         public readonly BindableInt Combo = new BindableInt();
 
         public readonly BindableInt HighestCombo = new BindableInt();
diff --git a/osu.Game/Modes/UI/HPDisplay.cs b/osu.Game/Modes/UI/HPDisplay.cs
new file mode 100644
index 0000000000..4cf42f0eb8
--- /dev/null
+++ b/osu.Game/Modes/UI/HPDisplay.cs
@@ -0,0 +1,42 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transformations;
+using System;
+
+namespace osu.Game.Modes.UI
+{
+    public class HPDisplay : Container
+    {
+        private Box background;
+        private Box fill;
+
+        public HPDisplay()
+        {
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Gray,
+                },
+                fill = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.White,
+                }, 
+            };
+        }
+
+        public double Current;
+
+        public void Set(double value)
+        {
+            Current = value;
+            fill.ScaleTo(new Vector2((float)Current, 1), 200, EasingTypes.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Modes/UI/ScoreOverlay.cs b/osu.Game/Modes/UI/ScoreOverlay.cs
index c7441483f8..95d74edba5 100644
--- a/osu.Game/Modes/UI/ScoreOverlay.cs
+++ b/osu.Game/Modes/UI/ScoreOverlay.cs
@@ -6,6 +6,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Modes.Objects;
+using OpenTK;
+using osu.Framework.Graphics.Primitives;
 
 namespace osu.Game.Modes.UI
 {
@@ -15,12 +17,19 @@ namespace osu.Game.Modes.UI
         public ComboCounter ComboCounter;
         public ScoreCounter ScoreCounter;
         public PercentageCounter AccuracyCounter;
+        public HPDisplay HPDisplay;
         public Score Score { get; set; }
 
         protected abstract KeyCounterCollection CreateKeyCounter();
         protected abstract ComboCounter CreateComboCounter();
         protected abstract PercentageCounter CreateAccuracyCounter();
         protected abstract ScoreCounter CreateScoreCounter();
+        protected virtual HPDisplay CreateHPDisplay() => new HPDisplay
+        {
+            Size = new Vector2(0.5f, 20),
+            RelativeSizeAxes = Axes.X,
+            Padding = new MarginPadding(5)
+        };
 
         public virtual void OnHit(HitObject h)
         {
@@ -44,6 +53,7 @@ namespace osu.Game.Modes.UI
                 ComboCounter = CreateComboCounter(),
                 ScoreCounter = CreateScoreCounter(),
                 AccuracyCounter = CreateAccuracyCounter(),
+                HPDisplay = CreateHPDisplay(),
             };
         }
 
@@ -53,6 +63,7 @@ namespace osu.Game.Modes.UI
             processor.TotalScore.ValueChanged += delegate { ScoreCounter?.Set((ulong)processor.TotalScore.Value); };
             processor.Accuracy.ValueChanged += delegate { AccuracyCounter?.Set((float)processor.Accuracy.Value); };
             processor.Combo.ValueChanged += delegate { ComboCounter?.Set((ulong)processor.Combo.Value); };
+            processor.Health.ValueChanged += delegate { HPDisplay?.Set((ulong)processor.Combo.Value); };
         }
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a15cd5db7d..3d3823626f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Modes\Objects\HitObjectParser.cs" />
     <Compile Include="Modes\Score.cs" />
     <Compile Include="Modes\ScoreProcesssor.cs" />
+    <Compile Include="Modes\UI\HPDisplay.cs" />
     <Compile Include="Online\API\IOnlineComponent.cs" />
     <Compile Include="Online\API\Requests\GetUserRequest.cs" />
     <Compile Include="Overlays\DragBar.cs" />
@@ -259,4 +260,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file