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

Remove CurvedHitObject to make RepeatSamples not tied to curve.

Browse Source
This commit is contained in:
smoogipooo
2017-04-21 20:29:27 +09:00
parent b8f9a2be6e
commit 5cdbb226f8
13 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Rulesets/Objects/Legacy/Catch/HitObjectParser.cs
View File

@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
ControlPoints = controlPoints,
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
RepeatSamples = repeatSamples
RepeatSamples = repeatSamples,
RepeatCount = repeatCount
};
}

2
osu.Game/Rulesets/Objects/Legacy/Catch/Slider.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
/// <summary>
/// Legacy osu!catch Slider-type, used for parsing Beatmaps.
/// </summary>
internal sealed class Slider : CurvedHitObject, IHasXPosition, IHasCombo
internal sealed class Slider : LegacySlider, IHasXPosition, IHasCombo
{
public float X { get; set; }

33
osu.Game/Rulesets/Objects/CurvedHitObject.cs → osu.Game/Rulesets/Objects/Legacy/LegacySlider.cs
View File

@ -1,21 +1,17 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Game.Rulesets.Objects.Types;
using System;
using System.Collections.Generic;
using OpenTK;
using osu.Game.Audio;
namespace osu.Game.Rulesets.Objects
namespace osu.Game.Rulesets.Objects.Legacy
{
public class CurvedHitObject : HitObject, IHasCurve
internal class LegacySlider : HitObject, IHasCurve
{
public SliderCurve Curve { get; } = new SliderCurve();
public int RepeatCount { get; set; } = 1;
public double EndTime => 0;
public double Duration => 0;
public SliderCurve Curve { get; set; } = new SliderCurve();
public List<Vector2> ControlPoints
{
@ -36,17 +32,24 @@ namespace osu.Game.Rulesets.Objects
}
public List<List<SampleInfo>> RepeatSamples { get; set; } = new List<List<SampleInfo>>();
public int RepeatCount { get; set; } = 1;
public Vector2 PositionAt(double progress) => Curve.PositionAt(ProgressAt(progress));
public double EndTime { get; set; }
public double Duration { get; set; }
public Vector2 PositionAt(double progress)
{
throw new NotImplementedException();
}
public double ProgressAt(double progress)
{
var p = progress * RepeatCount % 1;
if (RepeatAt(progress) % 2 == 1)
p = 1 - p;
return p;
throw new NotImplementedException();
}
public int RepeatAt(double progress) => (int)(progress * RepeatCount);
public int RepeatAt(double progress)
{
throw new NotImplementedException();
}
}
}

4
osu.Game/Rulesets/Objects/Legacy/Mania/HitObjectParser.cs
View File

@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
ControlPoints = controlPoints,
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
RepeatSamples = repeatSamples
RepeatSamples = repeatSamples,
RepeatCount = repeatCount
};
}

2
osu.Game/Rulesets/Objects/Legacy/Mania/Slider.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
/// <summary>
/// Legacy osu!mania Slider-type, used for parsing Beatmaps.
/// </summary>
internal sealed class Slider : CurvedHitObject, IHasXPosition, IHasCombo
internal sealed class Slider : LegacySlider, IHasXPosition, IHasCombo
{
public float X { get; set; }

4
osu.Game/Rulesets/Objects/Legacy/Osu/HitObjectParser.cs
View File

@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
ControlPoints = controlPoints,
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
RepeatSamples = repeatSamples
RepeatSamples = repeatSamples,
RepeatCount = repeatCount
};
}

2
osu.Game/Rulesets/Objects/Legacy/Osu/Slider.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
/// <summary>
/// Legacy osu! Slider-type, used for parsing Beatmaps.
/// </summary>
internal sealed class Slider : CurvedHitObject, IHasPosition, IHasCombo
internal sealed class Slider : LegacySlider, IHasPosition, IHasCombo
{
public Vector2 Position { get; set; }

4
osu.Game/Rulesets/Objects/Legacy/Taiko/HitObjectParser.cs
View File

@ -29,8 +29,8 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
ControlPoints = controlPoints,
Distance = length,
CurveType = curveType,
RepeatCount = repeatCount,
RepeatSamples = repeatSamples
RepeatSamples = repeatSamples,
RepeatCount = repeatCount
};
}

2
osu.Game/Rulesets/Objects/Legacy/Taiko/Slider.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// <summary>
/// Legacy osu!taiko Slider-type, used for parsing Beatmaps.
/// </summary>
internal sealed class Slider : CurvedHitObject, IHasCombo
internal sealed class Slider : LegacySlider, IHasCombo
{
public bool NewCombo { get; set; }
}