RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from smoogipooo/remove_type_enums 

Remove hit object types solution-wide.
This commit is contained in:
Dean Herbert 2017-03-20 13:16:36 +09:00 committed by GitHub
parent 139dd456fb 090e8bbb79
commit df17f2c996
12 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
View File

@ -144,5 +144,12 @@ private void add(DrawableOsuHitObject h)
if (proxyable != null)
approachContainer.Add(proxyable.ProxiedLayer.CreateProxy());
}
private enum HitObjectType
{
Circle,
Slider,
Spinner
}
}
}

1
osu.Game.Modes.Osu/Objects/HitCircle.cs
View File

@ -5,6 +5,5 @@ namespace osu.Game.Modes.Osu.Objects
{
public class HitCircle : OsuHitObject
{
public override HitObjectType Type => HitObjectType.Circle;
}
}

13
osu.Game.Modes.Osu/Objects/HitObjectType.cs
View File

@ -1,13 +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
namespace osu.Game.Modes.Osu.Objects
{
public enum HitObjectType
{
Circle,
Slider,
Spinner,
SliderTick
}
}

2
osu.Game.Modes.Osu/Objects/OsuHitObject.cs
View File

@ -36,8 +36,6 @@ public abstract class OsuHitObject : HitObject, IHasCombo, IHasPosition
public float Scale { get; set; } = 1;
public abstract HitObjectType Type { get; }
public Color4 ComboColour { get; set; }
public virtual bool NewCombo { get; set; }
public int ComboIndex { get; set; }

6
osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs
View File

@ -148,11 +148,11 @@ private void calculateSpecificStrain(OsuHitObjectDifficulty previousHitObject, O
double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
double decay = Math.Pow(DECAY_BASE[(int)type], timeElapsed / 1000);
if (BaseHitObject.Type == HitObjectType.Spinner)
if (BaseHitObject is Spinner)
{
// Do nothing for spinners
}
else if (BaseHitObject.Type == HitObjectType.Slider)
else if (BaseHitObject is Slider)
{
switch (type)
{
@ -180,7 +180,7 @@ private void calculateSpecificStrain(OsuHitObjectDifficulty previousHitObject, O
break;
}
}
else if (BaseHitObject.Type == HitObjectType.Circle)
else if (BaseHitObject is HitCircle)
{
addition = spacingWeight(DistanceTo(previousHitObject), type) * spacing_weight_scaling[(int)type];
}

2
osu.Game.Modes.Osu/Objects/Slider.cs
View File

@ -103,7 +103,5 @@ public IEnumerable<SliderTick> Ticks
}
}
}
public override HitObjectType Type => HitObjectType.Slider;
}
}

2
osu.Game.Modes.Osu/Objects/SliderTick.cs
View File

@ -6,7 +6,5 @@ namespace osu.Game.Modes.Osu.Objects
public class SliderTick : OsuHitObject
{
public int RepeatIndex { get; set; }
public override HitObjectType Type => HitObjectType.SliderTick;
}
}

2
osu.Game.Modes.Osu/Objects/Spinner.cs
View File

@ -10,8 +10,6 @@ public class Spinner : OsuHitObject, IHasEndTime
public double EndTime { get; set; }
public double Duration => EndTime - StartTime;
public override HitObjectType Type => HitObjectType.Spinner;
public override bool NewCombo => true;
}
}

4
osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps;
using osu.Game.Modes.Objects.Types;
using osu.Game.Modes.Osu.Beatmaps;
using osu.Game.Modes.Osu.Objects;
using System;
@ -26,8 +27,7 @@ public OsuDifficultyCalculator(Beatmap beatmap) : base(beatmap)
protected override void PreprocessHitObjects()
{
foreach (var h in Objects)
if (h.Type == HitObjectType.Slider)
((Slider)h).Curve.Calculate();
(h as IHasCurve)?.Curve?.Calculate();
}
protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)

1
osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
View File

@ -67,7 +67,6 @@
<Compile Include="Objects\Drawables\Pieces\TrianglesPiece.cs" />
<Compile Include="Objects\Drawables\Pieces\SliderBall.cs" />
<Compile Include="Objects\Drawables\Pieces\SliderBody.cs" />
<Compile Include="Objects\HitObjectType.cs" />
<Compile Include="Objects\OsuHitObjectDifficulty.cs" />
<Compile Include="Objects\SliderTick.cs" />
<Compile Include="OsuAutoReplay.cs" />

21
osu.Game.Modes.Taiko/Objects/TaikoHitType.cs
View File

@ -1,21 +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 System;
namespace osu.Game.Modes.Taiko.Objects
{
[Flags]
public enum TaikoHitType
{
None = 0,
CentreHit = 1 << 0,
RimHit = 1 << 1,
DrumRoll = 1 << 2,
DrumRollTick = 1 << 3,
Bash = 1 << 4,
Finisher = 1 << 5,
Hit = CentreHit | RimHit
}
}

1
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
View File

@ -50,7 +50,6 @@
<Compile Include="Beatmaps\TaikoBeatmapConverter.cs" />
<Compile Include="Beatmaps\TaikoBeatmapProcessor.cs" />
<Compile Include="Judgements\TaikoJudgementInfo.cs" />
<Compile Include="Objects\TaikoHitType.cs" />
<Compile Include="TaikoDifficultyCalculator.cs" />
<Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
<Compile Include="Objects\TaikoHitObject.cs" />