From 5dd83067ee7f7bd39f21b67bded173f6a0cc5bc5 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 11 May 2017 17:41:00 +0900 Subject: [PATCH] Fix line endings. --- .../Timing/TimeRelativeContainer.cs | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/osu.Game.Rulesets.Mania/Timing/TimeRelativeContainer.cs b/osu.Game.Rulesets.Mania/Timing/TimeRelativeContainer.cs index d3fcb56174..d4705c2352 100644 --- a/osu.Game.Rulesets.Mania/Timing/TimeRelativeContainer.cs +++ b/osu.Game.Rulesets.Mania/Timing/TimeRelativeContainer.cs @@ -1,67 +1,67 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using System.Collections.Generic; -using System.Linq; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using OpenTK; - -namespace osu.Game.Rulesets.Mania.Timing +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using System.Collections.Generic; +using System.Linq; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using OpenTK; + +namespace osu.Game.Rulesets.Mania.Timing { /// - /// A container in which the Y-relative coordinate space is spanned by a length of time. - /// - /// This container contains s which scroll inside this container. + /// A container in which the Y-relative coordinate space is spanned by a length of time. + /// + /// This container contains s which scroll inside this container. /// Drawables added to this container are moved inside the relevant , - /// and as such, will scroll along with the s. + /// and as such, will scroll along with the s. /// /// public class TimeRelativeContainer : Container - { - /// - /// The amount of time which the height of this container spans. - /// - public double TimeSpan - { - get { return RelativeCoordinateSpace.Y; } - set { RelativeCoordinateSpace = new Vector2(1, (float)value); } - } - - public TimeRelativeContainer(IEnumerable timingSections) + { + /// + /// The amount of time which the height of this container spans. + /// + public double TimeSpan { - Children = timingSections.Select(t => new DrawableTimingSection(t)); + get { return RelativeCoordinateSpace.Y; } + set { RelativeCoordinateSpace = new Vector2(1, (float)value); } } - /// - /// Adds a drawable to this container. Note that the drawable added must have a - /// Y-position as a time relative to this container. - /// - /// The drawable to add. - public override void Add(Drawable drawable) + public TimeRelativeContainer(IEnumerable timingSections) + { + Children = timingSections.Select(t => new DrawableTimingSection(t)); + } + + /// + /// Adds a drawable to this container. Note that the drawable added must have a + /// Y-position as a time relative to this container. + /// + /// The drawable to add. + public override void Add(Drawable drawable) { // Always add timing sections to ourselves - if (drawable is DrawableTimingSection) - { + if (drawable is DrawableTimingSection) + { base.Add(drawable); - return; + return; } - - var section = (Children.LastOrDefault(t => t.Y >= drawable.Y) ?? Children.First()) as DrawableTimingSection; - - if (section == null) + + var section = (Children.LastOrDefault(t => t.Y >= drawable.Y) ?? Children.First()) as DrawableTimingSection; + + if (section == null) throw new Exception("Could not find suitable timing section to add object to."); - - section.Add(drawable); + + section.Add(drawable); } - /// + /// /// A container that contains drawables within the time span of a timing section. /// /// Scrolls relative to the current time. - /// - /// + /// + /// private class DrawableTimingSection : Container { private readonly TimingSection section; @@ -93,10 +93,10 @@ namespace osu.Game.Rulesets.Mania.Timing // we need to offset it back by our position so that it becomes correctly relatively-positioned to us // This can be removed if hit objects were stored such that either their StartTime or their "beat offset" was relative to the timing section // they belonged to, but this requires a radical change to the beatmap format which we're not ready to do just yet - drawable.Y -= Y; - - base.Add(drawable); + drawable.Y -= Y; + + base.Add(drawable); } - } - } + } + } } \ No newline at end of file