h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 19:33:20 +08:00
Code Issues Releases Wiki Activity

Fix conversion types for Catch and Mania.

Browse Source
This commit is contained in:
smoogipooo 2017-04-17 17:25:29 +09:00
parent 09208adf81
commit 04973ae65e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
View File

@ -5,13 +5,13 @@ using osu.Game.Beatmaps;
using osu.Game.Modes.Catch.Objects; using osu.Game.Modes.Catch.Objects;
using System.Collections.Generic; using System.Collections.Generic;
using System; using System;
using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Types;
namespace osu.Game.Modes.Catch.Beatmaps namespace osu.Game.Modes.Catch.Beatmaps
{ {
internal class CatchBeatmapConverter : IBeatmapConverter<CatchBaseHit> internal class CatchBeatmapConverter : IBeatmapConverter<CatchBaseHit>
{ {
public IEnumerable<Type> ValidConversionTypes { get; } = new[] { typeof(HitObject) }; public IEnumerable<Type> ValidConversionTypes { get; } = new[] { typeof(IHasXPosition) };
public Beatmap<CatchBaseHit> Convert(Beatmap original) public Beatmap<CatchBaseHit> Convert(Beatmap original)
{ {

4
osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
View File

@ -5,13 +5,13 @@ using osu.Game.Beatmaps;
using osu.Game.Modes.Mania.Objects; using osu.Game.Modes.Mania.Objects;
using System.Collections.Generic; using System.Collections.Generic;
using System; using System;
using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Types;
namespace osu.Game.Modes.Mania.Beatmaps namespace osu.Game.Modes.Mania.Beatmaps
{ {
internal class ManiaBeatmapConverter : IBeatmapConverter<ManiaBaseHit> internal class ManiaBeatmapConverter : IBeatmapConverter<ManiaBaseHit>
{ {
public IEnumerable<Type> ValidConversionTypes { get; } = new[] { typeof(HitObject) }; public IEnumerable<Type> ValidConversionTypes { get; } = new[] { typeof(IHasColumn) };
public Beatmap<ManiaBaseHit> Convert(Beatmap original) public Beatmap<ManiaBaseHit> Convert(Beatmap original)
{ {

5
osu.Game/Beatmaps/IBeatmapConverter.cs
View File

@ -15,9 +15,8 @@ namespace osu.Game.Beatmaps
public interface IBeatmapConverter<T> where T : HitObject public interface IBeatmapConverter<T> where T : HitObject
{ {
/// <summary> /// <summary>
/// The type of HitObjects that can be converted to be used for this Beatmap. /// The types of HitObjects that can be converted to be used for this Beatmap.
/// </summary> /// </summary>
/// <returns></returns>
IEnumerable<Type> ValidConversionTypes { get; } IEnumerable<Type> ValidConversionTypes { get; }
/// <summary> /// <summary>
@ -35,7 +34,7 @@ namespace osu.Game.Beatmaps
/// </summary> /// </summary>
/// <param name="converter">The Converter to use.</param> /// <param name="converter">The Converter to use.</param>
/// <param name="beatmap">The Beatmap to check.</param> /// <param name="beatmap">The Beatmap to check.</param>
/// <returns>Whether the Beatmap can be converted using <paramref name="converter" />.</returns> /// <returns>Whether the Beatmap can be converted using <paramref name="converter"/>.</returns>
public static bool CanConvert<TObject>(this IBeatmapConverter<TObject> converter, Beatmap beatmap) where TObject : HitObject public static bool CanConvert<TObject>(this IBeatmapConverter<TObject> converter, Beatmap beatmap) where TObject : HitObject
=> converter.ValidConversionTypes.All(t => beatmap.HitObjects.Any(h => t.IsAssignableFrom(h.GetType()))); => converter.ValidConversionTypes.All(t => beatmap.HitObjects.Any(h => t.IsAssignableFrom(h.GetType())));
} }