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

Merge pull request #14784 from smoogipoo/fix-taiko-fl

Browse Source 
Fix taiko flashlight positioning/sizing incorrectly
This commit is contained in:
Dean Herbert 2021-09-17 23:06:30 +09:00 committed by GitHub
commit b0957b8b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
View File

@ -36,24 +36,27 @@ namespace osu.Game.Rulesets.Taiko.Mods
public TaikoFlashlight(TaikoPlayfield taikoPlayfield) public TaikoFlashlight(TaikoPlayfield taikoPlayfield)
{ {
this.taikoPlayfield = taikoPlayfield; this.taikoPlayfield = taikoPlayfield;
FlashlightSize = new Vector2(0, getSizeFor(0)); FlashlightSize = getSizeFor(0);
AddLayout(flashlightProperties); AddLayout(flashlightProperties);
} }
private float getSizeFor(int combo) private Vector2 getSizeFor(int combo)
{ {
float size = default_flashlight_size;
if (combo > 200) if (combo > 200)
return default_flashlight_size * 0.8f; size *= 0.8f;
else if (combo > 100) else if (combo > 100)
return default_flashlight_size * 0.9f; size *= 0.9f;
else
return default_flashlight_size; // Preserve flashlight size through the playfield's aspect adjustment.
return new Vector2(0, size * taikoPlayfield.DrawHeight / TaikoPlayfield.DEFAULT_HEIGHT);
} }
protected override void OnComboChange(ValueChangedEvent<int> e) protected override void OnComboChange(ValueChangedEvent<int> e)
{ {
this.TransformTo(nameof(FlashlightSize), new Vector2(0, getSizeFor(e.NewValue)), FLASHLIGHT_FADE_DURATION); this.TransformTo(nameof(FlashlightSize), getSizeFor(e.NewValue), FLASHLIGHT_FADE_DURATION);
} }
protected override string FragmentShader => "CircularFlashlight"; protected override string FragmentShader => "CircularFlashlight";
@ -64,7 +67,11 @@ namespace osu.Game.Rulesets.Taiko.Mods
if (!flashlightProperties.IsValid) if (!flashlightProperties.IsValid)
{ {
FlashlightPosition = taikoPlayfield.HitTarget.ToSpaceOfOtherDrawable(taikoPlayfield.HitTarget.OriginPosition, this); FlashlightPosition = ToLocalSpace(taikoPlayfield.HitTarget.ScreenSpaceDrawQuad.Centre);
ClearTransforms(targetMember: nameof(FlashlightSize));
FlashlightSize = getSizeFor(Combo.Value);
flashlightProperties.Validate(); flashlightProperties.Validate();
} }
} }

7
osu.Game/Rulesets/Mods/ModFlashlight.cs
View File

@ -69,9 +69,11 @@ namespace osu.Game.Rulesets.Mods
public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset) public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
{ {
var flashlight = CreateFlashlight(); var flashlight = CreateFlashlight();
flashlight.Combo = Combo;
flashlight.RelativeSizeAxes = Axes.Both; flashlight.RelativeSizeAxes = Axes.Both;
flashlight.Colour = Color4.Black; flashlight.Colour = Color4.Black;
flashlight.Combo.BindTo(Combo);
drawableRuleset.KeyBindingInputManager.Add(flashlight); drawableRuleset.KeyBindingInputManager.Add(flashlight);
flashlight.Breaks = drawableRuleset.Beatmap.Breaks; flashlight.Breaks = drawableRuleset.Beatmap.Breaks;
@ -81,7 +83,8 @@ namespace osu.Game.Rulesets.Mods
public abstract class Flashlight : Drawable public abstract class Flashlight : Drawable
{ {
internal BindableInt Combo; public readonly BindableInt Combo = new BindableInt();
private IShader shader; private IShader shader;
protected override DrawNode CreateDrawNode() => new FlashlightDrawNode(this); protected override DrawNode CreateDrawNode() => new FlashlightDrawNode(this);