From bf1d13e7346a3224d6b8645454bff28efcf9d426 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Wed, 22 Feb 2017 13:12:39 -0400 Subject: [PATCH] Comply to formatting style --- osu.Game/Overlays/Mods/ModSelectOverlay.cs | 17 ++++++++--------- osu.Game/Overlays/WaveOverlayContainer.cs | 12 ++++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index ba1b7c267c..aac5b16dfb 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -27,8 +27,7 @@ namespace osu.Game.Overlays.Mods private const int ranked_multiplier_duration = 700; private const float content_width = 0.8f; - private Color4 low_multiplier_colour; - private Color4 high_multiplier_colour; + private Color4 lowMultiplierColour, highMultiplierColour; private OsuSpriteText rankedLabel, multiplierLabel; private FlowContainer rankedMultiplerContainer; @@ -100,7 +99,7 @@ namespace osu.Game.Overlays.Mods [BackgroundDependencyLoader] private void load(OsuColour colours) { - low_multiplier_colour = colours.Red; + lowMultiplierColour = colours.Red; high_multiplier_colour = colours.Green; } @@ -131,14 +130,14 @@ namespace osu.Game.Overlays.Mods protected override void TransitionOut() { - rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, content_exit_duration, EasingTypes.InSine); - rankedMultiplerContainer.FadeOut(content_exit_duration, EasingTypes.InSine); + rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, CONTENT_EXIT_DURATION, EasingTypes.InSine); + rankedMultiplerContainer.FadeOut(CONTENT_EXIT_DURATION, EasingTypes.InSine); foreach (ModSection section in sections) { - section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), content_exit_duration, EasingTypes.InSine); - section.ButtonsContainer.MoveToX(100f, content_exit_duration, EasingTypes.InSine); - section.ButtonsContainer.FadeOut(content_exit_duration, EasingTypes.InSine); + section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), CONTENT_EXIT_DURATION, EasingTypes.InSine); + section.ButtonsContainer.MoveToX(100f, CONTENT_EXIT_DURATION, EasingTypes.InSine); + section.ButtonsContainer.FadeOut(CONTENT_EXIT_DURATION, EasingTypes.InSine); } } @@ -190,7 +189,7 @@ namespace osu.Game.Overlays.Mods } else if (multiplier < 1.0) { - multiplierLabel.FadeColour(low_multiplier_colour, 200); + multiplierLabel.FadeColour(lowMultiplierColour, 200); } else { diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs index 5d094de3e1..2795003dd3 100644 --- a/osu.Game/Overlays/WaveOverlayContainer.cs +++ b/osu.Game/Overlays/WaveOverlayContainer.cs @@ -18,7 +18,7 @@ namespace osu.Game.Overlays private const float third_wave_position = 70; private const float fourth_wave_position = 100; private const float waves_container_position = -150; - private float[] wave_positions + private float[] wavePositions { get { @@ -34,8 +34,8 @@ namespace osu.Game.Overlays private const float waves_container_duration = 400; private const float content_duration = 700; private const float content_transition_wait = 100; - internal const float content_exit_duration = 600; - private float [] wave_durations + internal const float CONTENT_EXIT_DURATION = 600; + private float [] waveDurations { get { @@ -130,7 +130,7 @@ namespace osu.Game.Overlays for (int i = 0; i < waves.Length; i++) { - waves[i].MoveToY(wave_positions[i], wave_durations[i], EasingTypes.OutQuint); + waves[i].MoveToY(wave_positions[i], waveDurations[i], EasingTypes.OutQuint); } DelayReset(); @@ -155,8 +155,8 @@ namespace osu.Game.Overlays { base.Hide(); - contentContainer.FadeOut(content_exit_duration, EasingTypes.InSine); - contentContainer.MoveToY(DrawHeight, content_exit_duration, EasingTypes.InSine); + contentContainer.FadeOut(CONTENT_EXIT_DURATION, EasingTypes.InSine); + contentContainer.MoveToY(DrawHeight, CONTENT_EXIT_DURATION, EasingTypes.InSine); TransitionOut(); for (int i = 0; i < waves.Length; i++)