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

Remove HitJudgementResolver; reimplement in DrawableHitObject.

Browse Source
This commit is contained in:
Dean Herbert
2016-11-26 16:51:51 +09:00
parent ef0f975960
commit 396ca9fe91
14 changed files with 115 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -2,23 +2,26 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.ComponentModel;
using System.Diagnostics;
using osu.Framework;
using osu.Framework.Graphics.Containers;
using OpenTK;
using Container = osu.Framework.Graphics.Containers.Container;
namespace osu.Game.Modes.Objects.Drawables
{
public abstract class DrawableHitObject : Container, IStateful<ArmedState>
{
//todo: move to a more central implementation. this logic should not be at a drawable level.
public Action<DrawableHitObject> OnHit;
public Action<DrawableHitObject> OnMiss;
public Action<DrawableHitObject, JudgementInfo> CheckJudgement;
public Action<DrawableHitObject, JudgementInfo> OnHit;
public Action<DrawableHitObject, JudgementInfo> OnMiss;
public Container<DrawableHitObject> ChildObjects;
public JudgementInfo Judgement;
protected JudgementInfo Judgement;
public abstract JudgementInfo CreateJudgementInfo();
public HitObject HitObject;
@ -42,47 +45,55 @@ namespace osu.Game.Modes.Objects.Drawables
}
}
protected override void LoadComplete()
{
base.LoadComplete();
Judgement = CreateJudgementInfo();
}
/// <summary>
/// Process a hit of this hitobject. Carries out judgement.
/// </summary>
/// <param name="judgement">Preliminary judgement information provided by the hit source.</param>
/// <returns>Whether a hit was processed.</returns>
protected bool Hit(JudgementInfo judgement)
protected bool UpdateJudgement(bool userTriggered)
{
if (State != ArmedState.Idle)
if (Judgement.Result != null)
return false;
judgement.TimeOffset = Time.Current - HitObject.EndTime;
Judgement.TimeOffset = Time.Current - HitObject.EndTime;
CheckJudgement?.Invoke(this, judgement);
CheckJudgement(userTriggered);
if (judgement.Result == HitResult.Ignore)
if (Judgement.Result == null)
return false;
Judgement = judgement;
switch (judgement.Result)
switch (Judgement.Result)
{
default:
State = ArmedState.Hit;
OnHit?.Invoke(this);
OnHit?.Invoke(this, Judgement);
break;
case HitResult.Miss:
State = ArmedState.Miss;
OnMiss?.Invoke(this);
OnMiss?.Invoke(this, Judgement);
break;
}
return true;
}
protected virtual void CheckJudgement(bool userTriggered)
{
}
protected override void Update()
{
base.Update();
if (Time.Current >= HitObject.EndTime && Judgement == null)
Hit(new JudgementInfo());
UpdateJudgement(false);
}
protected abstract void UpdateState(ArmedState state);
@ -94,4 +105,23 @@ namespace osu.Game.Modes.Objects.Drawables
Hit,
Miss
}
public class PositionalJudgementInfo : JudgementInfo
{
public Vector2 PositionOffset;
}
public class JudgementInfo
{
public HitResult? Result;
public double TimeOffset;
}
public enum HitResult
{
[Description(@"Miss")]
Miss,
[Description(@"Hit")]
Hit,
}
}