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

Simplify rotation sync with no clocks involved

Browse Source
This commit is contained in:
Andrei Zavatski 2025-01-15 20:38:51 +03:00
parent 7a6355d7cf
commit 2eb63e6fe0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
View File

@ -18,7 +18,6 @@ using osu.Framework.Graphics.Visualisation;
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Rulesets.Osu.Skinning.Legacy;
using osuTK;
using osuTK.Graphics;
using osuTK.Graphics.ES30;
@ -41,6 +40,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
private double timeOffset;
private float time;
protected bool Spin { get; set; }
public float PartRotation { get; set; }
/// <summary>
/// The scale used on creation of a new trail part.
@ -80,12 +80,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
shader = shaders.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
}
private double loadCompleteTime;
protected override void LoadComplete()
{
base.LoadComplete();
loadCompleteTime = Parent!.Clock.CurrentTime; // using parent's clock since our is overridden
resetTime();
}
@ -245,8 +242,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
texture = Source.texture;
time = Source.time;
fadeExponent = Source.FadeExponent;
// The goal is to sync trail rotation with the cursor. Cursor uses spin transform which starts rotation at LoadComplete time.
angle = Source.Spin ? (float)((Source.Parent!.Clock.CurrentTime - Source.loadCompleteTime) * 2 * Math.PI / LegacyCursor.REVOLUTION_DURATION) : 0;
angle = Source.Spin ? float.DegreesToRadians(Source.PartRotation) : 0;
originPosition = Vector2.Zero;

5
osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
View File

@ -36,6 +36,11 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
/// </summary>
public Vector2 CurrentExpandedScale => skinnableCursor.ExpandTarget?.Scale ?? Vector2.One;
/// <summary>
/// The current rotation of the cursor.
/// </summary>
public float CurrentRotation => skinnableCursor.ExpandTarget?.Rotation ?? 0;
public IBindable<float> CursorScale => cursorScale;
/// <summary>

3
osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
View File

@ -83,7 +83,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
base.Update();
if (cursorTrail.Drawable is CursorTrail trail)
{
trail.NewPartScale = ActiveCursor.CurrentExpandedScale;
trail.PartRotation = ActiveCursor.CurrentRotation;
}
}
public bool OnPressed(KeyBindingPressEvent<OsuAction> e)