sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-26 07:57:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Speedup triangles

Browse Source
This commit is contained in:
DrabWeb 2017-02-24 16:41:10 -04:00
parent c94da4fcf0
commit 42b26a4c2f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -301,11 +301,20 @@ namespace osu.Game.Overlays.Dialog
class PopupDialogTriangles : Triangles class PopupDialogTriangles : Triangles
{ {
private const float enter_duration = 500;
private const float exit_duration = 500;
private const float triangle_enter_speed = 100;
private const float triangle_exit_speed = 300;
private const float triangle_normal_speed = 20000;
private float triangleMoveSpeed;
private Color4[] colours; private Color4[] colours;
protected override float SpawnRatio => spawnRatio; protected override float SpawnRatio => spawnRatio;
private float spawnRatio = 0f; private float spawnRatio = 0f;
protected override Color4 GetTriangleShade() => colours[RNG.Next(0, colours.Length - 1)];
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colour) private void load(OsuColour colour)
{ {
@ -322,32 +331,24 @@ namespace osu.Game.Overlays.Dialog
}; };
} }
protected override Color4 GetTriangleShade() => colours[RNG.Next(0, colours.Length - 1)];
private const float triangle_moving_speed = 300;
private const float triangle_normal_speed = 20000;
private float triangleMoveSpeed;
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
foreach (Drawable d in Children) foreach (Drawable d in Children)
{
d.Position -= new Vector2(0, (float)(d.Scale.X * (Time.Elapsed / triangleMoveSpeed))); d.Position -= new Vector2(0, (float)(d.Scale.X * (Time.Elapsed / triangleMoveSpeed)));
}
} }
public void SlideIn() public void SlideIn()
{ {
triangleMoveSpeed = triangle_moving_speed; triangleMoveSpeed = triangle_enter_speed;
TransformFloatTo(spawnRatio, 1f, 600, EasingTypes.None, new TransformFloatSpawnRatio()); TransformFloatTo(spawnRatio, 1f, enter_duration, EasingTypes.None, new TransformFloatSpawnRatio());
TransformFloatTo(triangleMoveSpeed, triangle_normal_speed, 600, EasingTypes.InQuint, new TransformFloatSpeed()); TransformFloatTo(triangleMoveSpeed, triangle_normal_speed, enter_duration, EasingTypes.InExpo, new TransformFloatSpeed());
} }
public void SlideOut() public void SlideOut()
{ {
TransformFloatTo(spawnRatio, 0f, 500, EasingTypes.None, new TransformFloatSpawnRatio()); TransformFloatTo(spawnRatio, 0f, exit_duration, EasingTypes.None, new TransformFloatSpawnRatio());
TransformFloatTo(triangleMoveSpeed, triangle_moving_speed, 500, EasingTypes.OutExpo, new TransformFloatSpeed()); TransformFloatTo(triangleMoveSpeed, triangle_exit_speed, exit_duration, EasingTypes.OutExpo, new TransformFloatSpeed());
} }
class TransformFloatSpeed : TransformFloat class TransformFloatSpeed : TransformFloat