mirror of
https://github.com/ppy/osu.git
synced 2024-11-16 10:17:36 +08:00
94f4268ae5
Fixes half of https://github.com/ppy/osu/issues/24956. The other half is high effort. The number portion is nested deeply and with reason - depending on skin setting it changes the visual order. I'm not sure how to fix that one, but I also think it's weird behaviour and if people don't complain, it's probably fine to just dim the number for consistency. That said, the approach circle is an important one to ensure it matches 1:1, so I've fixed that here.
296 lines
9.8 KiB
C#
296 lines
9.8 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.
|
|
|
|
#nullable disable
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using JetBrains.Annotations;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Input;
|
|
using osu.Framework.Input.Bindings;
|
|
using osu.Framework.Input.Events;
|
|
using osu.Game.Graphics.Containers;
|
|
using osu.Game.Rulesets.Judgements;
|
|
using osu.Game.Rulesets.Objects.Drawables;
|
|
using osu.Game.Rulesets.Osu.Judgements;
|
|
using osu.Game.Rulesets.Osu.Skinning;
|
|
using osu.Game.Rulesets.Osu.Skinning.Default;
|
|
using osu.Game.Rulesets.Osu.UI;
|
|
using osu.Game.Rulesets.Scoring;
|
|
using osu.Game.Skinning;
|
|
using osuTK;
|
|
|
|
namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
|
{
|
|
public partial class DrawableHitCircle : DrawableOsuHitObject, IHasApproachCircle
|
|
{
|
|
public OsuAction? HitAction => HitArea.HitAction;
|
|
protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
|
|
|
|
public SkinnableDrawable ApproachCircle { get; private set; }
|
|
public HitReceptor HitArea { get; private set; }
|
|
public SkinnableDrawable CirclePiece { get; private set; }
|
|
|
|
protected override IEnumerable<Drawable> DimmablePieces => new[]
|
|
{
|
|
CirclePiece,
|
|
};
|
|
|
|
Drawable IHasApproachCircle.ApproachCircle => ApproachCircle;
|
|
|
|
private Container scaleContainer;
|
|
private InputManager inputManager;
|
|
|
|
public DrawableHitCircle()
|
|
: this(null)
|
|
{
|
|
}
|
|
|
|
public DrawableHitCircle([CanBeNull] HitCircle h = null)
|
|
: base(h)
|
|
{
|
|
}
|
|
|
|
private ShakeContainer shakeContainer;
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
Origin = Anchor.Centre;
|
|
|
|
AddRangeInternal(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;
|
|
},
|
|
},
|
|
shakeContainer = new ShakeContainer
|
|
{
|
|
ShakeDuration = 30,
|
|
RelativeSizeAxes = Axes.Both,
|
|
Children = new Drawable[]
|
|
{
|
|
CirclePiece = new SkinnableDrawable(new OsuSkinComponentLookup(CirclePieceComponent), _ => new MainCirclePiece())
|
|
{
|
|
Anchor = Anchor.Centre,
|
|
Origin = Anchor.Centre,
|
|
},
|
|
ApproachCircle = new ProxyableSkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ApproachCircle), _ => new DefaultApproachCircle())
|
|
{
|
|
Anchor = Anchor.Centre,
|
|
Origin = Anchor.Centre,
|
|
RelativeSizeAxes = Axes.Both,
|
|
Alpha = 0,
|
|
Scale = new Vector2(4),
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
});
|
|
|
|
Size = HitArea.DrawSize;
|
|
|
|
PositionBindable.BindValueChanged(_ => UpdatePosition());
|
|
StackHeightBindable.BindValueChanged(_ => UpdatePosition());
|
|
ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
|
|
}
|
|
|
|
protected override void LoadComplete()
|
|
{
|
|
base.LoadComplete();
|
|
|
|
inputManager = GetContainingInputManager();
|
|
}
|
|
|
|
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 virtual void UpdatePosition()
|
|
{
|
|
Position = HitObject.StackedPosition;
|
|
}
|
|
|
|
public override void Shake() => shakeContainer.Shake();
|
|
|
|
protected override void CheckForResult(bool userTriggered, double timeOffset)
|
|
{
|
|
Debug.Assert(HitObject.HitWindows != null);
|
|
|
|
if (!userTriggered)
|
|
{
|
|
if (!HitObject.HitWindows.CanBeHit(timeOffset))
|
|
ApplyResult(r => r.Type = r.Judgement.MinResult);
|
|
|
|
return;
|
|
}
|
|
|
|
var result = ResultFor(timeOffset);
|
|
var clickAction = CheckHittable?.Invoke(this, Time.Current, result);
|
|
|
|
if (clickAction == ClickAction.Shake)
|
|
Shake();
|
|
|
|
if (result == HitResult.None || clickAction != ClickAction.Hit)
|
|
return;
|
|
|
|
ApplyResult(r =>
|
|
{
|
|
var circleResult = (OsuHitCircleJudgementResult)r;
|
|
|
|
// Todo: This should also consider misses, but they're a little more interesting to handle, since we don't necessarily know the position at the time of a miss.
|
|
if (result.IsHit())
|
|
{
|
|
var localMousePosition = ToLocalSpace(inputManager.CurrentState.Mouse.Position);
|
|
circleResult.CursorPositionAtHit = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
|
|
}
|
|
|
|
circleResult.Type = result;
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Retrieves the <see cref="HitResult"/> for a time offset.
|
|
/// </summary>
|
|
/// <param name="timeOffset">The time offset.</param>
|
|
/// <returns>The hit result, or <see cref="HitResult.None"/> if <paramref name="timeOffset"/> doesn't result in a judgement.</returns>
|
|
protected virtual HitResult ResultFor(double timeOffset) => HitObject.HitWindows.ResultFor(timeOffset);
|
|
|
|
protected override void UpdateInitialTransforms()
|
|
{
|
|
base.UpdateInitialTransforms();
|
|
|
|
CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
|
|
|
|
ApproachCircle.FadeTo(0.9f, Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
|
|
ApproachCircle.ScaleTo(1f, HitObject.TimePreempt);
|
|
ApproachCircle.Expire(true);
|
|
}
|
|
|
|
protected override void UpdateStartTimeStateTransforms()
|
|
{
|
|
base.UpdateStartTimeStateTransforms();
|
|
|
|
// always fade out at the circle's start time (to match user expectations).
|
|
ApproachCircle.FadeOut(50);
|
|
}
|
|
|
|
protected override void UpdateHitStateTransforms(ArmedState state)
|
|
{
|
|
Debug.Assert(HitObject.HitWindows != null);
|
|
|
|
// todo: temporary / arbitrary, used for lifetime optimisation.
|
|
this.Delay(800).FadeOut();
|
|
|
|
switch (state)
|
|
{
|
|
default:
|
|
ApproachCircle.FadeOut();
|
|
break;
|
|
|
|
case ArmedState.Idle:
|
|
HitArea.HitAction = null;
|
|
break;
|
|
|
|
case ArmedState.Miss:
|
|
this.FadeOut(100);
|
|
break;
|
|
}
|
|
|
|
Expire();
|
|
}
|
|
|
|
public Drawable ProxiedLayer => ApproachCircle;
|
|
|
|
protected override JudgementResult CreateResult(Judgement judgement) => new OsuHitCircleJudgementResult(HitObject, judgement);
|
|
|
|
public partial class HitReceptor : CompositeDrawable, IKeyBindingHandler<OsuAction>
|
|
{
|
|
// IsHovered is used
|
|
public override bool HandlePositionalInput => true;
|
|
|
|
public Func<bool> Hit;
|
|
|
|
public OsuAction? HitAction;
|
|
|
|
public HitReceptor()
|
|
{
|
|
Size = OsuHitObject.OBJECT_DIMENSIONS;
|
|
|
|
Anchor = Anchor.Centre;
|
|
Origin = Anchor.Centre;
|
|
|
|
CornerRadius = OsuHitObject.OBJECT_RADIUS;
|
|
CornerExponent = 2;
|
|
}
|
|
|
|
public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
|
|
{
|
|
switch (e.Action)
|
|
{
|
|
case OsuAction.LeftButton:
|
|
case OsuAction.RightButton:
|
|
if (IsHovered && (Hit?.Invoke() ?? false))
|
|
{
|
|
HitAction ??= e.Action;
|
|
return true;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public void OnReleased(KeyBindingReleaseEvent<OsuAction> e)
|
|
{
|
|
}
|
|
}
|
|
|
|
private partial class ProxyableSkinnableDrawable : SkinnableDrawable
|
|
{
|
|
public override bool RemoveWhenNotAlive => false;
|
|
|
|
public ProxyableSkinnableDrawable(ISkinComponentLookup lookup, Func<ISkinComponentLookup, Drawable> defaultImplementation = null, ConfineMode confineMode = ConfineMode.NoScaling)
|
|
: base(lookup, defaultImplementation, confineMode)
|
|
{
|
|
}
|
|
}
|
|
}
|
|
}
|