h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-16 05:37:19 +08:00
Code Issues Releases Wiki Activity

CI fixes.

Browse Source
This commit is contained in:
smoogipooo 2017-06-02 19:53:30 +09:00
parent d6e49b94ec
commit e5720b9477
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableGravityTimingChange.cs
View File

@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
private double acceleration => 1 / timeSpan;
/// <summary>
/// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="travelTime"/>.
/// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="timeSpan"/>.
/// </summary>
/// <param name="time">The non-offset time.</param>
/// <returns>The current time relative to <paramref name="time"/> - <see cref="travelTime"/>. </returns>
/// <returns>The current time relative to <paramref name="time"/> - <see cref="timeSpan"/>. </returns>
private double relativeTimeAt(double time) => Time.Current - time + timeSpan;
}
}

14
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableTimingChange.cs
View File

@ -4,11 +4,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenTK;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
namespace osu.Game.Rulesets.Mania.Timing.Drawables
{
@ -63,8 +63,8 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
Size = new Vector2((scrollingAxes & Axes.X) > 0 ? speedAdjustedSize : 1,
(scrollingAxes & Axes.Y) > 0 ? speedAdjustedSize : 1);
RelativeCoordinateSpace = new Vector2((scrollingAxes & Axes.X) > 0 ? (float)parent.TimeSpan.X : 1,
(scrollingAxes & Axes.Y) > 0 ? (float)parent.TimeSpan.Y : 1);
RelativeCoordinateSpace = new Vector2((scrollingAxes & Axes.X) > 0 ? parent.TimeSpan.X : 1,
(scrollingAxes & Axes.Y) > 0 ? parent.TimeSpan.Y : 1);
}
public override void Add(DrawableHitObject hitObject)
@ -96,8 +96,8 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
/// <summary>
/// The axes which this container should calculate its size from its children on.
/// Note that this is not the same as <see cref="AutoSizeAxes"/>, because that would not allow this container
/// to be relatively sized - desired in the case where the playfield re-defines <see cref="RelativeCoordinateSpace"/>.
/// Note that this is not the same as <see cref="Container{T}.AutoSizeAxes"/>, because that would not allow this container
/// to be relatively sized - desired in the case where the playfield re-defines <see cref="Container{T}.RelativeCoordinateSpace"/>.
/// </summary>
/// <param name="autoSizingAxes"></param>
public RelativeCoordinateAutoSizingContainer(Axes autoSizingAxes)
@ -120,8 +120,8 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
float height = Children.Select(child => child.Y + child.Height).Max();
float width = Children.Select(child => child.X + child.Width).Max();
Size = new Vector2((autoSizingAxes & Axes.X) > 0 ? width : base.Size.X,
(autoSizingAxes & Axes.Y) > 0 ? height : base.Size.Y);
Size = new Vector2((autoSizingAxes & Axes.X) > 0 ? width : Size.X,
(autoSizingAxes & Axes.Y) > 0 ? height : Size.Y);
RelativeCoordinateSpace = new Vector2((autoSizingAxes & Axes.X) > 0 ? width : 1,
(autoSizingAxes & Axes.Y) > 0 ? height : 1);