From ca928eb731429213ee56e2cfb49e40005653ca13 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Sat, 20 May 2023 22:36:08 +0800 Subject: [PATCH] Make judge event internal. --- Assets/Cryville/Crtr/Judge.cs | 4 ++-- Assets/Cryville/Crtr/JudgeAction.cs | 6 +++--- Assets/Cryville/Crtr/NoteHandler.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Cryville/Crtr/Judge.cs b/Assets/Cryville/Crtr/Judge.cs index e87a934..f9228d4 100644 --- a/Assets/Cryville/Crtr/Judge.cs +++ b/Assets/Cryville/Crtr/Judge.cs @@ -11,7 +11,7 @@ using System.Text.Formatting; using UnsafeIL; namespace Cryville.Crtr { - public struct JudgeEvent { + internal struct JudgeEvent { public double StartTime { get; set; } public double EndTime { get; set; } public double StartClip { get; set; } @@ -20,7 +20,7 @@ namespace Cryville.Crtr { public JudgeDefinition Definition { get; set; } public NoteHandler Handler { get; set; } } - public interface IJudge { + internal interface IJudge { bool Pass(JudgeEvent ev, float time, Identifier[] ids, int depth); void UpdateScore(ScoreOperation op, PdtExpression exp); } diff --git a/Assets/Cryville/Crtr/JudgeAction.cs b/Assets/Cryville/Crtr/JudgeAction.cs index 1d5db20..4912bc7 100644 --- a/Assets/Cryville/Crtr/JudgeAction.cs +++ b/Assets/Cryville/Crtr/JudgeAction.cs @@ -20,13 +20,13 @@ namespace Cryville.Crtr { annotations = a.ToHashSet(); } public virtual void Optimize(PdtEvaluatorBase etor, PdtExpression value) { etor.Optimize(value); } - public abstract bool Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, int depth); + internal abstract bool Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, int depth); public class Pass : JudgeAction { readonly Identifier[] _targets; public Pass(IEnumerable a, IEnumerable k) : base(a) { _targets = k.ToArray(); } - public override bool Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, int depth) { + internal override bool Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, int depth) { return judge.Pass(ev, time, _targets, depth); } } @@ -42,7 +42,7 @@ namespace Cryville.Crtr { base.Optimize(etor, value); if (_op.op != default(Identifier)) PdtExpression.PatchCompound(_op.name.Key, _op.op.Key, value); } - public override bool Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, int depth) { + internal override bool Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, int depth) { judge.UpdateScore(_op, exp); return false; } diff --git a/Assets/Cryville/Crtr/NoteHandler.cs b/Assets/Cryville/Crtr/NoteHandler.cs index f7d3ef5..9d8b11a 100644 --- a/Assets/Cryville/Crtr/NoteHandler.cs +++ b/Assets/Cryville/Crtr/NoteHandler.cs @@ -150,7 +150,7 @@ namespace Cryville.Crtr { return gh.GetCurrentFrame(func, track); } - public void ReportJudge(JudgeEvent ev, float time, Identifier result) { + internal void ReportJudge(JudgeEvent ev, float time, Identifier result) { JudgeState state; if (!judges.TryGetValue(ev.BaseEvent, out state)) return; state.MarkJudged(time, (float)(ev.StartTime - time), result.Key);