h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 03:22:55 +08:00
Code Issues Releases Wiki Activity

Decouple direction of catcher from its scale

Browse Source
This commit is contained in:
ekrctb 2021-07-02 22:00:41 +09:00
parent 9eb6ae4d45
commit fbba32647e
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -84,8 +84,8 @@ namespace osu.Game.Rulesets.Catch.UI
public CatcherAnimationState CurrentState public CatcherAnimationState CurrentState
{ {
get => body.AnimationState.Value; get => Body.AnimationState.Value;
private set => body.AnimationState.Value = value; private set => Body.AnimationState.Value = value;
} }
/// <summary> /// <summary>
@ -108,18 +108,14 @@ namespace osu.Game.Rulesets.Catch.UI
} }
} }
public Direction VisualDirection public Direction VisualDirection { get; set; } = Direction.Right;
{
get => Scale.X > 0 ? Direction.Right : Direction.Left;
set => Scale = new Vector2((value == Direction.Right ? 1 : -1) * Math.Abs(Scale.X), Scale.Y);
}
/// <summary> /// <summary>
/// Width of the area that can be used to attempt catches during gameplay. /// Width of the area that can be used to attempt catches during gameplay.
/// </summary> /// </summary>
private readonly float catchWidth; private readonly float catchWidth;
private readonly SkinnableCatcher body; internal readonly SkinnableCatcher Body;
private Color4 hyperDashColour = DEFAULT_HYPER_DASH_COLOUR; private Color4 hyperDashColour = DEFAULT_HYPER_DASH_COLOUR;
private Color4 hyperDashEndGlowColour = DEFAULT_HYPER_DASH_COLOUR; private Color4 hyperDashEndGlowColour = DEFAULT_HYPER_DASH_COLOUR;
@ -158,7 +154,7 @@ namespace osu.Game.Rulesets.Catch.UI
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
}, },
body = new SkinnableCatcher(), Body = new SkinnableCatcher(),
hitExplosionContainer = new HitExplosionContainer hitExplosionContainer = new HitExplosionContainer
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
@ -354,6 +350,11 @@ namespace osu.Game.Rulesets.Catch.UI
{ {
base.Update(); base.Update();
var scaleFromDirection = new Vector2((int)VisualDirection, 1);
Body.Scale = scaleFromDirection;
// TODO: don't flip plate contents on legacy skin.
caughtObjectContainer.Scale = hitExplosionContainer.Scale = scaleFromDirection;
// Correct overshooting. // Correct overshooting.
if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) || if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||
(hyperDashDirection < 0 && hyperDashTargetPosition > X)) (hyperDashDirection < 0 && hyperDashTargetPosition > X))
@ -465,7 +466,7 @@ namespace osu.Game.Rulesets.Catch.UI
break; break;
case DroppedObjectAnimation.Explode: case DroppedObjectAnimation.Explode:
var originalX = droppedObjectTarget.ToSpaceOfOtherDrawable(d.DrawPosition, caughtObjectContainer).X * Scale.X; float originalX = droppedObjectTarget.ToSpaceOfOtherDrawable(d.DrawPosition, caughtObjectContainer).X * caughtObjectContainer.Scale.X;
d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine); d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
d.MoveToX(d.X + originalX * 6, 1000); d.MoveToX(d.X + originalX * 6, 1000);
d.FadeOut(750); d.FadeOut(750);

2
osu.Game.Rulesets.Catch/UI/CatcherTrailDisplay.cs
View File

@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.UI
CatcherTrail sprite = trailPool.Get(); CatcherTrail sprite = trailPool.Get();
sprite.AnimationState = catcher.CurrentState; sprite.AnimationState = catcher.CurrentState;
sprite.Scale = catcher.Scale; sprite.Scale = catcher.Scale * catcher.Body.Scale;
sprite.Position = catcher.Position; sprite.Position = catcher.Position;
target.Add(sprite); target.Add(sprite);