h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:17:26 +08:00
Code Issues Releases Wiki Activity

General cleanups.

Browse Source
This commit is contained in:
smoogipooo 2017-05-11 22:01:37 +09:00
parent 7b49ed1419
commit d57bb7e5fd
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Mania/Timing/TimeRelativeContainer.cs
View File

@ -129,6 +129,11 @@ namespace osu.Game.Rulesets.Mania.Timing
base.Add(drawable);
}
/// <summary>
/// Whether this timing section can contain a drawable. A timing section can contain a drawable if the drawable
/// can be placed within the timing section's bounds (in this case, from the start of the timing section up to infinity).
/// </summary>
/// <param name="drawable">The drawable to check.</param>
public bool CanContain(Drawable drawable) => content.Y >= drawable.Y;
}
}

43
osu.Game.Rulesets.Mania/Timing/TimingSection.cs
View File

@ -1,15 +1,30 @@
// 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.Game.Beatmaps.Timing;
namespace osu.Game.Rulesets.Mania.Timing
{
public class TimingSection
{
public double StartTime;
public double Duration;
public double BeatLength;
public TimeSignatures TimeSignature;
}
// 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.Game.Beatmaps.Timing;
namespace osu.Game.Rulesets.Mania.Timing
{
/// <summary>
/// A point in the map where the beat length or speed multiplier has changed .
/// </summary>
public class TimingSection
{
/// <summary>
/// The time at which the change occurred.
/// </summary>
public double StartTime;
/// <summary>
/// The duration of this timing section - lasts until the next timing section.
/// </summary>
public double Duration;
/// <summary>
/// The beat length, includes any speed multiplier.
/// </summary>
public double BeatLength;
/// <summary>
/// The time signature of this timing section.
/// </summary>
public TimeSignatures TimeSignature;
}
}

2
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Mania.UI
},
barlineContainer = new TimeRelativeContainer(timingSections)
{
Name = "Barlines",
Name = "Bar lines",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.Both,