RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-01 22:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide VisibleCount from transformStar

Browse Source
This commit is contained in:
Adonais Romero González 2016-10-09 14:53:06 -05:00
parent 01da3ca474
commit fd1cbfd8fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Graphics.UserInterface
protected override void transformCount(float currentValue, float newValue) protected override void transformCount(float currentValue, float newValue)
{ {
transformStar((int)Math.Floor(currentValue), currentValue < newValue); transformStar((int)Math.Floor(currentValue), currentValue, currentValue < newValue);
transformCount(new TransformStarCounter(Clock), currentValue, newValue); transformCount(new TransformStarCounter(Clock), currentValue, newValue);
} }
@ -134,7 +134,7 @@ namespace osu.Game.Graphics.UserInterface
} }
protected void transformStar(int i, bool isIncrement) protected void transformStar(int i, float value, bool isIncrement)
{ {
if (i >= MaxStars) if (i >= MaxStars)
return; return;
@ -147,11 +147,11 @@ namespace osu.Game.Graphics.UserInterface
// If incrementing, animation should had started when VisibleCount crossed start of star (i) // If incrementing, animation should had started when VisibleCount crossed start of star (i)
if (isIncrement) if (isIncrement)
startTime -= i == (int)Math.Floor(prevCount) ? startTime -= i == (int)Math.Floor(prevCount) ?
getProportionalDuration(prevCount, VisibleCount) : getProportionalDuration(i, VisibleCount); getProportionalDuration(prevCount, value) : getProportionalDuration(i, value);
// If decrementing, animation should had started when VisibleCount crossed end of star (i + 1) // If decrementing, animation should had started when VisibleCount crossed end of star (i + 1)
else else
startTime -= i == (int)Math.Floor(prevCount) ? startTime -= i == (int)Math.Floor(prevCount) ?
getProportionalDuration(prevCount, VisibleCount) : getProportionalDuration(i + 1, VisibleCount); getProportionalDuration(prevCount, value) : getProportionalDuration(i + 1, value);
updateTransformStar(i); updateTransformStar(i);
@ -164,12 +164,12 @@ namespace osu.Game.Graphics.UserInterface
// Detect increment that passes over an integer value // Detect increment that passes over an integer value
if (Math.Ceiling(currentValue) <= Math.Floor(newValue)) if (Math.Ceiling(currentValue) <= Math.Floor(newValue))
for (int i = (int)Math.Ceiling(currentValue); i <= Math.Floor(newValue); i++) for (int i = (int)Math.Ceiling(currentValue); i <= Math.Floor(newValue); i++)
transformStar(i, true); transformStar(i, newValue, true);
// Detect decrement that passes over an integer value // Detect decrement that passes over an integer value
if (Math.Floor(currentValue) >= Math.Ceiling(newValue)) if (Math.Floor(currentValue) >= Math.Ceiling(newValue))
for (int i = (int)Math.Floor(newValue); i < Math.Floor(currentValue); i++) for (int i = (int)Math.Floor(newValue); i < Math.Floor(currentValue); i++)
transformStar(i, false); transformStar(i, newValue, false);
} }
protected class TransformStarCounter : Transform<float> protected class TransformStarCounter : Transform<float>