sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make EditorTimingTimeline support beatmap changes

Browse Source
This commit is contained in:
smoogipooo
2017-09-20 15:40:27 +09:00
parent 67d3861226
commit 01c3818ea0
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game/Tests/Visual/TestCaseEditorTimingTimeline.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// 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.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenTK; using OpenTK;
@ -13,6 +14,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Lists; 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;
@ -158,7 +160,8 @@ namespace osu.Game.Tests.Visual
beatmap.BindTo(osuGame.Beatmap); beatmap.BindTo(osuGame.Beatmap);
markerContainer.RelativeChildSize = new Vector2((float)beatmap.Value.Track.Length, 1); markerContainer.RelativeChildSize = new Vector2((float)Math.Max(1, beatmap.Value.Track.Length), 1);
beatmap.ValueChanged += b => markerContainer.RelativeChildSize = new Vector2((float)Math.Max(1, b.Track.Length), 1);
} }
protected override bool OnDragStart(InputState state) => true; protected override bool OnDragStart(InputState state) => true;
@ -194,13 +197,8 @@ namespace osu.Game.Tests.Visual
private class ControlPointTimeline : Timeline private class ControlPointTimeline : Timeline
{ {
[BackgroundDependencyLoader] protected override void LoadBeatmap(WorkingBeatmap beatmap)
private void load(OsuGameBase osuGame, OsuColour colours)
{ {
var beatmap = osuGame.Beatmap.Value;
if (beatmap == null)
return;
ControlPointInfo cpi = beatmap.Beatmap.ControlPointInfo; ControlPointInfo cpi = beatmap.Beatmap.ControlPointInfo;
cpi.TimingPoints.ForEach(addTimingPoint); cpi.TimingPoints.ForEach(addTimingPoint);
@ -254,13 +252,8 @@ namespace osu.Game.Tests.Visual
private class BookmarkTimeline : Timeline private class BookmarkTimeline : Timeline
{ {
[BackgroundDependencyLoader] protected override void LoadBeatmap(WorkingBeatmap beatmap)
private void load(OsuGameBase osuGame)
{ {
var beatmap = osuGame.Beatmap.Value;
if (beatmap == null)
return;
foreach (int bookmark in beatmap.BeatmapInfo.Bookmarks) foreach (int bookmark in beatmap.BeatmapInfo.Bookmarks)
Add(new BookmarkVisualisation(bookmark)); Add(new BookmarkVisualisation(bookmark));
} }
@ -279,13 +272,8 @@ namespace osu.Game.Tests.Visual
private class BreakTimeline : Timeline private class BreakTimeline : Timeline
{ {
[BackgroundDependencyLoader] protected override void LoadBeatmap(WorkingBeatmap beatmap)
private void load(OsuGameBase osuGame)
{ {
var beatmap = osuGame.Beatmap.Value;
if (beatmap == null)
return;
foreach (var breakPeriod in beatmap.Beatmap.Breaks) foreach (var breakPeriod in beatmap.Beatmap.Breaks)
Add(new BreakVisualisation(breakPeriod)); Add(new BreakVisualisation(breakPeriod));
} }
@ -314,16 +302,21 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase osuGame) private void load(OsuGameBase osuGame)
{ {
var beatmap = osuGame.Beatmap.Value; osuGame.Beatmap.ValueChanged += b =>
if (beatmap == null) {
return; timeline.Clear();
timeline.RelativeChildSize = new Vector2((float)Math.Max(1, b.Track.Length), 1);
LoadBeatmap(b);
};
timeline.RelativeChildSize = new Vector2((float)beatmap.Track.Length, 1); timeline.RelativeChildSize = new Vector2((float)Math.Max(1, osuGame.Beatmap.Value.Track.Length), 1);
LoadBeatmap(osuGame.Beatmap);
} }
protected void Add(PointVisualisation visualisation) => timeline.Add(visualisation); protected void Add(PointVisualisation visualisation) => timeline.Add(visualisation);
protected void Add(DurationVisualisation visualisation) => timeline.Add(visualisation); protected void Add(DurationVisualisation visualisation) => timeline.Add(visualisation);
protected abstract void LoadBeatmap(WorkingBeatmap beatmap);
} }
private class PointVisualisation : Box private class PointVisualisation : Box