diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
index 774d1e00d3..be313efed3 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
@@ -29,7 +29,6 @@ namespace osu.Desktop.VisualTests.Tests
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
TextSize = 40,
- Count = 0,
Margin = new MarginPadding(20),
};
Add(score);
@@ -71,7 +70,7 @@ namespace osu.Desktop.VisualTests.Tests
AddButton(@"Reset all", delegate
{
- score.Count = 0;
+ score.Current.Value = 0;
comboCounter.Current.Value = 0;
numerator = denominator = 0;
accuracyCounter.SetFraction(0, 0);
@@ -81,7 +80,7 @@ namespace osu.Desktop.VisualTests.Tests
AddButton(@"Hit! :D", delegate
{
- score.Count += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
+ score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
comboCounter.Increment();
numerator++; denominator++;
accuracyCounter.SetFraction(numerator, denominator);
diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index 068b46c02b..66c9e7d461 100644
--- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs
+++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
@@ -3,6 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
+using osu.Framework.MathUtils;
using System;
namespace osu.Game.Graphics.UserInterface
@@ -10,7 +11,7 @@ namespace osu.Game.Graphics.UserInterface
///
/// Used as an accuracy counter. Represented visually as a percentage.
///
- public class PercentageCounter : RollingCounter
+ public class PercentageCounter : RollingCounter
{
protected override Type TransformType => typeof(TransformAccuracy);
@@ -20,32 +21,44 @@ namespace osu.Game.Graphics.UserInterface
public void SetFraction(float numerator, float denominator)
{
- Count = Math.Abs(denominator) < epsilon ? 1.0f : numerator / denominator;
+ Current.Value = Math.Abs(denominator) < epsilon ? 1.0f : numerator / denominator;
}
public PercentageCounter()
{
DisplayedCountSpriteText.FixedWidth = true;
- Count = DisplayedCount = 1.0f;
+ Current.Value = DisplayedCount = 1.0f;
}
- protected override string FormatCount(float count)
+ protected override string FormatCount(double count)
{
return $@"{count:P2}";
}
- protected override double GetProportionalDuration(float currentValue, float newValue)
+ protected override double GetProportionalDuration(double currentValue, double newValue)
{
return Math.Abs(currentValue - newValue) * RollingDuration * 100.0f;
}
- public override void Increment(float amount)
+ public override void Increment(double amount)
{
- Count = Count + amount;
+ Current.Value = Current + amount;
}
- protected class TransformAccuracy : TransformFloat
+ protected class TransformAccuracy : Transform
{
+ protected override double CurrentValue
+ {
+ get
+ {
+ double time = Time?.Current ?? 0;
+ if (time < StartTime) return StartValue;
+ if (time >= EndTime) return EndValue;
+
+ return Interpolation.ValueAt(time, (float)StartValue, (float)EndValue, StartTime, EndTime, Easing);
+ }
+ }
+
public override void Apply(Drawable d)
{
base.Apply(d);
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 447f07c3ae..a4f6092d66 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -1,19 +1,25 @@
// Copyright (c) 2007-2017 ppy Pty Ltd .
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transforms;
+using osu.Game.Graphics.Sprites;
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using osu.Game.Graphics.Sprites;
namespace osu.Game.Graphics.UserInterface
{
public abstract class RollingCounter : Container
{
+ ///
+ /// The current value.
+ ///
+ public Bindable Current = new Bindable();
+
///
/// Type of the Transform to use.
///
@@ -60,32 +66,6 @@ namespace osu.Game.Graphics.UserInterface
}
}
- private T count;
-
- ///
- /// Actual value of counter.
- ///
- public virtual T Count
- {
- get
- {
- return count;
- }
- set
- {
- count = value;
- if (IsLoaded)
- {
- TransformCount(displayedCount, count);
- }
- }
- }
-
- public void Set(T value)
- {
- Count = value;
- }
-
public abstract void Increment(T amount);
private float textSize;
@@ -116,7 +96,15 @@ namespace osu.Game.Graphics.UserInterface
TextSize = 40;
AutoSizeAxes = Axes.Both;
- DisplayedCount = Count;
+ DisplayedCount = Current;
+
+ Current.ValueChanged += currentChanged;
+ }
+
+ private void currentChanged(object sender, EventArgs e)
+ {
+ if (IsLoaded)
+ TransformCount(displayedCount, Current);
}
protected override void LoadComplete()
@@ -125,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
Flush(false, TransformType);
- DisplayedCountSpriteText.Text = FormatCount(count);
+ DisplayedCountSpriteText.Text = FormatCount(Current);
DisplayedCountSpriteText.Anchor = Anchor;
DisplayedCountSpriteText.Origin = Origin;
}
@@ -136,7 +124,7 @@ namespace osu.Game.Graphics.UserInterface
/// New count value.
public virtual void SetCountWithoutRolling(T count)
{
- Count = count;
+ Current.Value = count;
StopRolling();
}
@@ -146,7 +134,7 @@ namespace osu.Game.Graphics.UserInterface
public virtual void StopRolling()
{
Flush(false, TransformType);
- DisplayedCount = Count;
+ DisplayedCount = Current;
}
///
@@ -211,7 +199,7 @@ namespace osu.Game.Graphics.UserInterface
if (RollingDuration < 1)
{
- DisplayedCount = Count;
+ DisplayedCount = Current;
return;
}
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 2961a6de40..c9a1040185 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -8,7 +8,7 @@ using System;
namespace osu.Game.Graphics.UserInterface
{
- public class ScoreCounter : RollingCounter
+ public class ScoreCounter : RollingCounter
{
protected override Type TransformType => typeof(TransformScore);
@@ -34,24 +34,24 @@ namespace osu.Game.Graphics.UserInterface
LeadingZeroes = leading;
}
- protected override double GetProportionalDuration(ulong currentValue, ulong newValue)
+ protected override double GetProportionalDuration(double currentValue, double newValue)
{
return currentValue > newValue ? currentValue - newValue : newValue - currentValue;
}
- protected override string FormatCount(ulong count)
+ protected override string FormatCount(double count)
{
- return count.ToString("D" + LeadingZeroes);
+ return ((long)count).ToString("D" + LeadingZeroes);
}
- public override void Increment(ulong amount)
+ public override void Increment(double amount)
{
- Count = Count + amount;
+ Current.Value = Current + amount;
}
- protected class TransformScore : Transform
+ protected class TransformScore : Transform
{
- protected override ulong CurrentValue
+ protected override double CurrentValue
{
get
{
@@ -59,7 +59,7 @@ namespace osu.Game.Graphics.UserInterface
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
- return (ulong)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+ return Interpolation.ValueAt(time, (float)StartValue, (float)EndValue, StartTime, EndTime, Easing);
}
}
diff --git a/osu.Game/Modes/UI/ComboResultCounter.cs b/osu.Game/Modes/UI/ComboResultCounter.cs
index 03c8b5611f..957a720c94 100644
--- a/osu.Game/Modes/UI/ComboResultCounter.cs
+++ b/osu.Game/Modes/UI/ComboResultCounter.cs
@@ -1,11 +1,11 @@
// Copyright (c) 2007-2017 ppy Pty Ltd .
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using osu.Game.Graphics.UserInterface;
+using System;
namespace osu.Game.Modes.UI
{
@@ -31,7 +31,7 @@ namespace osu.Game.Modes.UI
public override void Increment(ulong amount)
{
- Count = Count + amount;
+ Current.Value = Current + amount;
}
protected class TransformComboResult : Transform
diff --git a/osu.Game/Modes/UI/HudOverlay.cs b/osu.Game/Modes/UI/HudOverlay.cs
index 2a17b5efd7..4b454797ce 100644
--- a/osu.Game/Modes/UI/HudOverlay.cs
+++ b/osu.Game/Modes/UI/HudOverlay.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.Objects;
using osu.Game.Screens.Play;
using System;
@@ -29,19 +28,6 @@ namespace osu.Game.Modes.UI
protected abstract ScoreCounter CreateScoreCounter();
protected abstract HealthDisplay CreateHealthDisplay();
- public virtual void OnHit(HitObject h)
- {
- ComboCounter?.Increment();
- ScoreCounter?.Increment(300);
- AccuracyCounter?.Set(Math.Min(1, AccuracyCounter.Count + 0.01f));
- }
-
- public virtual void OnMiss(HitObject h)
- {
- ComboCounter.Current.Value = 0;
- AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f);
- }
-
protected HudOverlay()
{
RelativeSizeAxes = Axes.Both;
@@ -76,8 +62,8 @@ namespace osu.Game.Modes.UI
{
//bind processor bindables to combocounter, score display etc.
//TODO: these should be bindable binds, not events!
- processor.TotalScore.ValueChanged += delegate { ScoreCounter?.Set((ulong)processor.TotalScore.Value); };
- processor.Accuracy.ValueChanged += delegate { AccuracyCounter?.Set((float)processor.Accuracy.Value); };
+ ScoreCounter?.Current.BindTo(processor.TotalScore);
+ AccuracyCounter?.Current.BindTo(processor.Accuracy);
ComboCounter?.Current.BindTo(processor.Combo);
HealthDisplay?.Current.BindTo(processor.Health);
}