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

Determine whether to show lighting at prepare time

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-07-26 23:20:38 +02:00
parent bbc7d69524
commit 21ae33e284
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
View File

@ -20,6 +20,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
private Bindable<Color4> lightingColour; private Bindable<Color4> lightingColour;
[Resolved]
private OsuConfigManager config { get; set; }
public DrawableOsuJudgement(JudgementResult result, DrawableHitObject judgedObject) public DrawableOsuJudgement(JudgementResult result, DrawableHitObject judgedObject)
: base(result, judgedObject) : base(result, judgedObject)
{ {
@ -30,19 +33,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load()
{
if (config.Get<bool>(OsuSetting.HitLighting))
{ {
AddInternal(Lighting = new SkinnableSprite("lighting") AddInternal(Lighting = new SkinnableSprite("lighting")
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Blending = BlendingParameters.Additive, Blending = BlendingParameters.Additive,
Depth = float.MaxValue Depth = float.MaxValue,
Alpha = 0
}); });
} }
}
public override void Apply(JudgementResult result, DrawableHitObject judgedObject) public override void Apply(JudgementResult result, DrawableHitObject judgedObject)
{ {
@ -61,8 +62,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
lightingColour?.UnbindAll(); lightingColour?.UnbindAll();
if (Lighting != null)
{
Lighting.ResetAnimation(); Lighting.ResetAnimation();
if (JudgedObject != null) if (JudgedObject != null)
@ -75,13 +74,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Lighting.Colour = Color4.White; Lighting.Colour = Color4.White;
} }
} }
}
protected override double FadeOutDelay => Lighting == null ? base.FadeOutDelay : 1400; protected override double FadeOutDelay => Lighting == null ? base.FadeOutDelay : 1400;
protected override void ApplyHitAnimations() protected override void ApplyHitAnimations()
{ {
if (Lighting != null) if (config.Get<bool>(OsuSetting.HitLighting))
{ {
JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400); JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);