mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 04:13:00 +08:00
Merge branch 'master' into editor-screens
This commit is contained in:
commit
55267abe67
@ -1 +1 @@
|
|||||||
Subproject commit 9d142a8e009794dfee828392e36025d08577131d
|
Subproject commit 5f19dd913dfc69013a3b9cf30ccfd9c44881a321
|
@ -10,6 +10,10 @@ namespace osu.Game.Rulesets.Catch.Tests
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class TestCaseCatchPlayer : Game.Tests.Visual.TestCasePlayer
|
public class TestCaseCatchPlayer : Game.Tests.Visual.TestCasePlayer
|
||||||
{
|
{
|
||||||
|
public TestCaseCatchPlayer() : base(typeof(CatchRuleset))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
protected override Beatmap CreateBeatmap()
|
protected override Beatmap CreateBeatmap()
|
||||||
{
|
{
|
||||||
var beatmap = new Beatmap();
|
var beatmap = new Beatmap();
|
||||||
|
@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Catch.Tests
|
|||||||
{
|
{
|
||||||
public override IReadOnlyList<Type> RequiredTypes => new[]
|
public override IReadOnlyList<Type> RequiredTypes => new[]
|
||||||
{
|
{
|
||||||
typeof(CatcherArea),
|
typeof(Catcher),
|
||||||
};
|
};
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Tests
|
|||||||
new CatchInputManager(rulesets.GetRuleset(2))
|
new CatchInputManager(rulesets.GetRuleset(2))
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Child = new CatcherArea
|
Child = new Catcher
|
||||||
{
|
{
|
||||||
RelativePositionAxes = Axes.Both,
|
RelativePositionAxes = Axes.Both,
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
// 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 osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Rulesets.UI;
|
using osu.Game.Rulesets.UI;
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Game.Rulesets.Catch.Objects;
|
||||||
using osu.Game.Rulesets.Catch.Objects.Drawable;
|
using osu.Game.Rulesets.Catch.Objects.Drawable;
|
||||||
using osu.Game.Rulesets.Judgements;
|
using osu.Game.Rulesets.Judgements;
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
@ -15,11 +17,15 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
{
|
{
|
||||||
protected override Container<Drawable> Content => content;
|
protected override Container<Drawable> Content => content;
|
||||||
private readonly Container<Drawable> content;
|
private readonly Container<Drawable> content;
|
||||||
private readonly CatcherArea catcherArea;
|
|
||||||
|
private readonly Container catcherContainer;
|
||||||
|
private readonly Catcher catcher;
|
||||||
|
|
||||||
public CatchPlayfield()
|
public CatchPlayfield()
|
||||||
: base(Axes.Y)
|
: base(Axes.Y)
|
||||||
{
|
{
|
||||||
|
Container explodingFruitContainer;
|
||||||
|
|
||||||
Reversed.Value = true;
|
Reversed.Value = true;
|
||||||
|
|
||||||
Size = new Vector2(1);
|
Size = new Vector2(1);
|
||||||
@ -33,16 +39,35 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
},
|
},
|
||||||
catcherArea = new CatcherArea
|
explodingFruitContainer = new Container
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
},
|
||||||
|
catcherContainer = new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
Anchor = Anchor.BottomLeft,
|
Anchor = Anchor.BottomLeft,
|
||||||
Origin = Anchor.TopLeft,
|
Origin = Anchor.TopLeft,
|
||||||
Height = 0.3f
|
Height = 180,
|
||||||
|
Child = catcher = new Catcher
|
||||||
|
{
|
||||||
|
ExplodingFruitTarget = explodingFruitContainer,
|
||||||
|
RelativePositionAxes = Axes.Both,
|
||||||
|
Origin = Anchor.TopCentre,
|
||||||
|
X = 0.5f,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void Update()
|
||||||
|
{
|
||||||
|
base.Update();
|
||||||
|
catcher.Size = new Vector2(catcherContainer.DrawSize.Y);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CheckIfWeCanCatch(CatchBaseHit obj) => Math.Abs(catcher.Position.X - obj.X) < catcher.DrawSize.X / DrawSize.X / 2;
|
||||||
|
|
||||||
public override void Add(DrawableHitObject h)
|
public override void Add(DrawableHitObject h)
|
||||||
{
|
{
|
||||||
h.Depth = (float)h.HitObject.StartTime;
|
h.Depth = (float)h.HitObject.StartTime;
|
||||||
@ -50,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
base.Add(h);
|
base.Add(h);
|
||||||
|
|
||||||
var fruit = (DrawableFruit)h;
|
var fruit = (DrawableFruit)h;
|
||||||
fruit.CheckPosition = catcherArea.CheckIfWeCanCatch;
|
fruit.CheckPosition = CheckIfWeCanCatch;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
|
public override void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
|
||||||
@ -59,7 +84,7 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
{
|
{
|
||||||
Vector2 screenPosition = judgedObject.ScreenSpaceDrawQuad.Centre;
|
Vector2 screenPosition = judgedObject.ScreenSpaceDrawQuad.Centre;
|
||||||
Remove(judgedObject);
|
Remove(judgedObject);
|
||||||
catcherArea.Add(judgedObject, screenPosition);
|
catcher.Add(judgedObject, screenPosition);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
193
osu.Game.Rulesets.Catch/UI/Catcher.cs
Normal file
193
osu.Game.Rulesets.Catch/UI/Catcher.cs
Normal file
@ -0,0 +1,193 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Framework.Graphics.Textures;
|
||||||
|
using osu.Framework.Input.Bindings;
|
||||||
|
using osu.Framework.MathUtils;
|
||||||
|
using osu.Game.Rulesets.Catch.Objects;
|
||||||
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
|
using OpenTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Catch.UI
|
||||||
|
{
|
||||||
|
public class Catcher : Container, IKeyBindingHandler<CatchAction>
|
||||||
|
{
|
||||||
|
private Texture texture;
|
||||||
|
|
||||||
|
private Container<DrawableHitObject> caughtFruit;
|
||||||
|
|
||||||
|
public Container ExplodingFruitTarget;
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(TextureStore textures)
|
||||||
|
{
|
||||||
|
texture = textures.Get(@"Play/Catch/fruit-catcher-idle");
|
||||||
|
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
createCatcherSprite(),
|
||||||
|
caughtFruit = new Container<DrawableHitObject>
|
||||||
|
{
|
||||||
|
Anchor = Anchor.TopCentre,
|
||||||
|
Origin = Anchor.BottomCentre,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private int currentDirection;
|
||||||
|
|
||||||
|
private bool dashing;
|
||||||
|
|
||||||
|
protected bool Dashing
|
||||||
|
{
|
||||||
|
get { return dashing; }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (value == dashing) return;
|
||||||
|
|
||||||
|
dashing = value;
|
||||||
|
|
||||||
|
if (dashing)
|
||||||
|
Schedule(addAdditiveSprite);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addAdditiveSprite()
|
||||||
|
{
|
||||||
|
if (!dashing) return;
|
||||||
|
|
||||||
|
var additive = createCatcherSprite();
|
||||||
|
|
||||||
|
additive.RelativePositionAxes = Axes.Both;
|
||||||
|
additive.Blending = BlendingMode.Additive;
|
||||||
|
additive.Position = Position;
|
||||||
|
additive.Scale = Scale;
|
||||||
|
|
||||||
|
((Container)Parent).Add(additive);
|
||||||
|
|
||||||
|
additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint).Expire();
|
||||||
|
|
||||||
|
Scheduler.AddDelayed(addAdditiveSprite, 50);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Sprite createCatcherSprite() => new Sprite
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
FillMode = FillMode.Fit,
|
||||||
|
Texture = texture,
|
||||||
|
OriginPosition = new Vector2(DrawWidth / 2, 10) //temporary until the sprite is aligned correctly.
|
||||||
|
};
|
||||||
|
|
||||||
|
public bool OnPressed(CatchAction action)
|
||||||
|
{
|
||||||
|
switch (action)
|
||||||
|
{
|
||||||
|
case CatchAction.MoveLeft:
|
||||||
|
currentDirection--;
|
||||||
|
return true;
|
||||||
|
case CatchAction.MoveRight:
|
||||||
|
currentDirection++;
|
||||||
|
return true;
|
||||||
|
case CatchAction.Dash:
|
||||||
|
Dashing = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool OnReleased(CatchAction action)
|
||||||
|
{
|
||||||
|
switch (action)
|
||||||
|
{
|
||||||
|
case CatchAction.MoveLeft:
|
||||||
|
currentDirection++;
|
||||||
|
return true;
|
||||||
|
case CatchAction.MoveRight:
|
||||||
|
currentDirection--;
|
||||||
|
return true;
|
||||||
|
case CatchAction.Dash:
|
||||||
|
Dashing = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
|
||||||
|
/// </summary>
|
||||||
|
private const double base_speed = 1.0 / 512;
|
||||||
|
|
||||||
|
protected override void Update()
|
||||||
|
{
|
||||||
|
base.Update();
|
||||||
|
|
||||||
|
if (currentDirection == 0) return;
|
||||||
|
|
||||||
|
double dashModifier = Dashing ? 1 : 0.5;
|
||||||
|
|
||||||
|
Scale = new Vector2(Math.Sign(currentDirection), 1);
|
||||||
|
X = (float)MathHelper.Clamp(X + Math.Sign(currentDirection) * Clock.ElapsedFrameTime * base_speed * dashModifier, 0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Add(DrawableHitObject fruit, Vector2 absolutePosition)
|
||||||
|
{
|
||||||
|
fruit.RelativePositionAxes = Axes.None;
|
||||||
|
fruit.Position = new Vector2(ToLocalSpace(absolutePosition).X - DrawSize.X / 2, 0);
|
||||||
|
|
||||||
|
fruit.Anchor = Anchor.TopCentre;
|
||||||
|
fruit.Origin = Anchor.BottomCentre;
|
||||||
|
fruit.Scale *= 0.7f;
|
||||||
|
fruit.LifetimeEnd = double.MaxValue;
|
||||||
|
|
||||||
|
float distance = fruit.DrawSize.X / 2 * fruit.Scale.X;
|
||||||
|
|
||||||
|
while (caughtFruit.Any(f => f.LifetimeEnd == double.MaxValue && Vector2Extensions.DistanceSquared(f.Position, fruit.Position) < distance * distance))
|
||||||
|
{
|
||||||
|
fruit.X += RNG.Next(-5, 5);
|
||||||
|
fruit.Y -= RNG.Next(0, 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
caughtFruit.Add(fruit);
|
||||||
|
|
||||||
|
if (((CatchBaseHit)fruit.HitObject).LastInCombo)
|
||||||
|
explode();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void explode()
|
||||||
|
{
|
||||||
|
var fruit = caughtFruit.ToArray();
|
||||||
|
|
||||||
|
foreach (var f in fruit)
|
||||||
|
{
|
||||||
|
var originalX = f.X * Scale.X;
|
||||||
|
|
||||||
|
if (ExplodingFruitTarget != null)
|
||||||
|
{
|
||||||
|
f.Anchor = Anchor.TopLeft;
|
||||||
|
f.Position = caughtFruit.ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);
|
||||||
|
|
||||||
|
caughtFruit.Remove(f);
|
||||||
|
|
||||||
|
ExplodingFruitTarget.Add(f);
|
||||||
|
}
|
||||||
|
|
||||||
|
f.MoveToY(f.Y - 50, 250, Easing.OutSine)
|
||||||
|
.Then()
|
||||||
|
.MoveToY(f.Y + 50, 500, Easing.InSine);
|
||||||
|
|
||||||
|
f.MoveToX(f.X + originalX * 6, 1000);
|
||||||
|
f.FadeOut(750);
|
||||||
|
|
||||||
|
f.Expire();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,229 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
|
||||||
using osu.Framework.Graphics.Textures;
|
|
||||||
using osu.Framework.Input.Bindings;
|
|
||||||
using osu.Framework.MathUtils;
|
|
||||||
using osu.Game.Rulesets.Catch.Objects;
|
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
|
||||||
using OpenTK;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Catch.UI
|
|
||||||
{
|
|
||||||
public class CatcherArea : Container
|
|
||||||
{
|
|
||||||
private Catcher catcher;
|
|
||||||
private Container explodingFruitContainer;
|
|
||||||
|
|
||||||
public void Add(DrawableHitObject fruit, Vector2 screenPosition) => catcher.AddToStack(fruit, screenPosition);
|
|
||||||
|
|
||||||
public bool CheckIfWeCanCatch(CatchBaseHit obj) => Math.Abs(catcher.Position.X - obj.X) < catcher.DrawSize.X / DrawSize.X / 2;
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load()
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
explodingFruitContainer = new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
},
|
|
||||||
catcher = new Catcher
|
|
||||||
{
|
|
||||||
RelativePositionAxes = Axes.Both,
|
|
||||||
ExplodingFruitTarget = explodingFruitContainer,
|
|
||||||
Origin = Anchor.TopCentre,
|
|
||||||
X = 0.5f,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Update()
|
|
||||||
{
|
|
||||||
base.Update();
|
|
||||||
|
|
||||||
catcher.Size = new Vector2(DrawSize.Y);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class Catcher : Container, IKeyBindingHandler<CatchAction>
|
|
||||||
{
|
|
||||||
private Texture texture;
|
|
||||||
|
|
||||||
private Container<DrawableHitObject> caughtFruit;
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(TextureStore textures)
|
|
||||||
{
|
|
||||||
texture = textures.Get(@"Play/Catch/fruit-catcher-idle");
|
|
||||||
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
createCatcherSprite(),
|
|
||||||
caughtFruit = new Container<DrawableHitObject>
|
|
||||||
{
|
|
||||||
Anchor = Anchor.TopCentre,
|
|
||||||
Origin = Anchor.BottomCentre,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private int currentDirection;
|
|
||||||
|
|
||||||
private bool dashing;
|
|
||||||
|
|
||||||
public Container ExplodingFruitTarget;
|
|
||||||
|
|
||||||
protected bool Dashing
|
|
||||||
{
|
|
||||||
get { return dashing; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (value == dashing) return;
|
|
||||||
|
|
||||||
dashing = value;
|
|
||||||
|
|
||||||
if (dashing)
|
|
||||||
Schedule(addAdditiveSprite);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addAdditiveSprite()
|
|
||||||
{
|
|
||||||
if (!dashing) return;
|
|
||||||
|
|
||||||
var additive = createCatcherSprite();
|
|
||||||
|
|
||||||
additive.RelativePositionAxes = Axes.Both;
|
|
||||||
additive.Blending = BlendingMode.Additive;
|
|
||||||
additive.Position = Position;
|
|
||||||
additive.Scale = Scale;
|
|
||||||
|
|
||||||
((CatcherArea)Parent).Add(additive);
|
|
||||||
|
|
||||||
additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint).Expire();
|
|
||||||
|
|
||||||
Scheduler.AddDelayed(addAdditiveSprite, 50);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Sprite createCatcherSprite() => new Sprite
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
FillMode = FillMode.Fit,
|
|
||||||
Texture = texture,
|
|
||||||
OriginPosition = new Vector2(DrawWidth / 2, 10) //temporary until the sprite is aligned correctly.
|
|
||||||
};
|
|
||||||
|
|
||||||
public bool OnPressed(CatchAction action)
|
|
||||||
{
|
|
||||||
switch (action)
|
|
||||||
{
|
|
||||||
case CatchAction.MoveLeft:
|
|
||||||
currentDirection--;
|
|
||||||
return true;
|
|
||||||
case CatchAction.MoveRight:
|
|
||||||
currentDirection++;
|
|
||||||
return true;
|
|
||||||
case CatchAction.Dash:
|
|
||||||
Dashing = true;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool OnReleased(CatchAction action)
|
|
||||||
{
|
|
||||||
switch (action)
|
|
||||||
{
|
|
||||||
case CatchAction.MoveLeft:
|
|
||||||
currentDirection++;
|
|
||||||
return true;
|
|
||||||
case CatchAction.MoveRight:
|
|
||||||
currentDirection--;
|
|
||||||
return true;
|
|
||||||
case CatchAction.Dash:
|
|
||||||
Dashing = false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
|
|
||||||
/// </summary>
|
|
||||||
private const double base_speed = 1.0 / 512;
|
|
||||||
|
|
||||||
protected override void Update()
|
|
||||||
{
|
|
||||||
base.Update();
|
|
||||||
|
|
||||||
if (currentDirection == 0) return;
|
|
||||||
|
|
||||||
double dashModifier = Dashing ? 1 : 0.5;
|
|
||||||
|
|
||||||
Scale = new Vector2(Math.Sign(currentDirection), 1);
|
|
||||||
X = (float)MathHelper.Clamp(X + Math.Sign(currentDirection) * Clock.ElapsedFrameTime * base_speed * dashModifier, 0, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddToStack(DrawableHitObject fruit, Vector2 absolutePosition)
|
|
||||||
{
|
|
||||||
fruit.RelativePositionAxes = Axes.None;
|
|
||||||
fruit.Position = new Vector2(ToLocalSpace(absolutePosition).X - DrawSize.X / 2, 0);
|
|
||||||
|
|
||||||
fruit.Anchor = Anchor.TopCentre;
|
|
||||||
fruit.Origin = Anchor.BottomCentre;
|
|
||||||
fruit.Scale *= 0.7f;
|
|
||||||
fruit.LifetimeEnd = double.MaxValue;
|
|
||||||
|
|
||||||
float distance = fruit.DrawSize.X / 2 * fruit.Scale.X;
|
|
||||||
|
|
||||||
while (caughtFruit.Any(f => f.LifetimeEnd == double.MaxValue && Vector2Extensions.DistanceSquared(f.Position, fruit.Position) < distance * distance))
|
|
||||||
{
|
|
||||||
fruit.X += RNG.Next(-5, 5);
|
|
||||||
fruit.Y -= RNG.Next(0, 5);
|
|
||||||
}
|
|
||||||
|
|
||||||
caughtFruit.Add(fruit);
|
|
||||||
|
|
||||||
if (((CatchBaseHit)fruit.HitObject).LastInCombo)
|
|
||||||
explode();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void explode()
|
|
||||||
{
|
|
||||||
var fruit = caughtFruit.ToArray();
|
|
||||||
|
|
||||||
foreach (var f in fruit)
|
|
||||||
{
|
|
||||||
var originalX = f.X * Scale.X;
|
|
||||||
|
|
||||||
if (ExplodingFruitTarget != null)
|
|
||||||
{
|
|
||||||
f.Anchor = Anchor.TopLeft;
|
|
||||||
f.Position = caughtFruit.ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);
|
|
||||||
|
|
||||||
caughtFruit.Remove(f);
|
|
||||||
|
|
||||||
ExplodingFruitTarget.Add(f);
|
|
||||||
}
|
|
||||||
|
|
||||||
f.MoveToY(f.Y - 50, 250, Easing.OutSine)
|
|
||||||
.Then()
|
|
||||||
.MoveToY(f.Y + 50, 500, Easing.InSine);
|
|
||||||
|
|
||||||
f.MoveToX(f.X + originalX * 6, 1000);
|
|
||||||
f.FadeOut(750);
|
|
||||||
|
|
||||||
f.Expire();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -59,7 +59,7 @@
|
|||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="Tests\TestCaseCatcher.cs" />
|
<Compile Include="Tests\TestCaseCatcher.cs" />
|
||||||
<Compile Include="Tests\TestCaseCatchPlayer.cs" />
|
<Compile Include="Tests\TestCaseCatchPlayer.cs" />
|
||||||
<Compile Include="UI\CatcherArea.cs" />
|
<Compile Include="UI\Catcher.cs" />
|
||||||
<Compile Include="UI\CatchRulesetContainer.cs" />
|
<Compile Include="UI\CatchRulesetContainer.cs" />
|
||||||
<Compile Include="UI\CatchPlayfield.cs" />
|
<Compile Include="UI\CatchPlayfield.cs" />
|
||||||
<Compile Include="CatchRuleset.cs" />
|
<Compile Include="CatchRuleset.cs" />
|
||||||
|
@ -58,6 +58,23 @@ namespace osu.Game.Beatmaps
|
|||||||
ComboColors = original?.ComboColors ?? ComboColors;
|
ComboColors = original?.ComboColors ?? ComboColors;
|
||||||
HitObjects = original?.HitObjects ?? HitObjects;
|
HitObjects = original?.HitObjects ?? HitObjects;
|
||||||
Storyboard = original?.Storyboard ?? Storyboard;
|
Storyboard = original?.Storyboard ?? Storyboard;
|
||||||
|
|
||||||
|
if (original == null && Metadata == null)
|
||||||
|
{
|
||||||
|
// we may have no metadata in cases we weren't sourced from the database.
|
||||||
|
// let's fill it (and other related fields) so we don't need to null-check it in future usages.
|
||||||
|
BeatmapInfo = new BeatmapInfo
|
||||||
|
{
|
||||||
|
Metadata = new BeatmapMetadata
|
||||||
|
{
|
||||||
|
Artist = @"Unknown",
|
||||||
|
Title = @"Unknown",
|
||||||
|
Author = @"Unknown Creator",
|
||||||
|
},
|
||||||
|
Version = @"Normal",
|
||||||
|
Difficulty = new BeatmapDifficulty()
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ namespace osu.Game.Beatmaps.Timing
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The minimum duration required for a break to have any effect.
|
/// The minimum duration required for a break to have any effect.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private const double min_break_duration = 650;
|
public const double MIN_BREAK_DURATION = 650;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The break start time.
|
/// The break start time.
|
||||||
@ -28,6 +28,6 @@ namespace osu.Game.Beatmaps.Timing
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether the break has any effect. Breaks that are too short are culled before they are added to the beatmap.
|
/// Whether the break has any effect. Breaks that are too short are culled before they are added to the beatmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool HasEffect => Duration >= min_break_duration;
|
public bool HasEffect => Duration >= MIN_BREAK_DURATION;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -188,11 +188,11 @@ namespace osu.Game
|
|||||||
GetToolbarHeight = () => ToolbarOffset,
|
GetToolbarHeight = () => ToolbarOffset,
|
||||||
Depth = -1
|
Depth = -1
|
||||||
}, overlayContent.Add);
|
}, overlayContent.Add);
|
||||||
LoadComponentAsync(userProfile = new UserProfileOverlay { Depth = -2 }, mainContent.Add);
|
|
||||||
LoadComponentAsync(beatmapSetOverlay = new BeatmapSetOverlay { Depth = -2 }, mainContent.Add);
|
LoadComponentAsync(beatmapSetOverlay = new BeatmapSetOverlay { Depth = -2 }, mainContent.Add);
|
||||||
|
LoadComponentAsync(userProfile = new UserProfileOverlay { Depth = -3 }, mainContent.Add);
|
||||||
LoadComponentAsync(musicController = new MusicController
|
LoadComponentAsync(musicController = new MusicController
|
||||||
{
|
{
|
||||||
Depth = -3,
|
Depth = -4,
|
||||||
Position = new Vector2(0, Toolbar.HEIGHT),
|
Position = new Vector2(0, Toolbar.HEIGHT),
|
||||||
Anchor = Anchor.TopRight,
|
Anchor = Anchor.TopRight,
|
||||||
Origin = Anchor.TopRight,
|
Origin = Anchor.TopRight,
|
||||||
@ -200,7 +200,7 @@ namespace osu.Game
|
|||||||
|
|
||||||
LoadComponentAsync(notificationOverlay = new NotificationOverlay
|
LoadComponentAsync(notificationOverlay = new NotificationOverlay
|
||||||
{
|
{
|
||||||
Depth = -3,
|
Depth = -4,
|
||||||
Anchor = Anchor.TopRight,
|
Anchor = Anchor.TopRight,
|
||||||
Origin = Anchor.TopRight,
|
Origin = Anchor.TopRight,
|
||||||
}, overlayContent.Add);
|
}, overlayContent.Add);
|
||||||
|
@ -9,6 +9,9 @@ using osu.Game.Graphics.Sprites;
|
|||||||
using osu.Game.Users;
|
using osu.Game.Users;
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
using OpenTK.Graphics;
|
using OpenTK.Graphics;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Game.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Cursor;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.BeatmapSet
|
namespace osu.Game.Overlays.BeatmapSet
|
||||||
{
|
{
|
||||||
@ -17,8 +20,11 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
private const float height = 50;
|
private const float height = 50;
|
||||||
|
|
||||||
private readonly UpdateableAvatar avatar;
|
private readonly UpdateableAvatar avatar;
|
||||||
|
private readonly ClickableArea clickableArea;
|
||||||
private readonly FillFlowContainer fields;
|
private readonly FillFlowContainer fields;
|
||||||
|
|
||||||
|
private UserProfileOverlay profile;
|
||||||
|
|
||||||
private BeatmapSetInfo beatmapSet;
|
private BeatmapSetInfo beatmapSet;
|
||||||
public BeatmapSetInfo BeatmapSet
|
public BeatmapSetInfo BeatmapSet
|
||||||
{
|
{
|
||||||
@ -31,6 +37,8 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
var i = BeatmapSet.OnlineInfo;
|
var i = BeatmapSet.OnlineInfo;
|
||||||
|
|
||||||
avatar.User = i.Author;
|
avatar.User = i.Author;
|
||||||
|
clickableArea.Action = () => profile?.ShowUser(avatar.User);
|
||||||
|
|
||||||
fields.Children = new Drawable[]
|
fields.Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new Field("made by", i.Author.Username, @"Exo2.0-RegularItalic"),
|
new Field("made by", i.Author.Username, @"Exo2.0-RegularItalic"),
|
||||||
@ -58,11 +66,15 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
|
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
avatar = new UpdateableAvatar
|
clickableArea = new ClickableArea
|
||||||
{
|
{
|
||||||
Size = new Vector2(height),
|
AutoSizeAxes = Axes.Both,
|
||||||
CornerRadius = 3,
|
CornerRadius = 3,
|
||||||
Masking = true,
|
Masking = true,
|
||||||
|
Child = avatar = new UpdateableAvatar
|
||||||
|
{
|
||||||
|
Size = new Vector2(height),
|
||||||
|
},
|
||||||
EdgeEffect = new EdgeEffectParameters
|
EdgeEffect = new EdgeEffectParameters
|
||||||
{
|
{
|
||||||
Colour = Color4.Black.Opacity(0.25f),
|
Colour = Color4.Black.Opacity(0.25f),
|
||||||
@ -80,6 +92,13 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader(true)]
|
||||||
|
private void load(UserProfileOverlay profile)
|
||||||
|
{
|
||||||
|
this.profile = profile;
|
||||||
|
clickableArea.Action = () => profile?.ShowUser(avatar.User);
|
||||||
|
}
|
||||||
|
|
||||||
private class Field : FillFlowContainer
|
private class Field : FillFlowContainer
|
||||||
{
|
{
|
||||||
public Field(string first, string second, string secondFont)
|
public Field(string first, string second, string secondFont)
|
||||||
@ -103,5 +122,10 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class ClickableArea : OsuClickableContainer, IHasTooltip
|
||||||
|
{
|
||||||
|
public string TooltipText => @"View Profile";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,6 @@ namespace osu.Game.Rulesets
|
|||||||
|
|
||||||
protected override void Prepare(bool reset = false)
|
protected override void Prepare(bool reset = false)
|
||||||
{
|
{
|
||||||
|
|
||||||
Connection.CreateTable<RulesetInfo>();
|
Connection.CreateTable<RulesetInfo>();
|
||||||
|
|
||||||
if (reset)
|
if (reset)
|
||||||
|
@ -51,6 +51,11 @@ namespace osu.Game.Rulesets.Scoring
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly BindableInt Combo = new BindableInt();
|
public readonly BindableInt Combo = new BindableInt();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The current rank.
|
||||||
|
/// </summary>
|
||||||
|
public readonly Bindable<ScoreRank> Rank = new Bindable<ScoreRank>(ScoreRank.X);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// THe highest combo achieved by this score.
|
/// THe highest combo achieved by this score.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -74,6 +79,7 @@ namespace osu.Game.Rulesets.Scoring
|
|||||||
protected ScoreProcessor()
|
protected ScoreProcessor()
|
||||||
{
|
{
|
||||||
Combo.ValueChanged += delegate { HighestCombo.Value = Math.Max(HighestCombo.Value, Combo.Value); };
|
Combo.ValueChanged += delegate { HighestCombo.Value = Math.Max(HighestCombo.Value, Combo.Value); };
|
||||||
|
Accuracy.ValueChanged += delegate { Rank.Value = rankFrom(Accuracy.Value); };
|
||||||
}
|
}
|
||||||
|
|
||||||
private ScoreRank rankFrom(double acc)
|
private ScoreRank rankFrom(double acc)
|
||||||
@ -101,6 +107,7 @@ namespace osu.Game.Rulesets.Scoring
|
|||||||
Accuracy.Value = 1;
|
Accuracy.Value = 1;
|
||||||
Health.Value = 1;
|
Health.Value = 1;
|
||||||
Combo.Value = 0;
|
Combo.Value = 0;
|
||||||
|
Rank.Value = ScoreRank.X;
|
||||||
HighestCombo.Value = 0;
|
HighestCombo.Value = 0;
|
||||||
|
|
||||||
alreadyFailed = false;
|
alreadyFailed = false;
|
||||||
@ -142,7 +149,7 @@ namespace osu.Game.Rulesets.Scoring
|
|||||||
score.Combo = Combo;
|
score.Combo = Combo;
|
||||||
score.MaxCombo = HighestCombo;
|
score.MaxCombo = HighestCombo;
|
||||||
score.Accuracy = Accuracy;
|
score.Accuracy = Accuracy;
|
||||||
score.Rank = rankFrom(Accuracy);
|
score.Rank = Rank;
|
||||||
score.Date = DateTimeOffset.Now;
|
score.Date = DateTimeOffset.Now;
|
||||||
score.Health = Health;
|
score.Health = Health;
|
||||||
}
|
}
|
||||||
|
103
osu.Game/Screens/Play/BreaksOverlay/ArrowsOverlay.cs
Normal file
103
osu.Game/Screens/Play/BreaksOverlay/ArrowsOverlay.cs
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using OpenTK;
|
||||||
|
using osu.Game.Graphics.Containers;
|
||||||
|
using osu.Game.Beatmaps.Timing;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class ArrowsOverlay : VisibilityContainer
|
||||||
|
{
|
||||||
|
private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
|
||||||
|
|
||||||
|
private const int glow_icon_size = 60;
|
||||||
|
private const int glow_icon_blur_sigma = 10;
|
||||||
|
private const float glow_icon_final_offset = 0.22f;
|
||||||
|
private const float glow_icon_offscreen_offset = 0.6f;
|
||||||
|
|
||||||
|
private const int blurred_icon_blur_sigma = 20;
|
||||||
|
private const int blurred_icon_size = 130;
|
||||||
|
private const float blurred_icon_final_offset = 0.35f;
|
||||||
|
private const float blurred_icon_offscreen_offset = 0.7f;
|
||||||
|
|
||||||
|
private readonly GlowIcon leftGlowIcon;
|
||||||
|
private readonly GlowIcon rightGlowIcon;
|
||||||
|
|
||||||
|
private readonly BlurredIcon leftBlurredIcon;
|
||||||
|
private readonly BlurredIcon rightBlurredIcon;
|
||||||
|
|
||||||
|
public ArrowsOverlay()
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both;
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
leftGlowIcon = new GlowIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.CentreRight,
|
||||||
|
X = -glow_icon_offscreen_offset,
|
||||||
|
Icon = Graphics.FontAwesome.fa_chevron_right,
|
||||||
|
BlurSigma = new Vector2(glow_icon_blur_sigma),
|
||||||
|
Size = new Vector2(glow_icon_size),
|
||||||
|
},
|
||||||
|
rightGlowIcon = new GlowIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
X = glow_icon_offscreen_offset,
|
||||||
|
Icon = Graphics.FontAwesome.fa_chevron_left,
|
||||||
|
BlurSigma = new Vector2(glow_icon_blur_sigma),
|
||||||
|
Size = new Vector2(glow_icon_size),
|
||||||
|
},
|
||||||
|
new ParallaxContainer
|
||||||
|
{
|
||||||
|
ParallaxAmount = -0.02f,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
leftBlurredIcon = new BlurredIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.CentreRight,
|
||||||
|
Alpha = 0.7f,
|
||||||
|
X = -blurred_icon_offscreen_offset,
|
||||||
|
Icon = Graphics.FontAwesome.fa_chevron_right,
|
||||||
|
BlurSigma = new Vector2(blurred_icon_blur_sigma),
|
||||||
|
Size = new Vector2(blurred_icon_size),
|
||||||
|
},
|
||||||
|
rightBlurredIcon = new BlurredIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
Alpha = 0.7f,
|
||||||
|
X = blurred_icon_offscreen_offset,
|
||||||
|
Icon = Graphics.FontAwesome.fa_chevron_left,
|
||||||
|
BlurSigma = new Vector2(blurred_icon_blur_sigma),
|
||||||
|
Size = new Vector2(blurred_icon_size),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void PopIn()
|
||||||
|
{
|
||||||
|
leftGlowIcon.MoveToX(-glow_icon_final_offset, fade_duration, Easing.OutQuint);
|
||||||
|
rightGlowIcon.MoveToX(glow_icon_final_offset, fade_duration, Easing.OutQuint);
|
||||||
|
|
||||||
|
leftBlurredIcon.MoveToX(-blurred_icon_final_offset, fade_duration, Easing.OutQuint);
|
||||||
|
rightBlurredIcon.MoveToX(blurred_icon_final_offset, fade_duration, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void PopOut()
|
||||||
|
{
|
||||||
|
leftGlowIcon.MoveToX(-glow_icon_offscreen_offset, fade_duration, Easing.OutQuint);
|
||||||
|
rightGlowIcon.MoveToX(glow_icon_offscreen_offset, fade_duration, Easing.OutQuint);
|
||||||
|
|
||||||
|
leftBlurredIcon.MoveToX(-blurred_icon_offscreen_offset, fade_duration, Easing.OutQuint);
|
||||||
|
rightBlurredIcon.MoveToX(blurred_icon_offscreen_offset, fade_duration, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
51
osu.Game/Screens/Play/BreaksOverlay/BlurredIcon.cs
Normal file
51
osu.Game/Screens/Play/BreaksOverlay/BlurredIcon.cs
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using OpenTK;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class BlurredIcon : BufferedContainer
|
||||||
|
{
|
||||||
|
private readonly SpriteIcon icon;
|
||||||
|
|
||||||
|
public FontAwesome Icon
|
||||||
|
{
|
||||||
|
set { icon.Icon = value; }
|
||||||
|
get { return icon.Icon; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Vector2 Size
|
||||||
|
{
|
||||||
|
set
|
||||||
|
{
|
||||||
|
icon.Size = value;
|
||||||
|
base.Size = value + BlurSigma * 2.5f;
|
||||||
|
ForceRedraw();
|
||||||
|
}
|
||||||
|
get { return base.Size; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlurredIcon()
|
||||||
|
{
|
||||||
|
RelativePositionAxes = Axes.X;
|
||||||
|
CacheDrawnFrameBuffer = true;
|
||||||
|
Child = icon = new SpriteIcon
|
||||||
|
{
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Shadow = false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OsuColour colours)
|
||||||
|
{
|
||||||
|
Colour = colours.BlueLighter;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
151
osu.Game/Screens/Play/BreaksOverlay/BreakOverlay.cs
Normal file
151
osu.Game/Screens/Play/BreaksOverlay/BreakOverlay.cs
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Game.Beatmaps.Timing;
|
||||||
|
using osu.Game.Rulesets.Scoring;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class BreakOverlay : Container
|
||||||
|
{
|
||||||
|
private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
|
||||||
|
private const float remaining_time_container_max_size = 0.3f;
|
||||||
|
private const int vertical_margin = 25;
|
||||||
|
|
||||||
|
private List<BreakPeriod> breaks;
|
||||||
|
public List<BreakPeriod> Breaks
|
||||||
|
{
|
||||||
|
set
|
||||||
|
{
|
||||||
|
breaks = value;
|
||||||
|
initializeBreaks();
|
||||||
|
}
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return breaks;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly bool letterboxing;
|
||||||
|
private readonly LetterboxOverlay letterboxOverlay;
|
||||||
|
private readonly Container remainingTimeAdjustmentBox;
|
||||||
|
private readonly Container remainingTimeBox;
|
||||||
|
private readonly RemainingTimeCounter remainingTimeCounter;
|
||||||
|
private readonly InfoContainer info;
|
||||||
|
private readonly ArrowsOverlay arrowsOverlay;
|
||||||
|
|
||||||
|
public BreakOverlay(bool letterboxing)
|
||||||
|
{
|
||||||
|
this.letterboxing = letterboxing;
|
||||||
|
|
||||||
|
RelativeSizeAxes = Axes.Both;
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
letterboxOverlay = new LetterboxOverlay
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
},
|
||||||
|
remainingTimeAdjustmentBox = new Container
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Width = 0,
|
||||||
|
Child = remainingTimeBox = new Container
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Height = 8,
|
||||||
|
CornerRadius = 4,
|
||||||
|
Masking = true,
|
||||||
|
Child = new Box { RelativeSizeAxes = Axes.Both }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
remainingTimeCounter = new RemainingTimeCounter
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.BottomCentre,
|
||||||
|
Margin = new MarginPadding { Bottom = vertical_margin },
|
||||||
|
},
|
||||||
|
info = new InfoContainer
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.TopCentre,
|
||||||
|
Margin = new MarginPadding { Top = vertical_margin },
|
||||||
|
},
|
||||||
|
arrowsOverlay = new ArrowsOverlay
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initializeBreaks()
|
||||||
|
{
|
||||||
|
FinishTransforms(true);
|
||||||
|
Scheduler.CancelDelayedTasks();
|
||||||
|
|
||||||
|
if (breaks == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
foreach (var b in breaks)
|
||||||
|
{
|
||||||
|
if (!b.HasEffect)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
using (BeginAbsoluteSequence(b.StartTime))
|
||||||
|
{
|
||||||
|
Schedule(() => onBreakIn(b));
|
||||||
|
using (BeginDelayedSequence(b.Duration - fade_duration))
|
||||||
|
Schedule(onBreakOut);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onBreakIn(BreakPeriod b)
|
||||||
|
{
|
||||||
|
if (letterboxing)
|
||||||
|
letterboxOverlay.Show();
|
||||||
|
|
||||||
|
remainingTimeAdjustmentBox
|
||||||
|
.ResizeWidthTo(remaining_time_container_max_size, fade_duration, Easing.OutQuint)
|
||||||
|
.Delay(b.Duration - fade_duration)
|
||||||
|
.ResizeWidthTo(0);
|
||||||
|
|
||||||
|
remainingTimeBox
|
||||||
|
.ResizeWidthTo(0, b.Duration - fade_duration)
|
||||||
|
.Then()
|
||||||
|
.ResizeWidthTo(1);
|
||||||
|
|
||||||
|
remainingTimeCounter.StartCounting(b.EndTime);
|
||||||
|
|
||||||
|
remainingTimeCounter.Show();
|
||||||
|
info.Show();
|
||||||
|
arrowsOverlay.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onBreakOut()
|
||||||
|
{
|
||||||
|
if (letterboxing)
|
||||||
|
letterboxOverlay.Hide();
|
||||||
|
|
||||||
|
remainingTimeCounter.Hide();
|
||||||
|
info.Hide();
|
||||||
|
arrowsOverlay.Hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void BindProcessor(ScoreProcessor processor)
|
||||||
|
{
|
||||||
|
info.AccuracyDisplay.Current.BindTo(processor.Accuracy);
|
||||||
|
info.GradeDisplay.Current.BindTo(processor.Rank);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
65
osu.Game/Screens/Play/BreaksOverlay/GlowIcon.cs
Normal file
65
osu.Game/Screens/Play/BreaksOverlay/GlowIcon.cs
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using OpenTK;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class GlowIcon : Container
|
||||||
|
{
|
||||||
|
private readonly SpriteIcon spriteIcon;
|
||||||
|
private readonly BlurredIcon blurredIcon;
|
||||||
|
|
||||||
|
public override Vector2 Size
|
||||||
|
{
|
||||||
|
set
|
||||||
|
{
|
||||||
|
blurredIcon.Size = spriteIcon.Size = value;
|
||||||
|
blurredIcon.ForceRedraw();
|
||||||
|
}
|
||||||
|
get { return base.Size; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public Vector2 BlurSigma
|
||||||
|
{
|
||||||
|
set { blurredIcon.BlurSigma = value; }
|
||||||
|
get { return blurredIcon.BlurSigma; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public FontAwesome Icon
|
||||||
|
{
|
||||||
|
set { spriteIcon.Icon = blurredIcon.Icon = value; }
|
||||||
|
get { return spriteIcon.Icon; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public GlowIcon()
|
||||||
|
{
|
||||||
|
RelativePositionAxes = Axes.X;
|
||||||
|
AutoSizeAxes = Axes.Both;
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
blurredIcon = new BlurredIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
},
|
||||||
|
spriteIcon = new SpriteIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Shadow = false,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OsuColour colours)
|
||||||
|
{
|
||||||
|
blurredIcon.Colour = colours.Blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
58
osu.Game/Screens/Play/BreaksOverlay/InfoContainer.cs
Normal file
58
osu.Game/Screens/Play/BreaksOverlay/InfoContainer.cs
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using OpenTK;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Game.Graphics.Sprites;
|
||||||
|
using osu.Game.Rulesets.Scoring;
|
||||||
|
using osu.Game.Beatmaps.Timing;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class InfoContainer : VisibilityContainer
|
||||||
|
{
|
||||||
|
private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
|
||||||
|
|
||||||
|
public PercentageInfoLine AccuracyDisplay;
|
||||||
|
public InfoLine<int> RankDisplay;
|
||||||
|
public InfoLine<ScoreRank> GradeDisplay;
|
||||||
|
|
||||||
|
public InfoContainer()
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both;
|
||||||
|
Child = new FillFlowContainer
|
||||||
|
{
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Spacing = new Vector2(5),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new OsuSpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.TopCentre,
|
||||||
|
Origin = Anchor.TopCentre,
|
||||||
|
Text = "current progress".ToUpper(),
|
||||||
|
TextSize = 15,
|
||||||
|
Font = "Exo2.0-Black",
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Origin = Anchor.TopCentre,
|
||||||
|
Anchor = Anchor.TopCentre,
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
AccuracyDisplay = new PercentageInfoLine("Accuracy"),
|
||||||
|
RankDisplay = new InfoLine<int>("Rank"),
|
||||||
|
GradeDisplay = new InfoLine<ScoreRank>("Grade"),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void PopIn() => this.FadeIn(fade_duration);
|
||||||
|
protected override void PopOut() => this.FadeOut(fade_duration);
|
||||||
|
}
|
||||||
|
}
|
82
osu.Game/Screens/Play/BreaksOverlay/InfoLine.cs
Normal file
82
osu.Game/Screens/Play/BreaksOverlay/InfoLine.cs
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Configuration;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Graphics.Sprites;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class InfoLine<T> : Container
|
||||||
|
where T : struct
|
||||||
|
{
|
||||||
|
private const int margin = 2;
|
||||||
|
|
||||||
|
public Bindable<T> Current = new Bindable<T>();
|
||||||
|
|
||||||
|
private readonly OsuSpriteText text;
|
||||||
|
private readonly OsuSpriteText valueText;
|
||||||
|
|
||||||
|
private readonly string prefix;
|
||||||
|
|
||||||
|
public InfoLine(string name, string prefix = @"")
|
||||||
|
{
|
||||||
|
this.prefix = prefix;
|
||||||
|
|
||||||
|
AutoSizeAxes = Axes.Y;
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
text = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.CentreRight,
|
||||||
|
Text = name,
|
||||||
|
TextSize = 17,
|
||||||
|
Margin = new MarginPadding { Right = margin }
|
||||||
|
},
|
||||||
|
valueText = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
Text = prefix + @"-",
|
||||||
|
TextSize = 17,
|
||||||
|
Font = "Exo2.0-Bold",
|
||||||
|
Margin = new MarginPadding { Left = margin }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Current.ValueChanged += currentValueChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void currentValueChanged(T newValue)
|
||||||
|
{
|
||||||
|
var newText = prefix + Format(newValue);
|
||||||
|
|
||||||
|
if (valueText.Text == newText)
|
||||||
|
return;
|
||||||
|
|
||||||
|
valueText.Text = newText;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual string Format(T count) => count.ToString();
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OsuColour colours)
|
||||||
|
{
|
||||||
|
text.Colour = colours.Yellow;
|
||||||
|
valueText.Colour = colours.YellowLight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class PercentageInfoLine : InfoLine<double>
|
||||||
|
{
|
||||||
|
public PercentageInfoLine(string name, string prefix = "") : base(name, prefix)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string Format(double count) => $@"{count:P2}";
|
||||||
|
}
|
||||||
|
}
|
67
osu.Game/Screens/Play/BreaksOverlay/LetterboxOverlay.cs
Normal file
67
osu.Game/Screens/Play/BreaksOverlay/LetterboxOverlay.cs
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using OpenTK.Graphics;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Colour;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Game.Beatmaps.Timing;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class LetterboxOverlay : VisibilityContainer
|
||||||
|
{
|
||||||
|
private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
|
||||||
|
private const int height = 350;
|
||||||
|
|
||||||
|
private static readonly Color4 transparent_black = new Color4(0, 0, 0, 0);
|
||||||
|
|
||||||
|
public LetterboxOverlay()
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both;
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
Anchor = Anchor.TopLeft,
|
||||||
|
Origin = Anchor.TopLeft,
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Height = height,
|
||||||
|
Child = new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = new ColourInfo
|
||||||
|
{
|
||||||
|
TopLeft = Color4.Black,
|
||||||
|
TopRight = Color4.Black,
|
||||||
|
BottomLeft = transparent_black,
|
||||||
|
BottomRight = transparent_black,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Height = height,
|
||||||
|
Child = new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = new ColourInfo
|
||||||
|
{
|
||||||
|
TopLeft = transparent_black,
|
||||||
|
TopRight = transparent_black,
|
||||||
|
BottomLeft = Color4.Black,
|
||||||
|
BottomRight = Color4.Black,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void PopIn() => this.FadeIn(fade_duration);
|
||||||
|
protected override void PopOut() => this.FadeOut(fade_duration);
|
||||||
|
}
|
||||||
|
}
|
65
osu.Game/Screens/Play/BreaksOverlay/RemainingTimeCounter.cs
Normal file
65
osu.Game/Screens/Play/BreaksOverlay/RemainingTimeCounter.cs
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Game.Graphics.Sprites;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using System;
|
||||||
|
using osu.Game.Beatmaps.Timing;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Play.BreaksOverlay
|
||||||
|
{
|
||||||
|
public class RemainingTimeCounter : VisibilityContainer
|
||||||
|
{
|
||||||
|
private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
|
||||||
|
|
||||||
|
private readonly OsuSpriteText counter;
|
||||||
|
|
||||||
|
private int? previousSecond;
|
||||||
|
|
||||||
|
private double endTime;
|
||||||
|
|
||||||
|
private bool isCounting;
|
||||||
|
|
||||||
|
public RemainingTimeCounter()
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both;
|
||||||
|
Child = counter = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
TextSize = 33,
|
||||||
|
Font = "Venera",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public void StartCounting(double endTime)
|
||||||
|
{
|
||||||
|
this.endTime = endTime;
|
||||||
|
isCounting = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Update()
|
||||||
|
{
|
||||||
|
base.Update();
|
||||||
|
|
||||||
|
if (isCounting)
|
||||||
|
{
|
||||||
|
var currentTime = Clock.CurrentTime;
|
||||||
|
if (currentTime < endTime)
|
||||||
|
{
|
||||||
|
int currentSecond = (int)Math.Ceiling((endTime - Clock.CurrentTime) / 1000.0);
|
||||||
|
if (currentSecond != previousSecond)
|
||||||
|
{
|
||||||
|
counter.Text = currentSecond.ToString();
|
||||||
|
previousSecond = currentSecond;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else isCounting = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void PopIn() => this.FadeIn(fade_duration);
|
||||||
|
protected override void PopOut() => this.FadeOut(fade_duration);
|
||||||
|
}
|
||||||
|
}
|
@ -24,6 +24,7 @@ using osu.Game.Screens.Ranking;
|
|||||||
using osu.Framework.Audio.Sample;
|
using osu.Framework.Audio.Sample;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Online.API;
|
using osu.Game.Online.API;
|
||||||
|
using osu.Game.Screens.Play.BreaksOverlay;
|
||||||
using osu.Game.Storyboards.Drawables;
|
using osu.Game.Storyboards.Drawables;
|
||||||
using OpenTK.Graphics;
|
using OpenTK.Graphics;
|
||||||
|
|
||||||
@ -69,6 +70,7 @@ namespace osu.Game.Screens.Play
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
private BreakOverlay breakOverlay;
|
||||||
private Container storyboardContainer;
|
private Container storyboardContainer;
|
||||||
private DrawableStoryboard storyboard;
|
private DrawableStoryboard storyboard;
|
||||||
|
|
||||||
@ -179,16 +181,20 @@ namespace osu.Game.Screens.Play
|
|||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Clock = offsetClock,
|
Clock = offsetClock,
|
||||||
Children = new Drawable[]
|
Child = RulesetContainer,
|
||||||
{
|
|
||||||
RulesetContainer,
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
hudOverlay = new HUDOverlay
|
hudOverlay = new HUDOverlay
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre
|
Origin = Anchor.Centre
|
||||||
},
|
},
|
||||||
|
breakOverlay = new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks)
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Clock = decoupledClock,
|
||||||
|
Breaks = beatmap.Breaks
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
failOverlay = new FailOverlay
|
failOverlay = new FailOverlay
|
||||||
@ -222,6 +228,8 @@ namespace osu.Game.Screens.Play
|
|||||||
|
|
||||||
hudOverlay.ModDisplay.Current.BindTo(working.Mods);
|
hudOverlay.ModDisplay.Current.BindTo(working.Mods);
|
||||||
|
|
||||||
|
breakOverlay.BindProcessor(scoreProcessor);
|
||||||
|
|
||||||
// Bind ScoreProcessor to ourselves
|
// Bind ScoreProcessor to ourselves
|
||||||
scoreProcessor.AllJudged += onCompletion;
|
scoreProcessor.AllJudged += onCompletion;
|
||||||
scoreProcessor.Failed += onFail;
|
scoreProcessor.Failed += onFail;
|
||||||
|
91
osu.Game/Tests/Visual/TestCaseBreakOverlay.cs
Normal file
91
osu.Game/Tests/Visual/TestCaseBreakOverlay.cs
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Timing;
|
||||||
|
using osu.Game.Beatmaps.Timing;
|
||||||
|
using osu.Game.Screens.Play.BreaksOverlay;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Visual
|
||||||
|
{
|
||||||
|
internal class TestCaseBreakOverlay : OsuTestCase
|
||||||
|
{
|
||||||
|
public override string Description => @"Tests breaks behavior";
|
||||||
|
|
||||||
|
private readonly BreakOverlay breakOverlay;
|
||||||
|
|
||||||
|
public TestCaseBreakOverlay()
|
||||||
|
{
|
||||||
|
Clock = new FramedClock();
|
||||||
|
|
||||||
|
Child = breakOverlay = new BreakOverlay(true);
|
||||||
|
|
||||||
|
AddStep("2s break", () => startBreak(2000));
|
||||||
|
AddStep("5s break", () => startBreak(5000));
|
||||||
|
AddStep("10s break", () => startBreak(10000));
|
||||||
|
AddStep("15s break", () => startBreak(15000));
|
||||||
|
AddStep("2s, 2s", startMultipleBreaks);
|
||||||
|
AddStep("0.5s, 0.7s, 1s, 2s", startAnotherMultipleBreaks);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startBreak(double duration)
|
||||||
|
{
|
||||||
|
breakOverlay.Breaks = new List<BreakPeriod>
|
||||||
|
{
|
||||||
|
new BreakPeriod
|
||||||
|
{
|
||||||
|
StartTime = Clock.CurrentTime,
|
||||||
|
EndTime = Clock.CurrentTime + duration,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startMultipleBreaks()
|
||||||
|
{
|
||||||
|
double currentTime = Clock.CurrentTime;
|
||||||
|
|
||||||
|
breakOverlay.Breaks = new List<BreakPeriod>
|
||||||
|
{
|
||||||
|
new BreakPeriod
|
||||||
|
{
|
||||||
|
StartTime = currentTime,
|
||||||
|
EndTime = currentTime + 2000,
|
||||||
|
},
|
||||||
|
new BreakPeriod
|
||||||
|
{
|
||||||
|
StartTime = currentTime + 4000,
|
||||||
|
EndTime = currentTime + 6000,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startAnotherMultipleBreaks()
|
||||||
|
{
|
||||||
|
double currentTime = Clock.CurrentTime;
|
||||||
|
|
||||||
|
breakOverlay.Breaks = new List<BreakPeriod>
|
||||||
|
{
|
||||||
|
new BreakPeriod // Duration is less than 650 - too short to appear
|
||||||
|
{
|
||||||
|
StartTime = currentTime,
|
||||||
|
EndTime = currentTime + 500,
|
||||||
|
},
|
||||||
|
new BreakPeriod
|
||||||
|
{
|
||||||
|
StartTime = currentTime + 1500,
|
||||||
|
EndTime = currentTime + 2200,
|
||||||
|
},
|
||||||
|
new BreakPeriod
|
||||||
|
{
|
||||||
|
StartTime = currentTime + 3200,
|
||||||
|
EndTime = currentTime + 4200,
|
||||||
|
},
|
||||||
|
new BreakPeriod
|
||||||
|
{
|
||||||
|
StartTime = currentTime + 5200,
|
||||||
|
EndTime = currentTime + 7200,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -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.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@ -18,31 +19,39 @@ namespace osu.Game.Tests.Visual
|
|||||||
{
|
{
|
||||||
public class TestCasePlayer : OsuTestCase
|
public class TestCasePlayer : OsuTestCase
|
||||||
{
|
{
|
||||||
|
private readonly Type ruleset;
|
||||||
|
|
||||||
protected Player Player;
|
protected Player Player;
|
||||||
private RulesetStore rulesets;
|
|
||||||
|
|
||||||
public override string Description => @"Showing everything to play the game.";
|
public override string Description => @"Showing everything to play the game.";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create a TestCase which runs through the Player screen.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ruleset">An optional ruleset type which we want to target. If not provided we'll allow all rulesets to be tested.</param>
|
||||||
|
protected TestCasePlayer(Type ruleset)
|
||||||
|
{
|
||||||
|
this.ruleset = ruleset;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TestCasePlayer()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(RulesetStore rulesets)
|
private void load(RulesetStore rulesets)
|
||||||
{
|
{
|
||||||
this.rulesets = rulesets;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void LoadComplete()
|
|
||||||
{
|
|
||||||
base.LoadComplete();
|
|
||||||
|
|
||||||
Add(new Box
|
Add(new Box
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Framework.Graphics.Axes.Both,
|
RelativeSizeAxes = Framework.Graphics.Axes.Both,
|
||||||
Colour = Color4.Black,
|
Colour = Color4.Black,
|
||||||
});
|
});
|
||||||
|
|
||||||
foreach (var r in rulesets.Query<RulesetInfo>())
|
string instantiation = ruleset?.AssemblyQualifiedName;
|
||||||
AddStep(r.Name, () => loadPlayerFor(r));
|
|
||||||
|
|
||||||
loadPlayerFor(rulesets.Query<RulesetInfo>().First());
|
foreach (var r in rulesets.Query<RulesetInfo>(rs => rs.Available && (instantiation == null || rs.InstantiationInfo == instantiation)))
|
||||||
|
AddStep(r.Name, () => loadPlayerFor(r));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual Beatmap CreateBeatmap()
|
protected virtual Beatmap CreateBeatmap()
|
||||||
|
@ -274,6 +274,14 @@
|
|||||||
<Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
|
<Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
|
||||||
<Compile Include="Beatmaps\IO\ArchiveReader.cs" />
|
<Compile Include="Beatmaps\IO\ArchiveReader.cs" />
|
||||||
<Compile Include="Beatmaps\IO\LegacyFilesystemReader.cs" />
|
<Compile Include="Beatmaps\IO\LegacyFilesystemReader.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\ArrowsOverlay.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\BlurredIcon.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\BreakOverlay.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\GlowIcon.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\InfoContainer.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\InfoLine.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\LetterboxOverlay.cs" />
|
||||||
|
<Compile Include="Screens\Play\BreaksOverlay\RemainingTimeCounter.cs" />
|
||||||
<Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
|
<Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
|
||||||
<Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
|
<Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
|
||||||
<Compile Include="Beatmaps\RankStatus.cs" />
|
<Compile Include="Beatmaps\RankStatus.cs" />
|
||||||
@ -740,6 +748,7 @@
|
|||||||
<Compile Include="Tests\Visual\TestCaseBeatmapOptionsOverlay.cs" />
|
<Compile Include="Tests\Visual\TestCaseBeatmapOptionsOverlay.cs" />
|
||||||
<Compile Include="Tests\Visual\TestCaseBeatSyncedContainer.cs" />
|
<Compile Include="Tests\Visual\TestCaseBeatSyncedContainer.cs" />
|
||||||
<Compile Include="Tests\Visual\TestCaseBreadcrumbs.cs" />
|
<Compile Include="Tests\Visual\TestCaseBreadcrumbs.cs" />
|
||||||
|
<Compile Include="Tests\Visual\TestCaseBreakOverlay.cs" />
|
||||||
<Compile Include="Tests\Visual\TestCaseChatDisplay.cs" />
|
<Compile Include="Tests\Visual\TestCaseChatDisplay.cs" />
|
||||||
<Compile Include="Tests\Visual\TestCaseContextMenu.cs" />
|
<Compile Include="Tests\Visual\TestCaseContextMenu.cs" />
|
||||||
<Compile Include="Tests\Visual\TestCaseDialogOverlay.cs" />
|
<Compile Include="Tests\Visual\TestCaseDialogOverlay.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user