mirror of
https://github.com/ppy/osu.git
synced 2024-11-06 06:57:39 +08:00
ffc7eaa3f2
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward CreateJudgement() must be implemented and return a non-null judgement. This fixes BananaShower and JuiceStreams in osu!catch. This also makes HitObject abstract and cleans up convert HitObject implementations.
140 lines
4.7 KiB
C#
140 lines
4.7 KiB
C#
// 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 NUnit.Framework;
|
|
using osu.Game.Rulesets.Objects;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using osu.Game.Rulesets.Judgements;
|
|
using osu.Framework.Utils;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Game.Graphics.Sprites;
|
|
using osu.Game.Rulesets.Catch.Scoring;
|
|
using osu.Game.Rulesets.Mania.Scoring;
|
|
using osu.Game.Rulesets.Osu.Scoring;
|
|
using osu.Game.Rulesets.Scoring;
|
|
using osu.Game.Rulesets.Taiko.Scoring;
|
|
using osu.Game.Screens.Play.HUD.HitErrorMeters;
|
|
|
|
namespace osu.Game.Tests.Visual.Gameplay
|
|
{
|
|
public class TestSceneHitErrorMeter : OsuTestScene
|
|
{
|
|
public override IReadOnlyList<Type> RequiredTypes => new[]
|
|
{
|
|
typeof(HitErrorMeter),
|
|
typeof(BarHitErrorMeter),
|
|
typeof(ColourHitErrorMeter)
|
|
};
|
|
|
|
private BarHitErrorMeter barMeter;
|
|
private BarHitErrorMeter barMeter2;
|
|
private ColourHitErrorMeter colourMeter;
|
|
private ColourHitErrorMeter colourMeter2;
|
|
private HitWindows hitWindows;
|
|
|
|
public TestSceneHitErrorMeter()
|
|
{
|
|
recreateDisplay(new OsuHitWindows(), 5);
|
|
|
|
AddRepeatStep("New random judgement", () => newJudgement(), 40);
|
|
|
|
AddRepeatStep("New max negative", () => newJudgement(-hitWindows.WindowFor(HitResult.Meh)), 20);
|
|
AddRepeatStep("New max positive", () => newJudgement(hitWindows.WindowFor(HitResult.Meh)), 20);
|
|
AddStep("New fixed judgement (50ms)", () => newJudgement(50));
|
|
}
|
|
|
|
[Test]
|
|
public void TestOsu()
|
|
{
|
|
AddStep("OD 1", () => recreateDisplay(new OsuHitWindows(), 1));
|
|
AddStep("OD 10", () => recreateDisplay(new OsuHitWindows(), 10));
|
|
}
|
|
|
|
[Test]
|
|
public void TestTaiko()
|
|
{
|
|
AddStep("OD 1", () => recreateDisplay(new TaikoHitWindows(), 1));
|
|
AddStep("OD 10", () => recreateDisplay(new TaikoHitWindows(), 10));
|
|
}
|
|
|
|
[Test]
|
|
public void TestMania()
|
|
{
|
|
AddStep("OD 1", () => recreateDisplay(new ManiaHitWindows(), 1));
|
|
AddStep("OD 10", () => recreateDisplay(new ManiaHitWindows(), 10));
|
|
}
|
|
|
|
[Test]
|
|
public void TestCatch()
|
|
{
|
|
AddStep("OD 1", () => recreateDisplay(new CatchHitWindows(), 1));
|
|
AddStep("OD 10", () => recreateDisplay(new CatchHitWindows(), 10));
|
|
}
|
|
|
|
private void recreateDisplay(HitWindows hitWindows, float overallDifficulty)
|
|
{
|
|
this.hitWindows = hitWindows;
|
|
|
|
hitWindows?.SetDifficulty(overallDifficulty);
|
|
|
|
Clear();
|
|
|
|
Add(new FillFlowContainer
|
|
{
|
|
Anchor = Anchor.Centre,
|
|
Origin = Anchor.Centre,
|
|
Direction = FillDirection.Vertical,
|
|
AutoSizeAxes = Axes.Both,
|
|
Children = new[]
|
|
{
|
|
new OsuSpriteText { Text = $@"Great: {hitWindows?.WindowFor(HitResult.Great)}" },
|
|
new OsuSpriteText { Text = $@"Good: {hitWindows?.WindowFor(HitResult.Good)}" },
|
|
new OsuSpriteText { Text = $@"Meh: {hitWindows?.WindowFor(HitResult.Meh)}" },
|
|
}
|
|
});
|
|
|
|
Add(barMeter = new BarHitErrorMeter(hitWindows, true)
|
|
{
|
|
Anchor = Anchor.CentreRight,
|
|
Origin = Anchor.CentreRight,
|
|
});
|
|
|
|
Add(barMeter2 = new BarHitErrorMeter(hitWindows, false)
|
|
{
|
|
Anchor = Anchor.CentreLeft,
|
|
Origin = Anchor.CentreLeft,
|
|
});
|
|
|
|
Add(colourMeter = new ColourHitErrorMeter(hitWindows)
|
|
{
|
|
Anchor = Anchor.CentreRight,
|
|
Origin = Anchor.CentreRight,
|
|
Margin = new MarginPadding { Right = 50 }
|
|
});
|
|
|
|
Add(colourMeter2 = new ColourHitErrorMeter(hitWindows)
|
|
{
|
|
Anchor = Anchor.CentreLeft,
|
|
Origin = Anchor.CentreLeft,
|
|
Margin = new MarginPadding { Left = 50 }
|
|
});
|
|
}
|
|
|
|
private void newJudgement(double offset = 0)
|
|
{
|
|
var judgement = new JudgementResult(new ConvertHitObject(), new Judgement())
|
|
{
|
|
TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
|
|
Type = HitResult.Perfect,
|
|
};
|
|
|
|
barMeter.OnNewJudgement(judgement);
|
|
barMeter2.OnNewJudgement(judgement);
|
|
colourMeter.OnNewJudgement(judgement);
|
|
colourMeter2.OnNewJudgement(judgement);
|
|
}
|
|
}
|
|
}
|