sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove gross autoSizingAxes and life time.

Browse Source
This commit is contained in:
smoogipooo
2017-06-16 13:00:08 +09:00
parent 6bfb716cc6
commit 5bac0919f0
9 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Rulesets/Timing/SpeedAdjustmentContainer.cs
View File

@ -7,6 +7,9 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
using System;
using System.Linq;
using osu.Game.Rulesets.Objects.Types;
namespace osu.Game.Rulesets.Timing
{
@ -31,35 +34,34 @@ namespace osu.Game.Rulesets.Timing
set { visibleTimeRange.BindTo(value); }
}
/// <summary>
/// The <see cref="MultiplierControlPoint"/> which provides the speed adjustments for this container.
/// </summary>
public readonly MultiplierControlPoint ControlPoint;
protected override Container<DrawableHitObject> Content => content;
private Container<DrawableHitObject> content;
public readonly Axes ScrollingAxes;
/// <summary>
/// Axes which the content of this container will scroll through.
/// </summary>
/// <returns></returns>
public Axes ScrollingAxes { get; internal set; }
public readonly MultiplierControlPoint ControlPoint;
/// <summary>
/// Creates a new <see cref="SpeedAdjustmentContainer"/>.
/// </summary>
/// <param name="controlPoint">The <see cref="MultiplierControlPoint"/> which provides the speed adjustments for this container.</param>
/// <param name="scrollingAxes">The axes through which the content of this container should scroll through.</param>
protected SpeedAdjustmentContainer(MultiplierControlPoint controlPoint, Axes scrollingAxes)
protected SpeedAdjustmentContainer(MultiplierControlPoint controlPoint)
{
ScrollingAxes = scrollingAxes;
this.ControlPoint = controlPoint;
RelativeSizeAxes = Axes.Both;
ControlPoint = controlPoint;
}
[BackgroundDependencyLoader]
private void load()
{
DrawableTimingSection timingSection = CreateTimingSection();
DrawableTimingSection timingSection = CreateTimingSection(ControlPoint);
timingSection.ScrollingAxes = ScrollingAxes;
timingSection.VisibleTimeRange.BindTo(VisibleTimeRange);
timingSection.RelativeChildOffset = new Vector2((ScrollingAxes & Axes.X) > 0 ? (float)ControlPoint.StartTime : 0, (ScrollingAxes & Axes.Y) > 0 ? (float)ControlPoint.StartTime : 0);
@ -89,6 +91,6 @@ namespace osu.Game.Rulesets.Timing
/// Creates the container which handles the movement of a collection of hit objects.
/// </summary>
/// <returns>The <see cref="DrawableTimingSection"/>.</returns>
protected abstract DrawableTimingSection CreateTimingSection();
protected abstract DrawableTimingSection CreateTimingSection(MultiplierControlPoint controlPoint);
}
}