h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Code Issues Releases Wiki Activity

Transition fixes and clock for VisualTest.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-10-24 18:18:54 +08:00
parent 8e766a1f47
commit b671a33911
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
View File

@ -9,6 +9,8 @@ using System.Threading.Tasks;
using osu.Framework.Graphics;
using osu.Framework.GameModes.Testing;
using osu.Game.Overlays;
using osu.Framework.Timing;
using osu.Framework;
namespace osu.Desktop.Tests
{
@ -17,9 +19,19 @@ namespace osu.Desktop.Tests
public override string Name => @"Music Controller";
public override string Description => @"Tests music controller ui.";
IFrameBasedClock ourClock;
protected override IFrameBasedClock Clock => ourClock;
public override void Load(BaseGame game)
{
base.Load(game);
ourClock = new FramedClock();
}
public override void Reset()
{
base.Reset();
ourClock.ProcessFrame();
MusicController mc = new MusicController
{
Origin = Anchor.Centre,
@ -28,5 +40,11 @@ namespace osu.Desktop.Tests
Add(mc);
AddToggle(@"Show", mc.ToggleVisibility);
}
protected override void Update()
{
base.Update();
ourClock.ProcessFrame();
}
}
}

9
osu.Game/Overlays/MusicController.cs
View File

@ -216,21 +216,22 @@ namespace osu.Game.Overlays
if (isNext == true)
{
newBackground.Position = new Vector2(400, 0);
newBackground.MoveToX(0, 200, EasingTypes.Out);
backgroundSprite.MoveToX(-400, 200, EasingTypes.Out);
newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic);
backgroundSprite.Expire();
}
else if (isNext == false)
{
newBackground.Position = new Vector2(-400, 0);
newBackground.MoveToX(0, 200, EasingTypes.Out);
backgroundSprite.MoveToX(400, 200, EasingTypes.Out);
newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
backgroundSprite.MoveToX(400, 500, EasingTypes.OutCubic);
backgroundSprite.Expire();
}
else
{
Remove(backgroundSprite);
}
backgroundSprite = newBackground;
}
private Sprite getScaledSprite(Texture background)