sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove re-instantiation of clock in EditorClockTestCase

Browse Source
This commit is contained in:
smoogipoo
2018-04-06 18:38:44 +09:00
parent b238130fe4
commit e59124962c
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game/Tests/Visual/EditorClockTestCase.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Input;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Screens.Compose;
@ -17,7 +18,7 @@ namespace osu.Game.Tests.Visual
public abstract class EditorClockTestCase : OsuTestCase
{
protected readonly BindableBeatDivisor BeatDivisor = new BindableBeatDivisor();
protected EditorClock Clock { get; private set; }
protected readonly EditorClock Clock;
private DependencyContainer dependencies;
@ -26,31 +27,26 @@ namespace osu.Game.Tests.Visual
private OsuGameBase osuGame;
protected EditorClockTestCase()
{
Clock = new EditorClock(new ControlPointInfo(), BeatDivisor) { IsCoupled = false };
}
[BackgroundDependencyLoader]
private void load(OsuGameBase osuGame)
{
this.osuGame = osuGame;
dependencies.Cache(BeatDivisor);
osuGame.Beatmap.ValueChanged += reinitializeClock;
reinitializeClock(osuGame.Beatmap.Value);
}
protected override void Dispose(bool isDisposing)
{
osuGame.Beatmap.ValueChanged -= reinitializeClock;
base.Dispose(isDisposing);
}
private void reinitializeClock(WorkingBeatmap working)
{
Clock = new EditorClock(working.Beatmap.ControlPointInfo, BeatDivisor) { IsCoupled = false };
dependencies.CacheAs<IFrameBasedClock>(Clock);
dependencies.CacheAs<IAdjustableClock>(Clock);
osuGame.Beatmap.ValueChanged += beatmapChanged;
beatmapChanged(osuGame.Beatmap.Value);
}
private void beatmapChanged(WorkingBeatmap working) => Clock.ControlPointInfo = working.Beatmap.ControlPointInfo;
protected override bool OnWheel(InputState state)
{
if (state.Mouse.WheelDelta > 0)
@ -60,5 +56,12 @@ namespace osu.Game.Tests.Visual
return true;
}
protected override void Dispose(bool isDisposing)
{
osuGame.Beatmap.ValueChanged -= beatmapChanged;
base.Dispose(isDisposing);
}
}
}