From 134e1299bb4a71e219edfd7746df79fa33cdc888 Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Thu, 5 Oct 2017 19:23:58 +0800 Subject: [PATCH] Update spm value when spinner not active. --- .../Objects/Drawables/Pieces/SpinnerDisc.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs index 04bbd8b871..b36fe4287e 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs @@ -112,20 +112,20 @@ protected override void Update() currentRotation += thisAngle - lastAngle; RotationAbsolute += Math.Abs(thisAngle - lastAngle); - if (rotations.Count > 0) - { - float rotationFrom = rotations.Peek(); - double timeFrom = times.Peek(); - while (Time.Current - times.Peek() > spm_count_duration) - { - rotationFrom = rotations.Dequeue(); - timeFrom = times.Dequeue(); - } - SpinsPerMinute = (currentRotation - rotationFrom) / (Time.Current - timeFrom) * 1000 * 60 / 360; - } } lastAngle = thisAngle; + if (rotations.Count > 0) + { + float rotationFrom = rotations.Peek(); + double timeFrom = times.Peek(); + while (Time.Current - times.Peek() > spm_count_duration) + { + rotationFrom = rotations.Dequeue(); + timeFrom = times.Dequeue(); + } + SpinsPerMinute = (currentRotation - rotationFrom) / (Time.Current - timeFrom) * 1000 * 60 / 360; + } rotations.Enqueue(currentRotation); times.Enqueue(Time.Current);