mirror of
https://github.com/ppy/osu.git
synced 2025-01-06 09:03:01 +08:00
minor changes
This commit is contained in:
parent
4d367515dc
commit
1a142ff944
@ -85,7 +85,8 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
Debug.Assert(osuPlayfield.Cursor != null);
|
Debug.Assert(osuPlayfield.Cursor != null);
|
||||||
var realCursor = (OsuCursor)osuPlayfield.Cursor.ActiveCursor;
|
var realCursor = (OsuCursor)osuPlayfield.Cursor.ActiveCursor;
|
||||||
realCursor.isBloom = true;
|
realCursor.isBloom = true;
|
||||||
float currentCombSize = (float)Interpolation.Lerp(osuPlayfield.Cursor.Scale.X, ComboBasedSize, Math.Clamp(osuPlayfield.Time.Elapsed / TRANSITION_DURATION, 0, 1));
|
float currentCombSize = (float)Interpolation.Lerp(realCursor.ComboSize, ComboBasedSize, Math.Clamp(osuPlayfield.Time.Elapsed / TRANSITION_DURATION, 0, 1));
|
||||||
|
Console.WriteLine(ComboBasedSize + " " + currentCombSize);
|
||||||
if (beBaseSize)
|
if (beBaseSize)
|
||||||
{
|
{
|
||||||
realCursor.ComboSize = 1;
|
realCursor.ComboSize = 1;
|
||||||
|
@ -17,6 +17,7 @@ using osu.Game.Screens.Play;
|
|||||||
using osu.Game.Skinning;
|
using osu.Game.Skinning;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
|
using osu.Game.Rulesets.Mods;
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.UI.Cursor
|
namespace osu.Game.Rulesets.Osu.UI.Cursor
|
||||||
{
|
{
|
||||||
@ -70,13 +71,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
|
|||||||
autoCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
|
autoCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
|
||||||
|
|
||||||
cursorScale.BindValueChanged(e => cursorScaleContainer.Scale = new Vector2(e.NewValue), true);
|
cursorScale.BindValueChanged(e => cursorScaleContainer.Scale = new Vector2(e.NewValue), true);
|
||||||
isBloom = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadComplete();
|
||||||
cursorScale.Value = CalculateCursorScale();
|
cursorScale.Value = CalculateCursorScale();
|
||||||
|
isBloom = false;
|
||||||
}
|
}
|
||||||
protected override void Update()
|
protected override void Update()
|
||||||
//this should not exist will implement sane fix
|
//this should not exist will implement sane fix
|
||||||
|
Loading…
Reference in New Issue
Block a user