mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 17:07:38 +08:00
77fd748035
Hitboxes of circle pieces in osu! have regressed with commit 8592335
.
The reason for the regression was that hit detection was moved from
DrawableHitCircle itself to a newly-introduced private HitArea class
(now named HitReceptor).
As HitArea inherited from Drawable, it would return IsHovered == true
over its entire bounding box. This meant that the hit area could wrongly
pick up actions that are not within circle radius and make them into
hits.
To resolve, make HitReceptor a CompositeDrawable and set its corner
radius to match the circle piece. This fixes the invalid hitbox, as
IsHovered takes radius into account.
217 lines
6.7 KiB
C#
217 lines
6.7 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System;
|
|
using System.Diagnostics;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Input.Bindings;
|
|
using osu.Game.Rulesets.Objects.Drawables;
|
|
using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
|
|
using osu.Game.Rulesets.Scoring;
|
|
using osuTK;
|
|
using osu.Game.Skinning;
|
|
|
|
namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
|
{
|
|
public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
|
|
{
|
|
public ApproachCircle ApproachCircle { get; }
|
|
|
|
private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
|
|
private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
|
|
private readonly IBindable<float> scaleBindable = new BindableFloat();
|
|
|
|
public OsuAction? HitAction => HitArea.HitAction;
|
|
|
|
public readonly HitReceptor HitArea;
|
|
public readonly SkinnableDrawable CirclePiece;
|
|
private readonly Container scaleContainer;
|
|
|
|
public DrawableHitCircle(HitCircle h)
|
|
: base(h)
|
|
{
|
|
Origin = Anchor.Centre;
|
|
|
|
Position = HitObject.StackedPosition;
|
|
|
|
InternalChildren = new Drawable[]
|
|
{
|
|
scaleContainer = new Container
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
Origin = Anchor.Centre,
|
|
Anchor = Anchor.Centre,
|
|
Children = new Drawable[]
|
|
{
|
|
HitArea = new HitReceptor
|
|
{
|
|
Hit = () =>
|
|
{
|
|
if (AllJudged)
|
|
return false;
|
|
|
|
UpdateResult(true);
|
|
return true;
|
|
},
|
|
},
|
|
CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.HitCircle), _ => new MainCirclePiece()),
|
|
ApproachCircle = new ApproachCircle
|
|
{
|
|
Alpha = 0,
|
|
Scale = new Vector2(4),
|
|
}
|
|
}
|
|
},
|
|
};
|
|
|
|
Size = HitArea.DrawSize;
|
|
}
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
positionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
|
|
stackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
|
|
scaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue), true);
|
|
|
|
positionBindable.BindTo(HitObject.PositionBindable);
|
|
stackHeightBindable.BindTo(HitObject.StackHeightBindable);
|
|
scaleBindable.BindTo(HitObject.ScaleBindable);
|
|
|
|
AccentColour.BindValueChanged(accent => ApproachCircle.Colour = accent.NewValue, true);
|
|
}
|
|
|
|
public override double LifetimeStart
|
|
{
|
|
get => base.LifetimeStart;
|
|
set
|
|
{
|
|
base.LifetimeStart = value;
|
|
ApproachCircle.LifetimeStart = value;
|
|
}
|
|
}
|
|
|
|
public override double LifetimeEnd
|
|
{
|
|
get => base.LifetimeEnd;
|
|
set
|
|
{
|
|
base.LifetimeEnd = value;
|
|
ApproachCircle.LifetimeEnd = value;
|
|
}
|
|
}
|
|
|
|
protected override void CheckForResult(bool userTriggered, double timeOffset)
|
|
{
|
|
Debug.Assert(HitObject.HitWindows != null);
|
|
|
|
if (!userTriggered)
|
|
{
|
|
if (!HitObject.HitWindows.CanBeHit(timeOffset))
|
|
ApplyResult(r => r.Type = HitResult.Miss);
|
|
|
|
return;
|
|
}
|
|
|
|
var result = HitObject.HitWindows.ResultFor(timeOffset);
|
|
|
|
if (result == HitResult.None)
|
|
{
|
|
Shake(Math.Abs(timeOffset) - HitObject.HitWindows.WindowFor(HitResult.Miss));
|
|
return;
|
|
}
|
|
|
|
ApplyResult(r => r.Type = result);
|
|
}
|
|
|
|
protected override void UpdateInitialTransforms()
|
|
{
|
|
base.UpdateInitialTransforms();
|
|
|
|
CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
|
|
|
|
ApproachCircle.FadeIn(Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
|
|
ApproachCircle.ScaleTo(1f, HitObject.TimePreempt);
|
|
ApproachCircle.Expire(true);
|
|
}
|
|
|
|
protected override void UpdateStateTransforms(ArmedState state)
|
|
{
|
|
base.UpdateStateTransforms(state);
|
|
|
|
Debug.Assert(HitObject.HitWindows != null);
|
|
|
|
switch (state)
|
|
{
|
|
case ArmedState.Idle:
|
|
this.Delay(HitObject.TimePreempt).FadeOut(500);
|
|
|
|
Expire(true);
|
|
|
|
HitArea.HitAction = null;
|
|
break;
|
|
|
|
case ArmedState.Miss:
|
|
ApproachCircle.FadeOut(50);
|
|
this.FadeOut(100);
|
|
break;
|
|
|
|
case ArmedState.Hit:
|
|
ApproachCircle.FadeOut(50);
|
|
|
|
// todo: temporary / arbitrary
|
|
this.Delay(800).FadeOut();
|
|
break;
|
|
}
|
|
}
|
|
|
|
public Drawable ProxiedLayer => ApproachCircle;
|
|
|
|
public class HitReceptor : CompositeDrawable, IKeyBindingHandler<OsuAction>
|
|
{
|
|
// IsHovered is used
|
|
public override bool HandlePositionalInput => true;
|
|
|
|
public Func<bool> Hit;
|
|
|
|
public OsuAction? HitAction;
|
|
|
|
public HitReceptor()
|
|
{
|
|
Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
|
|
|
|
Anchor = Anchor.Centre;
|
|
Origin = Anchor.Centre;
|
|
|
|
CornerRadius = OsuHitObject.OBJECT_RADIUS;
|
|
CornerExponent = 2;
|
|
}
|
|
|
|
public bool OnPressed(OsuAction action)
|
|
{
|
|
switch (action)
|
|
{
|
|
case OsuAction.LeftButton:
|
|
case OsuAction.RightButton:
|
|
if (IsHovered && (Hit?.Invoke() ?? false))
|
|
{
|
|
HitAction = action;
|
|
return true;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public void OnReleased(OsuAction action)
|
|
{
|
|
}
|
|
}
|
|
}
|
|
}
|