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

Fix failing unit test, move legacy hitobjects to Objects/Legacy/.

Browse Source
This commit is contained in:
smoogipooo
2017-03-14 18:06:32 +09:00
parent d6ccc66b23
commit 1f43370886
6 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Modes/Objects/Hit.cs → osu.Game/Modes/Objects/Legacy/LegacyHit.cs
View File

@ -4,9 +4,12 @@
using osu.Game.Modes.Objects.Types;
using OpenTK;
namespace osu.Game.Modes.Objects
namespace osu.Game.Modes.Objects.Legacy
{
internal class Hit : HitObject, IHasPosition, IHasCombo
/// <summary>
/// Base Hit-type, used for parsing Beatmaps.
/// </summary>
public sealed class LegacyHit : HitObject, IHasPosition, IHasCombo
{
public Vector2 Position { get; set; }

9
osu.Game/Modes/Objects/Slider.cs → osu.Game/Modes/Objects/Legacy/LegacySlider.cs
View File

@ -1,13 +1,16 @@
// 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.Game.Modes.Objects.Types;
using System.Collections.Generic;
using osu.Game.Modes.Objects.Types;
using OpenTK;
namespace osu.Game.Modes.Objects
namespace osu.Game.Modes.Objects.Legacy
{
internal class Slider : HitObject, IHasCurve, IHasPosition, IHasDistance, IHasRepeats, IHasCombo
/// <summary>
/// Base Slider-type, used for parsing Beatmaps.
/// </summary>
public sealed class LegacySlider : HitObject, IHasCurve, IHasPosition, IHasDistance, IHasRepeats, IHasCombo
{
public List<Vector2> ControlPoints { get; set; }
public CurveType CurveType { get; set; }

7
osu.Game/Modes/Objects/Spinner.cs → osu.Game/Modes/Objects/Legacy/LegacySpinner.cs
View File

@ -3,9 +3,12 @@
using osu.Game.Modes.Objects.Types;
namespace osu.Game.Modes.Objects
namespace osu.Game.Modes.Objects.Legacy
{
internal class Spinner : HitObject, IHasEndTime
/// <summary>
/// Base Spinner-type, used for parsing Beatmaps.
/// </summary>
internal class LegacySpinner : HitObject, IHasEndTime
{
public double EndTime { get; set; }

7
osu.Game/Modes/Objects/LegacyHitObjectParser.cs
View File

@ -7,6 +7,7 @@ using osu.Game.Modes.Objects.Types;
using System;
using System.Collections.Generic;
using System.Globalization;
using osu.Game.Modes.Objects.Legacy;
namespace osu.Game.Modes.Objects
{
@ -24,7 +25,7 @@ namespace osu.Game.Modes.Objects
switch (type)
{
case HitObjectType.Circle:
result = new Hit
result = new LegacyHit
{
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
NewCombo = combo
@ -74,7 +75,7 @@ namespace osu.Game.Modes.Objects
if (split.Length > 7)
length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
result = new Slider
result = new LegacySlider
{
ControlPoints = points,
Distance = length,
@ -85,7 +86,7 @@ namespace osu.Game.Modes.Objects
};
break;
case HitObjectType.Spinner:
result = new Spinner
result = new LegacySpinner
{
EndTime = Convert.ToDouble(split[5], CultureInfo.InvariantCulture)
};