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

Make blinds move correctly whenever the playfield is rotated

Browse Source
This commit is contained in:
aitani9
2021-07-22 14:07:41 -07:00
parent 80cb7c77b9
commit 715f3e3f7c
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@
// 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;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
@ -33,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, drawableRuleset.Beatmap, drawableRuleset.Mods)); drawableRuleset.Overlays.Add(blinds = new DrawableOsuBlinds(drawableRuleset.Playfield, drawableRuleset.Beatmap));
} }
public void ApplyToHealthProcessor(HealthProcessor healthProcessor) public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
@ -68,8 +68,6 @@ 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.
@ -83,24 +81,13 @@ 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, IEnumerable<Mod> mods) public DrawableOsuBlinds(CompositeDrawable restrictTo, Beatmap<OsuHitObject> beatmap)
{ {
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]
@ -144,7 +131,12 @@ namespace osu.Game.Rulesets.Osu.Mods
{ {
float start, end; float start, end;
if (barrelRollActive) if (Precision.AlmostEquals(restrictTo.Rotation, 0))
{
start = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
end = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
}
else
{ {
float center = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent).X; float center = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent).X;
float halfDiagonal = (restrictTo.DrawSize / 2).LengthFast; float halfDiagonal = (restrictTo.DrawSize / 2).LengthFast;
@ -152,11 +144,6 @@ namespace osu.Game.Rulesets.Osu.Mods
start = center - halfDiagonal; start = center - halfDiagonal;
end = center + halfDiagonal; end = center + halfDiagonal;
} }
else
{
start = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
end = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
}
float rawWidth = end - start; float rawWidth = end - start;