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

Remove acronym shortening of GameplayClockContainer

Browse Source
This commit is contained in:
Dean Herbert
2022-01-31 15:23:31 +09:00
parent 6556a7e3c3
commit 25cbe5a0de
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
View File

@ -29,44 +29,44 @@ namespace osu.Game.Tests.Gameplay
[Test] [Test]
public void TestStartThenElapsedTime() public void TestStartThenElapsedTime()
{ {
GameplayClockContainer gcc = null; GameplayClockContainer gameplayClockContainer = null;
AddStep("create container", () => AddStep("create container", () =>
{ {
var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo); var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
working.LoadTrack(); working.LoadTrack();
Add(gcc = new MasterGameplayClockContainer(working, 0)); Add(gameplayClockContainer = new MasterGameplayClockContainer(working, 0));
}); });
AddStep("start clock", () => gcc.Start()); AddStep("start clock", () => gameplayClockContainer.Start());
AddUntilStep("elapsed greater than zero", () => gcc.GameplayClock.ElapsedFrameTime > 0); AddUntilStep("elapsed greater than zero", () => gameplayClockContainer.GameplayClock.ElapsedFrameTime > 0);
} }
[Test] [Test]
public void TestElapseThenReset() public void TestElapseThenReset()
{ {
GameplayClockContainer gcc = null; GameplayClockContainer gameplayClockContainer = null;
AddStep("create container", () => AddStep("create container", () =>
{ {
var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo); var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
working.LoadTrack(); working.LoadTrack();
Add(gcc = new MasterGameplayClockContainer(working, 0)); Add(gameplayClockContainer = new MasterGameplayClockContainer(working, 0));
}); });
AddStep("start clock", () => gcc.Start()); AddStep("start clock", () => gameplayClockContainer.Start());
AddUntilStep("current time greater 2000", () => gcc.GameplayClock.CurrentTime > 2000); AddUntilStep("current time greater 2000", () => gameplayClockContainer.GameplayClock.CurrentTime > 2000);
double timeAtReset = 0; double timeAtReset = 0;
AddStep("reset clock", () => AddStep("reset clock", () =>
{ {
timeAtReset = gcc.GameplayClock.CurrentTime; timeAtReset = gameplayClockContainer.GameplayClock.CurrentTime;
gcc.Reset(); gameplayClockContainer.Reset();
}); });
AddAssert("current time < time at reset", () => gcc.GameplayClock.CurrentTime < timeAtReset); AddAssert("current time < time at reset", () => gameplayClockContainer.GameplayClock.CurrentTime < timeAtReset);
} }
[Test] [Test]
@ -76,29 +76,29 @@ namespace osu.Game.Tests.Gameplay
[Values(false, true)] bool whileStopped) [Values(false, true)] bool whileStopped)
{ {
ClockBackedTestWorkingBeatmap working = null; ClockBackedTestWorkingBeatmap working = null;
GameplayClockContainer gcc = null; GameplayClockContainer gameplayClockContainer = null;
AddStep("create container", () => AddStep("create container", () =>
{ {
working = new ClockBackedTestWorkingBeatmap(new OsuRuleset().RulesetInfo, new FramedClock(new ManualClock()), Audio); working = new ClockBackedTestWorkingBeatmap(new OsuRuleset().RulesetInfo, new FramedClock(new ManualClock()), Audio);
working.LoadTrack(); working.LoadTrack();
Add(gcc = new MasterGameplayClockContainer(working, 0)); Add(gameplayClockContainer = new MasterGameplayClockContainer(working, 0));
if (whileStopped) if (whileStopped)
gcc.Stop(); gameplayClockContainer.Stop();
gcc.Reset(); gameplayClockContainer.Reset();
}); });
AddStep($"set clock rate to {clockRate}", () => working.Track.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(clockRate))); AddStep($"set clock rate to {clockRate}", () => working.Track.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(clockRate)));
AddStep($"set audio offset to {userOffset}", () => localConfig.SetValue(OsuSetting.AudioOffset, userOffset)); AddStep($"set audio offset to {userOffset}", () => localConfig.SetValue(OsuSetting.AudioOffset, userOffset));
AddStep("seek to 2500", () => gcc.Seek(2500)); AddStep("seek to 2500", () => gameplayClockContainer.Seek(2500));
AddAssert("gameplay clock time = 2500", () => Precision.AlmostEquals(gcc.CurrentTime, 2500, 10f)); AddAssert("gameplay clock time = 2500", () => Precision.AlmostEquals(gameplayClockContainer.CurrentTime, 2500, 10f));
AddStep("seek to 10000", () => gcc.Seek(10000)); AddStep("seek to 10000", () => gameplayClockContainer.Seek(10000));
AddAssert("gameplay clock time = 10000", () => Precision.AlmostEquals(gcc.CurrentTime, 10000, 10f)); AddAssert("gameplay clock time = 10000", () => Precision.AlmostEquals(gameplayClockContainer.CurrentTime, 10000, 10f));
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)