h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 02:02:53 +08:00
Code Issues Releases Wiki Activity

Simplify moving ball behaviour

Browse Source
This commit is contained in:
EVAST9919 2017-11-07 13:43:02 +03:00
parent 5946585a6f
commit 8e806cd11c
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Overlays/Profile/RankChart.cs
View File

@ -117,13 +117,14 @@ namespace osu.Game.Overlays.Profile
protected override bool OnHover(InputState state)
{
graph?.ShowBall(state.Mouse.Position.X);
graph?.UpdateBallPosition(state.Mouse.Position.X);
graph?.ShowBall();
return base.OnHover(state);
}
protected override bool OnMouseMove(InputState state)
{
graph?.MoveBall(state.Mouse.Position.X);
graph?.UpdateBallPosition(state.Mouse.Position.X);
return base.OnMouseMove(state);
}
@ -139,8 +140,7 @@ namespace osu.Game.Overlays.Profile
private class RankChartLineGraph : LineGraph
{
private const double fade_duration = 300;
private const double move_duration = 100;
private const double fade_duration = 200;
private readonly CircularContainer staticBall;
private readonly CircularContainer movingBall;
@ -170,25 +170,16 @@ namespace osu.Game.Overlays.Profile
public void SetStaticBallPosition() => staticBall.Position = new Vector2(1, GetYPosition(Values.Last()));
public void ShowBall(float mouseXPosition)
public void UpdateBallPosition(float mouseXPosition)
{
int index = calculateIndex(mouseXPosition);
movingBall.Position = calculateBallPosition(index);
movingBall.FadeIn(fade_duration);
OnBallMove.Invoke(index);
}
public void MoveBall(float mouseXPosition)
{
int index = calculateIndex(mouseXPosition);
movingBall.MoveTo(calculateBallPosition(index), move_duration, Easing.OutQuint);
OnBallMove.Invoke(index);
}
public void ShowBall() => movingBall.FadeIn(fade_duration);
public void HideBall()
{
movingBall.FadeOut(fade_duration);
}
public void HideBall() => movingBall.FadeOut(fade_duration);
private int calculateIndex(float mouseXPosition) => (int)Math.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1));