sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update framework

Browse Source
This commit is contained in:
Thomas Müller
2017-07-16 13:59:26 +03:00
parent 5372b94674
commit 6063219b72
11 changed files with 15 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -127,7 +127,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public virtual void StopRolling()
{
Flush(false, typeof(TransformRollingCounter));
Flush(false, nameof(DisplayedCount));
DisplayedCount = Current;
}
@ -173,44 +173,13 @@ namespace osu.Game.Graphics.UserInterface
/// <param name="newValue">Expected count value after modification-</param>
/// <seealso cref="TransformType"/>
protected virtual void TransformCount(T currentValue, T newValue)
{
TransformCount(new TransformRollingCounter(this), currentValue, newValue);
}
/// <summary>
/// Intended to be used by TransformCount(T currentValue, T newValue).
/// </summary>
protected void TransformCount(TransformRollingCounter transform, T currentValue, T newValue)
{
double rollingTotalDuration =
IsRollingProportional
? GetProportionalDuration(currentValue, newValue)
: RollingDuration;
this.TransformTo(newValue, rollingTotalDuration, RollingEasing, transform);
}
protected class TransformRollingCounter : Transform<T, RollingCounter<T>>
{
public TransformRollingCounter(RollingCounter<T> target) : base(target)
{
}
public T CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
double result = Interpolation.ValueAt(time, Convert.ToDouble(StartValue), Convert.ToDouble(EndValue), StartTime, EndTime, Easing);
return (T)Convert.ChangeType(result, typeof(T), null);
}
}
public override void Apply(RollingCounter<T> d) => d.DisplayedCount = CurrentValue;
public override void ReadIntoStartValue(RollingCounter<T> d) => StartValue = d.DisplayedCount;
this.TransformTo(nameof(DisplayedCount), newValue, rollingTotalDuration, RollingEasing);
}
}
}