h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 07:23:14 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into osu-direct-search

Browse Source
This commit is contained in:
Dean Herbert 2017-07-13 10:08:31 +09:00
commit 56c817e4b6
39 changed files with 159 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.vscode/tasks.json vendored
View File

@ -9,15 +9,9 @@
"showOutput": "silent",
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable"
"/property:DebugType=portable",
"/m" //parallel compiling support.
],
"windows": {
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/m" //parallel compiling support. doesn't work well with mono atm
]
},
"tasks": [
{
"taskName": "Build (Debug)",

2
osu-framework

@ -1 +1 @@
Subproject commit 768a775b688d7a008d8933275b48ed0d2d491f12
Subproject commit 46a56e0e11d56c788ff8db089582718a606ed158

2
osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
View File

@ -76,7 +76,7 @@ namespace osu.Desktop.VisualTests.Tests
ControlPointInfo = controlPointInfo
});
Add(new Drawable[]
AddRange(new Drawable[]
{
new Container
{

12
osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
View File

@ -50,7 +50,7 @@ namespace osu.Desktop.VisualTests.Tests
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
Position = new Vector2(20, -160),
Count = 5,
CountStars = 5,
};
Add(stars);
@ -59,7 +59,7 @@ namespace osu.Desktop.VisualTests.Tests
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
Position = new Vector2(20, -190),
Text = stars.Count.ToString("0.00"),
Text = stars.CountStars.ToString("0.00"),
};
Add(starsLabel);
@ -69,8 +69,8 @@ namespace osu.Desktop.VisualTests.Tests
comboCounter.Current.Value = 0;
numerator = denominator = 0;
accuracyCounter.SetFraction(0, 0);
stars.Count = 0;
starsLabel.Text = stars.Count.ToString("0.00");
stars.CountStars = 0;
starsLabel.Text = stars.CountStars.ToString("0.00");
});
AddStep(@"Hit! :D", delegate
@ -91,8 +91,8 @@ namespace osu.Desktop.VisualTests.Tests
AddStep(@"Alter stars", delegate
{
stars.Count = RNG.NextSingle() * (stars.StarCount + 1);
starsLabel.Text = stars.Count.ToString("0.00");
stars.CountStars = RNG.NextSingle() * (stars.StarCount + 1);
starsLabel.Text = stars.CountStars.ToString("0.00");
});
AddStep(@"Stop counters", delegate

2
osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs
View File

@ -55,7 +55,7 @@ namespace osu.Desktop.VisualTests.Tests
timeRangeBindable.ValueChanged += v => timeRangeText.Text = $"Visible Range: {v:#,#.#}";
timeRangeBindable.ValueChanged += v => bottomLabel.Text = $"t minus {v:#,#}";
Add(new Drawable[]
AddRange(new Drawable[]
{
new Container
{

2
osu.Desktop/Overlays/VersionManager.cs
View File

@ -202,7 +202,7 @@ namespace osu.Desktop.Overlays
{
this.game = game;
IconContent.Add(new Drawable[]
IconContent.AddRange(new Drawable[]
{
new Box
{

2
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
RelativeSizeAxes = Axes.Both;
Height = (float)HitObject.Duration;
Add(new Drawable[]
AddRange(new Drawable[]
{
// For now the body piece covers the entire height of the container
// whereas possibly in the future we don't want to extend under the head/tail.

2
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.UI
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Add(new Drawable[]
AddRange(new Drawable[]
{
connectionLayer = new FollowPointRenderer
{

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

@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
{
EarlyActivationMilliseconds = pre_beat_transition_time;
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
background = new CircularContainer
{

2
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Taiko.UI
public TaikoPlayfield()
{
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
new ScaleFixContainer
{

6
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -75,18 +75,16 @@ namespace osu.Game.Tests.Beatmaps.IO
var temp = prepareTempCopy(osz_path);
Assert.IsTrue(File.Exists(temp));
Assert.IsTrue(File.Exists(temp), "Temporary file copy never substantiated");
using (File.OpenRead(temp))
host.Dependencies.Get<BeatmapDatabase>().Import(temp);
ensureLoaded(host);
Assert.IsTrue(File.Exists(temp));
File.Delete(temp);
Assert.IsFalse(File.Exists(temp));
Assert.IsFalse(File.Exists(temp), "We likely held a read lock on the file when we shouldn't");
}
}

2
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -140,7 +140,7 @@ namespace osu.Game.Beatmaps.Drawables
},
starCounter = new StarCounter
{
Count = (float)beatmap.StarDifficulty,
CountStars = (float)beatmap.StarDifficulty,
Scale = new Vector2(0.8f),
}
}

5
osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs → osu.Game/Graphics/Containers/ReverseChildIDFillFlowContainer.cs
View File

@ -8,9 +8,10 @@ using osu.Framework.Graphics.Containers;
namespace osu.Game.Graphics.Containers
{
public class ReverseDepthFillFlowContainer<T> : FillFlowContainer<T> where T : Drawable
public class ReverseChildIDFillFlowContainer<T> : FillFlowContainer<T> where T : Drawable
{
protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
protected override int Compare(Drawable x, Drawable y) => CompareReverseChildID(x, y);
protected override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
}
}

2
osu.Game/Graphics/Containers/SectionsContainer.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Graphics.Containers
sections = value.ToList();
if (sections.Count == 0) return;
sectionsContainer.Add(sections);
sectionsContainer.AddRange(sections);
SelectedSection.Value = sections[0];
lastKnownScroll = float.NaN;
}

2
osu.Game/Graphics/UserInterface/BarGraph.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Graphics.UserInterface
Direction = Direction,
});
//I'm using ToList() here because Where() returns an Enumerable which can change it's elements afterwards
Remove(Children.Where((bar, index) => index >= value.Count()).ToList());
RemoveRange(Children.Where((bar, index) => index >= value.Count()).ToList());
}
}
}

2
osu.Game/Graphics/UserInterface/OsuButton.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Graphics.UserInterface
Content.Masking = true;
Content.CornerRadius = 5;
Add(new Drawable[]
AddRange(new Drawable[]
{
new Triangles
{

2
osu.Game/Graphics/UserInterface/SearchTextBox.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
public SearchTextBox()
{
Height = 35;
Add(new Drawable[]
AddRange(new Drawable[]
{
new TextAwesome
{

22
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -33,25 +33,25 @@ namespace osu.Game.Graphics.UserInterface
private const float star_size = 20;
private const float star_spacing = 4;
private float count;
private float countStars;
/// <summary>
/// Amount of stars represented.
/// </summary>
public float Count
public float CountStars
{
get
{
return count;
return countStars;
}
set
{
if (count == value) return;
if (countStars == value) return;
if (IsLoaded)
transformCount(value);
count = value;
countStars = value;
}
}
@ -94,15 +94,15 @@ namespace osu.Game.Graphics.UserInterface
public void ResetCount()
{
count = 0;
countStars = 0;
StopAnimation();
}
public void ReplayAnimation()
{
var t = count;
var t = countStars;
ResetCount();
Count = t;
CountStars = t;
}
public void StopAnimation()
@ -111,8 +111,8 @@ namespace osu.Game.Graphics.UserInterface
foreach (var star in stars.Children)
{
star.ClearTransforms(true);
star.FadeTo(i < count ? 1.0f : minStarAlpha);
star.Icon.ScaleTo(getStarScale(i, count));
star.FadeTo(i < countStars ? 1.0f : minStarAlpha);
star.Icon.ScaleTo(getStarScale(i, countStars));
i++;
}
}
@ -132,7 +132,7 @@ namespace osu.Game.Graphics.UserInterface
{
star.ClearTransforms(true);
var delay = (count <= newValue ? Math.Max(i - count, 0) : Math.Max(count - 1 - i, 0)) * animationDelay;
var delay = (countStars <= newValue ? Math.Max(i - countStars, 0) : Math.Max(countStars - 1 - i, 0)) * animationDelay;
using (BeginDelayedSequence(delay, true))
{

2
osu.Game/OsuGame.cs
View File

@ -141,7 +141,7 @@ namespace osu.Game
{
base.LoadComplete();
Add(new Drawable[] {
AddRange(new Drawable[] {
new VolumeControlReceptor
{
RelativeSizeAxes = Axes.Both,

2
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Chat
var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
//up to last Channel.MAX_HISTORY messages
flow.Add(displayMessages.Select(m => new ChatLine(m)));
flow.AddRange(displayMessages.Select(m => new ChatLine(m)));
if (!IsLoaded) return;

2
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -199,7 +199,7 @@ namespace osu.Game.Overlays.Mods
iconsContainer.Clear();
if (Mods.Length > 1)
{
iconsContainer.Add(new[]
iconsContainer.AddRange(new[]
{
backgroundIcon = new ModIcon(Mods[1])
{

2
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Notifications
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
Light = new NotificationLight
{

2
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Overlays.Notifications
Left = 20,
};
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
new Container
{

2
osu.Game/Overlays/Notifications/SimpleNotification.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Notifications
public SimpleNotification()
{
IconContent.Add(new Drawable[]
IconContent.AddRange(new Drawable[]
{
IconBackgound = new Box
{

2
osu.Game/Overlays/Settings/SettingsSection.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Settings
const int header_size = 26;
const int header_margin = 25;
const int border_size = 2;
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
new Box
{

2
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Settings
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Direction = FillDirection.Vertical;
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
new OsuSpriteText
{

55
osu.Game/Rulesets/Objects/HitObjectStartTimeComparer.cs
View File

@ -1,55 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Objects
{
/// <summary>
/// Compares two hit objects by their start time, falling back to creation order if their start time is equal.
/// </summary>
public class HitObjectStartTimeComparer : Drawable.CreationOrderDepthComparer
{
public override int Compare(Drawable x, Drawable y)
{
var hitObjectX = x as DrawableHitObject;
var hitObjectY = y as DrawableHitObject;
// If either of the two drawables are not hit objects, fall back to the base comparer
if (hitObjectX?.HitObject == null || hitObjectY?.HitObject == null)
return base.Compare(x, y);
// Compare by start time
int i = hitObjectX.HitObject.StartTime.CompareTo(hitObjectY.HitObject.StartTime);
if (i != 0)
return i;
return base.Compare(x, y);
}
}
/// <summary>
/// Compares two hit objects by their start time, falling back to creation order if their start time is equal.
/// This will compare the two hit objects in reverse order.
/// </summary>
public class HitObjectReverseStartTimeComparer : Drawable.ReverseCreationOrderDepthComparer
{
public override int Compare(Drawable x, Drawable y)
{
var hitObjectX = x as DrawableHitObject;
var hitObjectY = y as DrawableHitObject;
// If either of the two drawables are not hit objects, fall back to the base comparer
if (hitObjectX?.HitObject == null || hitObjectY?.HitObject == null)
return base.Compare(x, y);
// Compare by start time
int i = hitObjectY.HitObject.StartTime.CompareTo(hitObjectX.HitObject.StartTime);
if (i != 0)
return i;
return base.Compare(x, y);
}
}
}

19
osu.Game/Rulesets/Timing/DrawableTimingSection.cs
View File

@ -1,13 +1,11 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Caching;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
using osu.Game.Rulesets.Objects.Types;
@ -55,7 +53,22 @@ namespace osu.Game.Rulesets.Timing
/// </summary>
internal MultiplierControlPoint ControlPoint;
protected override IComparer<Drawable> DepthComparer => new HitObjectReverseStartTimeComparer();
protected override int Compare(Drawable x, Drawable y)
{
var xHitObject = x as DrawableHitObject;
var yHitObject = y as DrawableHitObject;
// If either of the two drawables are not hit objects, fall back to the base comparer
if (xHitObject?.HitObject == null || yHitObject?.HitObject == null)
return base.Compare(x, y);
// Compare by start time
int i = yHitObject.HitObject.StartTime.CompareTo(xHitObject.HitObject.StartTime);
if (i != 0)
return i;
return base.Compare(x, y);
}
/// <summary>
/// Creates a new <see cref="DrawableTimingSection"/>.

37
osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs
View File

@ -33,7 +33,20 @@ namespace osu.Game.Rulesets.Timing
set { visibleTimeRange.BindTo(value); }
}
protected override IComparer<Drawable> DepthComparer => new SpeedAdjustmentContainerReverseStartTimeComparer();
protected override int Compare(Drawable x, Drawable y)
{
var xSpeedAdjust = x as SpeedAdjustmentContainer;
var ySpeedAdjust = y as SpeedAdjustmentContainer;
// If either of the two drawables are not hit objects, fall back to the base comparer
if (xSpeedAdjust?.ControlPoint == null || ySpeedAdjust?.ControlPoint == null)
return CompareReverseChildID(x, y);
// Compare by start time
int i = ySpeedAdjust.ControlPoint.StartTime.CompareTo(xSpeedAdjust.ControlPoint.StartTime);
return i != 0 ? i : CompareReverseChildID(x, y);
}
/// <summary>
/// Hit objects that are to be re-processed on the next update.
@ -116,27 +129,5 @@ namespace osu.Game.Rulesets.Timing
/// <param name="time">The time to find the active <see cref="SpeedAdjustmentContainer"/> at.</param>
/// <returns>The <see cref="SpeedAdjustmentContainer"/> active at <paramref name="time"/>. Null if there are no speed adjustments.</returns>
private SpeedAdjustmentContainer adjustmentContainerAt(double time) => Children.FirstOrDefault(c => c.CanContain(time)) ?? Children.LastOrDefault();
/// <summary>
/// Compares two speed adjustment containers by their control point start time, falling back to creation order
// if their control point start time is equal. This will compare the two speed adjustment containers in reverse order.
/// </summary>
private class SpeedAdjustmentContainerReverseStartTimeComparer : ReverseCreationOrderDepthComparer
{
public override int Compare(Drawable x, Drawable y)
{
var speedAdjustmentX = x as SpeedAdjustmentContainer;
var speedAdjustmentY = y as SpeedAdjustmentContainer;
// If either of the two drawables are not hit objects, fall back to the base comparer
if (speedAdjustmentX?.ControlPoint == null || speedAdjustmentY?.ControlPoint == null)
return base.Compare(x, y);
// Compare by start time
int i = speedAdjustmentY.ControlPoint.StartTime.CompareTo(speedAdjustmentX.ControlPoint.StartTime);
return i != 0 ? i : base.Compare(x, y);
}
}
}
}

131
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -114,8 +114,8 @@ namespace osu.Game.Screens.Menu
buttonsTopLevel.Add(new Button(@"osu!direct", string.Empty, FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
buttonFlow.Add(buttonsPlay);
buttonFlow.Add(buttonsTopLevel);
buttonFlow.AddRange(buttonsPlay);
buttonFlow.AddRange(buttonsTopLevel);
}
[BackgroundDependencyLoader(true)]
@ -213,88 +213,89 @@ namespace osu.Game.Screens.Menu
backButton.ContractStyle = 0;
settingsButton.ContractStyle = 0;
switch (state)
bool fromInitial = lastState == MenuState.Initial;
if (state == MenuState.TopLevel)
buttonArea.Flush(true);
using (buttonArea.BeginDelayedSequence(fromInitial ? 150 : 0, true))
{
case MenuState.Exit:
case MenuState.Initial:
toolbar?.Hide();
switch (state)
{
case MenuState.Exit:
case MenuState.Initial:
toolbar?.Hide();
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out);
buttonArea.FadeOut(300);
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out);
buttonArea.FadeOut(300);
osuLogo.Delay(150);
osuLogo.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo);
osuLogo.ScaleTo(1, 800, EasingTypes.OutExpo);
using (osuLogo.BeginDelayedSequence(150))
{
osuLogo.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo);
osuLogo.ScaleTo(1, 800, EasingTypes.OutExpo);
}
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Contracted;
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Contracted;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Contracted;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Contracted;
if (state == MenuState.Exit)
{
osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
osuLogo.FadeOut(EXIT_DELAY);
}
else if (lastState == MenuState.TopLevel)
sampleBack?.Play();
break;
case MenuState.TopLevel:
buttonArea.Flush(true);
if (state == MenuState.Exit)
{
osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
osuLogo.FadeOut(EXIT_DELAY);
}
else if (lastState == MenuState.TopLevel)
sampleBack?.Play();
break;
case MenuState.TopLevel:
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
osuLogo.ClearTransforms();
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
osuLogo.ScaleTo(0.5f, 200, EasingTypes.In);
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
osuLogo.ScaleTo(0.5f, 200, EasingTypes.In);
buttonArea.FadeIn(300);
buttonArea.FadeIn(300);
if (lastState == MenuState.Initial)
{
buttonArea.Delay(150, true);
if (osuLogo.Scale.X > 0.5f)
if (fromInitial && osuLogo.Scale.X > 0.5f)
using (osuLogo.BeginDelayedSequence(200, true))
osuLogo.Impact();
}
Scheduler.AddDelayed(() => toolbar?.Show(), 150);
Scheduler.AddDelayed(() => toolbar?.Show(), 150);
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Expanded;
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Expanded;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Contracted;
break;
case MenuState.Play:
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Exploded;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Contracted;
break;
case MenuState.Play:
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Exploded;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Expanded;
break;
case MenuState.EnteringMode:
buttonAreaBackground.ScaleTo(new Vector2(2, 0), 300, EasingTypes.InSine);
foreach (Button b in buttonsPlay)
b.State = ButtonState.Expanded;
break;
case MenuState.EnteringMode:
buttonAreaBackground.ScaleTo(new Vector2(2, 0), 300, EasingTypes.InSine);
buttonsTopLevel.ForEach(b => b.ContractStyle = 1);
buttonsPlay.ForEach(b => b.ContractStyle = 1);
backButton.ContractStyle = 1;
settingsButton.ContractStyle = 1;
buttonsTopLevel.ForEach(b => b.ContractStyle = 1);
buttonsPlay.ForEach(b => b.ContractStyle = 1);
backButton.ContractStyle = 1;
settingsButton.ContractStyle = 1;
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Contracted;
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Contracted;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Contracted;
break;
foreach (Button b in buttonsPlay)
b.State = ButtonState.Contracted;
break;
}
backButton.State = state == MenuState.Play ? ButtonState.Expanded : ButtonState.Contracted;
settingsButton.State = state == MenuState.TopLevel ? ButtonState.Expanded : ButtonState.Contracted;
}
backButton.State = state == MenuState.Play ? ButtonState.Expanded : ButtonState.Contracted;
settingsButton.State = state == MenuState.TopLevel ? ButtonState.Expanded : ButtonState.Contracted;
if (lastState == MenuState.Initial)
buttonArea.DelayReset();
}
}

2
osu.Game/Screens/Menu/FlowContainerWithOrigin.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Menu
/// </summary>
public Drawable CentreTarget;
protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
protected override int Compare(Drawable x, Drawable y) => CompareReverseChildID(x, y);
protected override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();

2
osu.Game/Screens/Play/HUD/ModDisplay.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Screens.Play.HUD
{
Children = new Drawable[]
{
iconsContainer = new ReverseDepthFillFlowContainer<ModIcon>
iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,

16
osu.Game/Screens/Play/KeyCounter.cs
View File

@ -20,15 +20,15 @@ namespace osu.Game.Screens.Play
private SpriteText countSpriteText;
public bool IsCounting { get; set; }
private int count;
public int Count
private int countPresses;
public int CountPresses
{
get { return count; }
get { return countPresses; }
private set
{
if (count != value)
if (countPresses != value)
{
count = value;
countPresses = value;
countSpriteText.Text = value.ToString(@"#,0");
}
}
@ -45,7 +45,7 @@ namespace osu.Game.Screens.Play
isLit = value;
updateGlowSprite(value);
if (value && IsCounting)
Count++;
CountPresses++;
}
}
}
@ -98,7 +98,7 @@ namespace osu.Game.Screens.Play
},
countSpriteText = new OsuSpriteText
{
Text = Count.ToString(@"#,0"),
Text = CountPresses.ToString(@"#,0"),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativePositionAxes = Axes.Both,
@ -128,6 +128,6 @@ namespace osu.Game.Screens.Play
}
}
public void ResetCount() => Count = 0;
public void ResetCount() => CountPresses = 0;
}
}

2
osu.Game/Screens/Play/Player.cs
View File

@ -200,7 +200,7 @@ namespace osu.Game.Screens.Play
scoreProcessor = HitRenderer.CreateScoreProcessor();
hudOverlay.KeyCounter.Add(rulesetInstance.CreateGameplayKeys());
hudOverlay.KeyCounter.AddRange(rulesetInstance.CreateGameplayKeys());
hudOverlay.BindProcessor(scoreProcessor);
hudOverlay.BindHitRenderer(HitRenderer);

2
osu.Game/Screens/Ranking/ResultsPage.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Screens.Ranking
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
fill = new Box
{

9
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -12,7 +12,6 @@ using osu.Game.Beatmaps.Drawables;
using osu.Game.Configuration;
using osu.Framework.Input;
using OpenTK.Input;
using System.Collections;
using osu.Framework.MathUtils;
using System.Diagnostics;
using System.Threading.Tasks;
@ -22,7 +21,7 @@ using osu.Framework.Configuration;
namespace osu.Game.Screens.Select
{
internal class BeatmapCarousel : ScrollContainer, IEnumerable<BeatmapGroup>
internal class BeatmapCarousel : ScrollContainer
{
public BeatmapInfo SelectedBeatmap => selectedPanel?.Beatmap;
@ -265,10 +264,6 @@ namespace osu.Game.Screens.Select
perform();
}
public IEnumerator<BeatmapGroup> GetEnumerator() => groups.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
private BeatmapGroup createGroup(BeatmapSetInfo beatmapSet)
{
foreach (var b in beatmapSet.Beatmaps)
@ -307,7 +302,7 @@ namespace osu.Game.Screens.Select
panels.Remove(p);
scrollableContent.Remove(group.Header);
scrollableContent.Remove(group.BeatmapPanels);
scrollableContent.RemoveRange(group.BeatmapPanels);
if (selectedGroup == group)
SelectNext();

4
osu.Game/Screens/Select/BeatmapDetailArea.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select
public BeatmapDetailArea()
{
AddInternal(new Drawable[]
AddRangeInternal(new Drawable[]
{
new BeatmapDetailAreaTabControl
{
@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select
},
});
Add(new Drawable[]
AddRange(new Drawable[]
{
Details = new BeatmapDetails
{

2
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Screens.Select.Options
Scale = new Vector2(1, 0),
Colour = Color4.Black.Opacity(0.5f),
},
buttonsContainer = new ReverseDepthFillFlowContainer<BeatmapOptionsButton>
buttonsContainer = new ReverseChildIDFillFlowContainer<BeatmapOptionsButton>
{
Height = height,
RelativePositionAxes = Axes.X,

3
osu.Game/osu.Game.csproj
View File

@ -190,7 +190,6 @@
<Compile Include="Rulesets\Objects\Drawables\IScrollingHitObject.cs" />
<Compile Include="Rulesets\Judgements\Judgement.cs" />
<Compile Include="Rulesets\Objects\HitObjectParser.cs" />
<Compile Include="Rulesets\Objects\HitObjectStartTimeComparer.cs" />
<Compile Include="Rulesets\Objects\Types\IHasCombo.cs" />
<Compile Include="Rulesets\Objects\Types\IHasEndTime.cs" />
<Compile Include="Rulesets\Objects\Types\IHasDistance.cs" />
@ -475,7 +474,7 @@
<Compile Include="Overlays\Direct\DirectGridPanel.cs" />
<Compile Include="Overlays\Direct\DirectListPanel.cs" />
<Compile Include="Database\BeatmapOnlineInfo.cs" />
<Compile Include="Graphics\Containers\ReverseDepthFillFlowContainer.cs" />
<Compile Include="Graphics\Containers\ReverseChildIDFillFlowContainer.cs" />
<Compile Include="Database\RankStatus.cs" />
<Compile Include="Database\BeatmapSetOnlineInfo.cs" />
<Compile Include="Online\API\Requests\GetBeatmapSetsRequest.cs" />