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

Revert changes to make HitObject abstract

Browse Source
This commit is contained in:
Dean Herbert
2020-02-25 19:07:15 +09:00
parent 401bf1c928
commit a047456354
12 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
View File

@ -20,6 +20,7 @@ using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Legacy;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.UI;
@ -163,7 +164,7 @@ namespace osu.Game.Tests.Visual.Gameplay
var beatmap = new Beatmap<HitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
for (int i = 0; i < 10; i++)
beatmap.HitObjects.Add(new ConvertHitObject { StartTime = i * time_range });
beatmap.HitObjects.Add(new HitObject { StartTime = i * time_range });
return beatmap;
}

4
osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
View File

@ -2,7 +2,6 @@
// 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;
@ -12,6 +11,7 @@ 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.Objects;
using osu.Game.Rulesets.Osu.Scoring;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.Taiko.Scoring;
@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private void newJudgement(double offset = 0)
{
var judgement = new JudgementResult(new ConvertHitObject(), new Judgement())
var judgement = new JudgementResult(new HitObject(), new Judgement())
{
TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
Type = HitResult.Perfect,

4
osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
View File

@ -224,7 +224,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private class TestDrawableControlPoint : DrawableHitObject<HitObject>
{
public TestDrawableControlPoint(ScrollingDirection direction, double time)
: base(new ConvertHitObject { StartTime = time })
: base(new HitObject { StartTime = time })
{
Origin = Anchor.Centre;
@ -255,7 +255,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private class TestDrawableHitObject : DrawableHitObject<HitObject>
{
public TestDrawableHitObject(double time)
: base(new ConvertHitObject { StartTime = time })
: base(new HitObject { StartTime = time })
{
Origin = Anchor.Custom;
OriginPosition = new Vector2(75 / 4.0f);

4
osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
View File

@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
var objects = new List<HitObject>();
for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
objects.Add(new ConvertHitObject { StartTime = i });
objects.Add(new HitObject { StartTime = i });
replaceObjects(objects);
}
@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
var objects = new List<HitObject>();
for (double i = 0; i < 5000; i++)
objects.Add(new ConvertHitObject { StartTime = i });
objects.Add(new HitObject { StartTime = i });
replaceObjects(objects);
}

1
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
View File

@ -13,6 +13,7 @@ using osu.Game.Rulesets;
using osu.Game.Rulesets.Catch;
using osu.Game.Rulesets.Mania;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Legacy;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Taiko;