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

Make HitObject not store the judgement

Browse Source
This commit is contained in:
smoogipoo
2018-08-06 11:50:18 +09:00
parent 0d6a8a2bf5
commit 3a7488767c
20 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -93,10 +93,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
[BackgroundDependencyLoader]
private void load()
{
if (HitObject.Judgement != null)
var judgement = HitObject.CreateJudgement();
if (judgement != null)
{
Result = CreateResult(HitObject.Judgement);
Result = CreateResult(judgement);
if (Result == null)
throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
}

12
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -63,14 +63,6 @@ namespace osu.Game.Rulesets.Objects
[JsonIgnore]
public IReadOnlyList<HitObject> NestedHitObjects => nestedHitObjects.Value;
/// <summary>
/// The judgement information provided by this <see cref="HitObject"/>.
/// </summary>
/// <remarks>
/// Only populated after <see cref="ApplyDefaults"/> is invoked.
/// </remarks>
public Judgement Judgement { get; private set; }
/// <summary>
/// Applies default values to this HitObject.
/// </summary>
@ -80,8 +72,6 @@ namespace osu.Game.Rulesets.Objects
{
ApplyDefaultsToSelf(controlPointInfo, difficulty);
Judgement = CreateJudgement();
if (nestedHitObjects.IsValueCreated)
nestedHitObjects.Value.Clear();
@ -120,7 +110,7 @@ namespace osu.Game.Rulesets.Objects
/// Creates the <see cref="Judgement"/> that represents the scoring information for this <see cref="HitObject"/>.
/// May be null.
/// </summary>
protected virtual Judgement CreateJudgement() => null;
public virtual Judgement CreateJudgement() => null;
/// <summary>
/// Creates the <see cref="HitWindows"/> for this <see cref="HitObject"/>.