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

Rework beatmap post-processing into HitRenderer.

Browse Source
This commit is contained in:
smoogipooo
2017-03-14 17:01:21 +09:00
parent 90ad2e9731
commit 7141bc86d3
24 changed files with 144 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Modes/Objects/Hit.cs
View File

@ -6,8 +6,10 @@ using OpenTK;
namespace osu.Game.Modes.Objects
{
internal class Hit : HitObjectWithCombo, IHasPosition
internal class Hit : HitObject, IHasPosition, IHasCombo
{
public Vector2 Position { get; set; }
public bool NewCombo { get; set; }
}
}

15
osu.Game/Modes/Objects/HitObjectWithCombo.cs
View File

@ -1,15 +0,0 @@
// 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 OpenTK.Graphics;
namespace osu.Game.Modes.Objects
{
internal class HitObjectWithCombo : HitObject, IHasCombo
{
public Color4 ComboColour { get; set; }
public bool NewCombo { get; set; }
public int ComboIndex { get; set; }
}
}

4
osu.Game/Modes/Objects/Slider.cs
View File

@ -7,7 +7,7 @@ using OpenTK;
namespace osu.Game.Modes.Objects
{
internal class Slider : HitObjectWithCombo, IHasCurve, IHasPosition, IHasDistance, IHasRepeats
internal class Slider : HitObject, IHasCurve, IHasPosition, IHasDistance, IHasRepeats, IHasCombo
{
public List<Vector2> ControlPoints { get; set; }
public CurveType CurveType { get; set; }
@ -17,5 +17,7 @@ namespace osu.Game.Modes.Objects
public double Distance { get; set; }
public int RepeatCount { get; set; }
public bool NewCombo { get; set; }
}
}

12
osu.Game/Modes/Objects/Types/IHasCombo.cs
View File

@ -1,8 +1,6 @@
// 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.Graphics;
namespace osu.Game.Modes.Objects.Types
{
/// <summary>
@ -10,19 +8,9 @@ namespace osu.Game.Modes.Objects.Types
/// </summary>
public interface IHasCombo
{
/// <summary>
/// The colour of this HitObject in the combo.
/// </summary>
Color4 ComboColour { get; }
/// <summary>
/// Whether the HitObject starts a new combo.
/// </summary>
bool NewCombo { get; }
/// <summary>
/// The combo index.
/// </summary>
int ComboIndex { get; }
}
}