diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs index f2bbd7373e..3b48d36bb5 100644 --- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs +++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs @@ -122,14 +122,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon private void updateSpmAlpha() { if (drawableSpinner.Result?.TimeStarted is double startTime) - { - double timeOffset = Math.Clamp(Clock.CurrentTime, startTime, startTime + drawableSpinner.HitObject.TimeFadeIn) - startTime; - spmContainer.Alpha = (float)(timeOffset / drawableSpinner.HitObject.TimeFadeIn); - } + spmContainer.Alpha = (float)Math.Clamp((Clock.CurrentTime - startTime) / drawableSpinner.HitObject.TimeFadeIn, 0, 1); else - { spmContainer.Alpha = 0; - } } } } diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs index 0bd877b902..ac56b45b69 100644 --- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs +++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs @@ -128,14 +128,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default private void updateSpmAlpha() { if (drawableSpinner.Result?.TimeStarted is double startTime) - { - double timeOffset = Math.Clamp(Clock.CurrentTime, startTime, startTime + drawableSpinner.HitObject.TimeFadeIn) - startTime; - spmContainer.Alpha = (float)(timeOffset / drawableSpinner.HitObject.TimeFadeIn); - } + spmContainer.Alpha = (float)Math.Clamp((Clock.CurrentTime - startTime) / drawableSpinner.HitObject.TimeFadeIn, 0, 1); else - { spmContainer.Alpha = 0; - } } } }