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

Adjust glow a bit

Browse Source
This commit is contained in:
Dean Herbert 2017-05-24 17:15:51 +09:00
parent 56fc15ca9b
commit 391134b1d3
6 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHit.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
MainPiece.AccentColour = colours.PinkDarker; MainPiece.AccentColour = colours.PinkDarker;
MainPiece.KiaiFlashColour = colours.PinkLight;
} }
} }
} }

1
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableCentreHitStrong.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
MainPiece.AccentColour = colours.PinkDarker; MainPiece.AccentColour = colours.PinkDarker;
MainPiece.KiaiFlashColour = colours.PinkLight;
} }
} }
} }

1
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
MainPiece.AccentColour = colours.BlueDarker; MainPiece.AccentColour = colours.BlueDarker;
MainPiece.KiaiFlashColour = colours.BlueLight;
} }
} }
} }

1
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHitStrong.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
MainPiece.AccentColour = colours.BlueDarker; MainPiece.AccentColour = colours.BlueDarker;
MainPiece.KiaiFlashColour = colours.BlueLight;
} }
} }
} }

14
osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
public const float SYMBOL_SIZE = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER * 0.45f; public const float SYMBOL_SIZE = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER * 0.45f;
public const float SYMBOL_BORDER = 8; public const float SYMBOL_BORDER = 8;
public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER; public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
private const double pre_beat_transition_time = 50; private const double pre_beat_transition_time = 80;
/// <summary> /// <summary>
/// The colour of the inner circle and outer glows. /// The colour of the inner circle and outer glows.
@ -144,13 +144,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
Content.Width = 1 / Content.Scale.X; Content.Width = 1 / Content.Scale.X;
} }
private const float edge_alpha_kiai = 0.5f;
private void resetEdgeEffects() private void resetEdgeEffects()
{ {
background.EdgeEffect = new EdgeEffect background.EdgeEffect = new EdgeEffect
{ {
Type = EdgeEffectType.Glow, Type = EdgeEffectType.Glow,
Colour = AccentColour, Colour = AccentColour.Opacity(KiaiMode ? edge_alpha_kiai : 1f),
Radius = KiaiMode ? 40 : 8 Radius = KiaiMode ? 32 : 8
}; };
} }
@ -162,11 +164,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
if (beatIndex % (int)timingPoint.TimeSignature != 0) if (beatIndex % (int)timingPoint.TimeSignature != 0)
return; return;
double duration = timingPoint.BeatLength * (int)timingPoint.TimeSignature; double duration = timingPoint.BeatLength * 2;
background.FadeEdgeEffectTo(KiaiFlashColour, pre_beat_transition_time, EasingTypes.OutQuint); background.FadeEdgeEffectTo(1, pre_beat_transition_time, EasingTypes.OutQuint);
using (background.BeginDelayedSequence(pre_beat_transition_time)) using (background.BeginDelayedSequence(pre_beat_transition_time))
background.FadeEdgeEffectTo(AccentColour, duration, EasingTypes.OutQuint); background.FadeEdgeEffectTo(edge_alpha_kiai, duration, EasingTypes.OutQuint);
} }
} }
} }

5
osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
View File

@ -20,11 +20,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
set { accentColour = value; } set { accentColour = value; }
} }
/// <summary>
/// The colour to be flashed on a kiai beat.
/// </summary>
public Color4 KiaiFlashColour;
private bool kiaiMode; private bool kiaiMode;
/// <summary> /// <summary>
/// Whether Kiai mode effects are enabled for this circle piece. /// Whether Kiai mode effects are enabled for this circle piece.