Update framework and add rudimentary fading to song select screen.

This commit is contained in:
Thomas Müller
2016-11-20 12:16:54 +01:00
parent 0fdd505807
commit 57e7c7097d
7 changed files with 35 additions and 38 deletions

View File

@ -27,16 +27,12 @@ namespace osu.Desktop.VisualTests.Tests
public override string Description => @"Showing hitobjects and what not.";
FramedClock localClock;
protected override IFrameBasedClock Clock => localClock;
public override void Reset()
{
base.Reset();
//ensure we are at offset 0
localClock = new FramedClock();
Clock = new FramedClock();
List<HitObject> objects = new List<HitObject>();
@ -93,7 +89,7 @@ namespace osu.Desktop.VisualTests.Tests
protected override void Update()
{
base.Update();
localClock.ProcessFrame();
Clock.ProcessFrame();
}
}
}

View File

@ -19,21 +19,17 @@ namespace osu.Desktop.VisualTests.Tests
{
public override string Name => @"Hit Objects";
IFrameBasedClock ourClock;
protected override IFrameBasedClock Clock => ourClock;
public TestCaseHitObjects()
{
var swClock = new StopwatchClock(true) { Rate = 1 };
ourClock = new FramedClock(swClock);
Clock = new FramedClock(swClock);
}
public override void Reset()
{
base.Reset();
ourClock.ProcessFrame();
Clock.ProcessFrame();
Container approachContainer = new Container { Depth = float.MaxValue, };
@ -45,7 +41,7 @@ namespace osu.Desktop.VisualTests.Tests
{
var h = new HitCircle
{
StartTime = ourClock.CurrentTime + 1000 + i * 80,
StartTime = Clock.CurrentTime + 1000 + i * 80,
Position = new Vector2((i - count / 2) * 14),
};
@ -65,7 +61,7 @@ namespace osu.Desktop.VisualTests.Tests
protected override void Update()
{
base.Update();
ourClock.ProcessFrame();
Clock.ProcessFrame();
}
}
}

View File

@ -13,20 +13,17 @@ namespace osu.Desktop.VisualTests.Tests
public override string Name => @"Music Controller";
public override string Description => @"Tests music controller ui.";
IFrameBasedClock ourClock;
protected override IFrameBasedClock Clock => ourClock;
protected MusicController mc;
public TestCaseMusicController()
{
ourClock = new FramedClock();
Clock = new FramedClock();
}
public override void Reset()
{
base.Reset();
ourClock.ProcessFrame();
Clock.ProcessFrame();
mc = new MusicController
{
Origin = Anchor.Centre,
@ -39,7 +36,7 @@ namespace osu.Desktop.VisualTests.Tests
protected override void Update()
{
base.Update();
ourClock.ProcessFrame();
Clock.ProcessFrame();
}
}
}

View File

@ -8,8 +8,6 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Formats;
using OpenTK;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Sprites;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Osu.Objects;
@ -24,16 +22,12 @@ namespace osu.Desktop.VisualTests.Tests
public override string Description => @"Showing everything to play the game.";
FramedClock localClock;
protected override IFrameBasedClock Clock => localClock;
public override void Reset()
{
base.Reset();
//ensure we are at offset 0
localClock = new FramedClock();
Clock = new FramedClock();
var objects = new List<HitObject>();
@ -75,7 +69,7 @@ namespace osu.Desktop.VisualTests.Tests
protected override void Update()
{
base.Update();
localClock.ProcessFrame();
Clock.ProcessFrame();
}
}
}