sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove parameter from StartTime method and add obsoleted previous version

Browse Source
This commit is contained in:
Dean Herbert
2020-11-04 16:27:47 +09:00
parent 7f30140b7e
commit 3b6cf95f49
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -257,8 +257,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
using (BeginAbsoluteSequence(transformTime, true)) using (BeginAbsoluteSequence(transformTime, true))
UpdateInitialTransforms(); UpdateInitialTransforms();
using (BeginAbsoluteSequence(StateUpdateTime, true)) #pragma warning disable 618
using (BeginAbsoluteSequence(StateUpdateTime + (Result?.TimeOffset ?? 0), true))
UpdateStateTransforms(newState); UpdateStateTransforms(newState);
#pragma warning restore 618
using (BeginAbsoluteSequence(StateUpdateTime, true))
UpdateStartTimeStateTransforms();
if (newState != ArmedState.Idle) 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. /// 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> /// </summary>
/// <param name="state">The new armed state.</param> /// <param name="state">The new armed state.</param>
[Obsolete("Use UpdateStartTimeStateTransforms and UpdateHitStateTransforms instead")] // Can be removed 20210504
protected virtual void UpdateStateTransforms(ArmedState state) 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> /// <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. /// 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. /// Previous states are automatically cleared.
/// </summary> /// </summary>
/// <param name="state">The new armed state.</param> /// <param name="state">The new armed state.</param>