RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update in-line with framework changes

This commit is contained in:
smoogipoo 2017-11-09 17:04:04 +09:00
parent 348083f589
commit 66ee9d1631
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit b70ca3de9ec1a8eb7fb73fcfd169ff38d00b07cd
Subproject commit ff1e04024d16c0a6cabec7792573b0d019bd1bba

9
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -25,8 +25,8 @@ protected sealed override void UpdateState(ArmedState state)
{
double transformTime = HitObject.StartTime - TIME_PREEMPT;
TransformStateTo(transformTime, true);
ClearTransformsAfter(transformTime, true);
base.ApplyTransformsAt(transformTime, true);
base.ClearTransformsAfter(transformTime, true);
using (BeginAbsoluteSequence(transformTime, true))
{
@ -46,6 +46,11 @@ protected virtual void UpdateCurrentState(ArmedState state)
{
}
// Todo: At some point we need to move these to DrawableHitObject after ensuring that all other Rulesets apply
// transforms in the same way and don't rely on them not being cleared
public override void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null) { }
public override void ApplyTransformsAt(double time, bool propagateChildren = false) { }
private OsuInputManager osuActionInputManager;
internal OsuInputManager OsuActionInputManager => osuActionInputManager ?? (osuActionInputManager = GetContainingInputManager() as OsuInputManager);
}

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

@ -215,9 +215,6 @@ protected virtual void AddNested(DrawableHitObject<TObject> h)
nestedHitObjects.Add(h);
}
protected override bool AllowStateTransformByParent => false;
protected override bool AllowTransformClearByParent => false;
protected abstract void UpdateState(ArmedState state);
}
}