mirror of
https://github.com/osukey/osukey.git
synced 2025-06-08 04:48:04 +09:00
CI fixes
This commit is contained in:
parent
5978668d2b
commit
3da3ef1a50
@ -2,10 +2,8 @@
|
|||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
using OpenTK.Graphics;
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Audio.Track;
|
using osu.Framework.Audio.Track;
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
@ -15,8 +13,6 @@ using osu.Framework.Graphics.Containers;
|
|||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Graphics.Textures;
|
using osu.Framework.Graphics.Textures;
|
||||||
using osu.Framework.Input;
|
using osu.Framework.Input;
|
||||||
using osu.Framework.Lists;
|
|
||||||
using osu.Framework.MathUtils;
|
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Beatmaps.ControlPoints;
|
using osu.Game.Beatmaps.ControlPoints;
|
||||||
using osu.Game.Beatmaps.Timing;
|
using osu.Game.Beatmaps.Timing;
|
||||||
@ -42,7 +38,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuGameBase osuGame, BeatmapManager beatmaps)
|
private void load(OsuGameBase osuGame)
|
||||||
{
|
{
|
||||||
var beatmap = new Beatmap();
|
var beatmap = new Beatmap();
|
||||||
|
|
||||||
@ -113,14 +109,14 @@ namespace osu.Game.Tests.Visual
|
|||||||
Masking = true;
|
Masking = true;
|
||||||
CornerRadius = 5;
|
CornerRadius = 5;
|
||||||
|
|
||||||
InternalChildren = new Drawable[]
|
InternalChildren = new[]
|
||||||
{
|
{
|
||||||
background = new Box { RelativeSizeAxes = Axes.Both },
|
background = new Box { RelativeSizeAxes = Axes.Both },
|
||||||
new Container
|
new Container
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Padding = new MarginPadding { Left = contents_padding, Right = contents_padding },
|
Padding = new MarginPadding { Left = contents_padding, Right = contents_padding },
|
||||||
Children = new Drawable[]
|
Children = new[]
|
||||||
{
|
{
|
||||||
markerContainer = new Container
|
markerContainer = new Container
|
||||||
{
|
{
|
||||||
@ -303,12 +299,9 @@ namespace osu.Game.Tests.Visual
|
|||||||
|
|
||||||
private abstract class ControlPointVisualisation : PointVisualisation
|
private abstract class ControlPointVisualisation : PointVisualisation
|
||||||
{
|
{
|
||||||
public readonly ControlPoint ControlPoint;
|
protected ControlPointVisualisation(ControlPoint controlPoint)
|
||||||
|
|
||||||
public ControlPointVisualisation(ControlPoint controlPoint)
|
|
||||||
: base(controlPoint.Time)
|
: base(controlPoint.Time)
|
||||||
{
|
{
|
||||||
ControlPoint = controlPoint;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -366,7 +359,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
private readonly Container timeline;
|
private readonly Container timeline;
|
||||||
|
|
||||||
public Timeline()
|
protected Timeline()
|
||||||
{
|
{
|
||||||
AddInternal(timeline = new Container { RelativeSizeAxes = Axes.Both });
|
AddInternal(timeline = new Container { RelativeSizeAxes = Axes.Both });
|
||||||
}
|
}
|
||||||
@ -396,12 +389,8 @@ namespace osu.Game.Tests.Visual
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private class PointVisualisation : Box
|
private class PointVisualisation : Box
|
||||||
{
|
{
|
||||||
public readonly double StartTime;
|
protected PointVisualisation(double startTime)
|
||||||
|
|
||||||
public PointVisualisation(double startTime)
|
|
||||||
{
|
{
|
||||||
StartTime = startTime;
|
|
||||||
|
|
||||||
Origin = Anchor.TopCentre;
|
Origin = Anchor.TopCentre;
|
||||||
|
|
||||||
RelativeSizeAxes = Axes.Y;
|
RelativeSizeAxes = Axes.Y;
|
||||||
@ -418,14 +407,8 @@ namespace osu.Game.Tests.Visual
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private class DurationVisualisation : Container
|
private class DurationVisualisation : Container
|
||||||
{
|
{
|
||||||
public readonly double StartTime;
|
protected DurationVisualisation(double startTime, double endTime)
|
||||||
public readonly double EndTIme;
|
|
||||||
|
|
||||||
public DurationVisualisation(double startTime, double endTime)
|
|
||||||
{
|
{
|
||||||
StartTime = startTime;
|
|
||||||
EndTIme = endTime;
|
|
||||||
|
|
||||||
Masking = true;
|
Masking = true;
|
||||||
CornerRadius = corner_radius;
|
CornerRadius = corner_radius;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user