From 3b6cf95f49781dd8af3840cc7a93308c426e2756 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 16:27:47 +0900
Subject: [PATCH] Remove parameter from StartTime method and add obsoleted
previous version
---
.../Objects/Drawables/DrawableHitObject.cs | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5939443cf1..318bb323aa 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -257,8 +257,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
using (BeginAbsoluteSequence(transformTime, true))
UpdateInitialTransforms();
- using (BeginAbsoluteSequence(StateUpdateTime, true))
+#pragma warning disable 618
+ using (BeginAbsoluteSequence(StateUpdateTime + (Result?.TimeOffset ?? 0), true))
UpdateStateTransforms(newState);
+#pragma warning restore 618
+
+ using (BeginAbsoluteSequence(StateUpdateTime, true))
+ UpdateStartTimeStateTransforms();
if (newState != ArmedState.Idle)
{
@@ -298,13 +303,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// In the case of a non-idle <see cref="ArmedState"/>, and if <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
/// </summary>
/// <param name="state">The new armed state.</param>
+ [Obsolete("Use UpdateStartTimeStateTransforms and UpdateHitStateTransforms instead")] // Can be removed 20210504
protected virtual void UpdateStateTransforms(ArmedState state)
{
}
+ /// <summary>
+ /// Apply passive transforms at the <see cref="HitObject"/>'s StartTime.
+ /// This is called each time <see cref="State"/> changes.
+ /// Previous states are automatically cleared.
+ /// </summary>
+ protected virtual void UpdateStartTimeStateTransforms()
+ {
+ }
+
/// <summary>
/// Apply transforms based on the current <see cref="ArmedState"/>. This call is offset by <see cref="HitStateUpdateTime"/> (HitObject.EndTime + Result.Offset), equivalent to when the user hit the object.
- /// This method is only called on <see cref="ArmedState.Hit"/> or <see cref="ArmedState.Miss"/>.
+ /// This method is only called on <see cref="ArmedState.Hit"/> or <see cref="ArmedState.Miss"/>. If <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
/// Previous states are automatically cleared.
/// </summary>
/// <param name="state">The new armed state.</param>