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

Disable snaking out when tracking is disabled

Browse Source
This commit is contained in:
smoogipoo 2021-02-05 15:56:13 +09:00
parent 6aece18f8d
commit 3aa3692ed4
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
{ {
base.Update(); base.Update();
CirclePiece.UpdateFrom(position == SliderPosition.Start ? HitObject.HeadCircle : HitObject.TailCircle); CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)HitObject.HeadCircle : HitObject.TailCircle);
} }
// Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input. // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.

2
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Objects
public bool IgnoreJudgement = true; public bool IgnoreJudgement = true;
[JsonIgnore] [JsonIgnore]
public HitCircle HeadCircle { get; protected set; } public SliderHeadCircle HeadCircle { get; protected set; }
[JsonIgnore] [JsonIgnore]
public SliderTailCircle TailCircle { get; protected set; } public SliderTailCircle TailCircle { get; protected set; }

22
osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
View File

@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private OsuRulesetConfigManager config { get; set; } private OsuRulesetConfigManager config { get; set; }
private readonly Bindable<bool> snakingOut = new Bindable<bool>();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ISkinSource skin, DrawableHitObject drawableObject) private void load(ISkinSource skin, DrawableHitObject drawableObject)
{ {
@ -35,11 +37,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
accentColour = drawableObject.AccentColour.GetBoundCopy(); accentColour = drawableObject.AccentColour.GetBoundCopy();
accentColour.BindValueChanged(accent => updateAccentColour(skin, accent.NewValue), true); accentColour.BindValueChanged(accent => updateAccentColour(skin, accent.NewValue), true);
SnakingOut.BindTo(snakingOut);
config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn); config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
config?.BindWith(OsuRulesetSetting.SnakingOutSliders, SnakingOut); config?.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1; BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White; BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
drawableObject.HitObjectApplied += onHitObjectApplied;
onHitObjectApplied(drawableObject);
}
private void onHitObjectApplied(DrawableHitObject obj)
{
var drawableSlider = (DrawableSlider)obj;
if (drawableSlider.HitObject == null)
return;
if (!drawableSlider.HitObject.HeadCircle.TrackFollowCircle)
{
// When not tracking the follow circle, force the path to not snake out as it looks better that way.
SnakingOut.UnbindFrom(snakingOut);
SnakingOut.Value = false;
}
} }
private void updateAccentColour(ISkinSource skin, Color4 defaultAccentColour) private void updateAccentColour(ISkinSource skin, Color4 defaultAccentColour)