*Also* fix droplets

ppy · Sep 17, 2024 · 3f44224 · 3f44224
1 parent 2ccdad4
commit 3f44224
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
 
@@ -28,15 +28,22 @@ private void load()
                 _ => new DropletPiece());
         }
 
-        protected override void UpdateInitialTransforms()
+        private float startRotation;
+
+        protected override void OnApply()
         {
-            base.UpdateInitialTransforms();
+            base.OnApply();
 
             // roughly matches osu-stable
-            float startRotation = RandomSingle(1) * 20;
-            double duration = HitObject.TimePreempt + 2000;
+            startRotation = RandomSingle(1) * 20;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
 
-            ScalingContainer.RotateTo(startRotation).RotateTo(startRotation + 720, duration);
+            double preemptProgress = (Time.Current - (HitObject.StartTime - InitialLifetimeOffset)) / (HitObject.TimePreempt + 2000);
+            ScalingContainer.Rotation = (float)Interpolation.Lerp(startRotation, startRotation + 720, preemptProgress);
         }
     }
 }