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

Merge both variants of the star rating display

Browse Source
This commit is contained in:
Salman Ahmed
2021-07-17 06:54:11 +03:00
parent 0a8d37defa
commit d4399f10f9
8 changed files with 56 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
View File

@ -1,65 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Screens.Ranking.Expanded;
using osuTK;
namespace osu.Game.Tests.Visual.Ranking
{
public class TestSceneStarRatingDisplay : OsuTestScene
{
[Test]
public void TestDisplay()
{
AddStep("load displays", () => Child = new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
ChildrenEnumerable = new[]
{
1.23,
2.34,
3.45,
4.56,
5.67,
6.78,
10.11,
}.Select(starRating => new StarRatingDisplay(new StarDifficulty(starRating, 0))
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
})
});
}
[Test]
public void TestChangingStarRatingDisplay()
{
StarRatingDisplay starRating = null;
AddStep("load display", () => Child = starRating = new StarRatingDisplay(new StarDifficulty(5.55, 1))
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(3f),
});
AddRepeatStep("set random value", () =>
{
starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), 1);
}, 10);
AddSliderStep("set exact stars", 0.0, 11.0, 5.55, d =>
{
if (starRating != null)
starRating.Current.Value = new StarDifficulty(d, 1);
});
}
}
}

36
osu.Game.Tests/Visual/UserInterface/TestSceneStarRatingDisplayV2.cs → osu.Game.Tests/Visual/UserInterface/TestSceneStarRatingDisplay.cs
View File

@ -12,12 +12,36 @@ using osuTK;
namespace osu.Game.Tests.Visual.UserInterface
{
public class TestSceneStarRatingDisplayV2 : OsuTestScene
public class TestSceneStarRatingDisplay : OsuTestScene
{
[Test]
public void TestOldColoursDisplay()
{
AddStep("load displays", () => Child = new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
ChildrenEnumerable = new[]
{
1.23,
2.34,
3.45,
4.56,
5.67,
6.78,
10.11,
}.Select(starRating => new StarRatingDisplay(new StarDifficulty(starRating, 0))
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
})
});
}
[TestCase(52f, 20f)]
[TestCase(52f, 16f)]
[TestCase(50f, 14f)]
public void TestDisplay(float width, float height)
public void TestNewColoursDisplay(float width, float height)
{
AddStep("load displays", () =>
{
@ -35,7 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(2f),
Direction = FillDirection.Vertical,
ChildrenEnumerable = Enumerable.Range(0, 10).Select(j => new StarRatingDisplayV2(new StarDifficulty(i + j * 0.1f, 0))
ChildrenEnumerable = Enumerable.Range(0, 10).Select(j => new StarRatingDisplay(new StarDifficulty(i + j * 0.1f, 0), true)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -47,11 +71,11 @@ namespace osu.Game.Tests.Visual.UserInterface
}
[Test]
public void TestChangingStarRatingDisplay()
public void TestChangingStarRatingDisplay([Values(false, true)] bool useNewColours)
{
StarRatingDisplayV2 starRating = null;
StarRatingDisplay starRating = null;
AddStep("load display", () => Child = starRating = new StarRatingDisplayV2(new StarDifficulty(5.55, 1))
AddStep("load display", () => Child = starRating = new StarRatingDisplay(new StarDifficulty(5.55, 1), useNewColours)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,