h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 16:02:58 +08:00
Code Issues Releases Wiki Activity

Fix blinds moving when barrel roll mod is active

Browse Source
This commit is contained in:
aitani9 2021-07-21 14:07:00 -07:00
parent edce3e0efe
commit 283d953c4f
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -32,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
{ {
drawableRuleset.Overlays.Add(blinds = new DrawableOsuBlinds(drawableRuleset.Playfield.HitObjectContainer, drawableRuleset.Beatmap)); drawableRuleset.Overlays.Add(blinds = new DrawableOsuBlinds(drawableRuleset.Playfield, drawableRuleset.Beatmap, drawableRuleset.Mods));
} }
public void ApplyToHealthProcessor(HealthProcessor healthProcessor) public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
@ -67,6 +68,8 @@ namespace osu.Game.Rulesets.Osu.Mods
private readonly CompositeDrawable restrictTo; private readonly CompositeDrawable restrictTo;
private readonly bool barrelRollActive;
/// <summary> /// <summary>
/// <para> /// <para>
/// Percentage of playfield to extend blinds over. Basically moves the origin points where the blinds start. /// Percentage of playfield to extend blinds over. Basically moves the origin points where the blinds start.
@ -80,13 +83,24 @@ namespace osu.Game.Rulesets.Osu.Mods
/// </summary> /// </summary>
private const float leniency = 0.1f; private const float leniency = 0.1f;
public DrawableOsuBlinds(CompositeDrawable restrictTo, Beatmap<OsuHitObject> beatmap) public DrawableOsuBlinds(CompositeDrawable restrictTo, Beatmap<OsuHitObject> beatmap, IEnumerable<Mod> mods)
{ {
this.restrictTo = restrictTo; this.restrictTo = restrictTo;
this.beatmap = beatmap; this.beatmap = beatmap;
targetBreakMultiplier = 0; targetBreakMultiplier = 0;
easing = 1; easing = 1;
barrelRollActive = false;
foreach (Mod mod in mods)
{
if (mod is OsuModBarrelRoll)
{
barrelRollActive = true;
break;
}
}
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -128,8 +142,21 @@ namespace osu.Game.Rulesets.Osu.Mods
protected override void Update() protected override void Update()
{ {
float start = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X; float start, end;
float end = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
if (barrelRollActive)
{
float origin = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent).X;
float halfDiagonal = MathF.Sqrt(MathF.Pow(restrictTo.DrawWidth / 2, 2) + MathF.Pow(restrictTo.DrawHeight / 2, 2));
start = origin - halfDiagonal;
end = origin + halfDiagonal;
}
else
{
start = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
end = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
}
float rawWidth = end - start; float rawWidth = end - start;