diff --git a/Assets/Cryville/Crtr/NoteHandler.cs b/Assets/Cryville/Crtr/NoteHandler.cs index 696b5ce..c004593 100644 --- a/Assets/Cryville/Crtr/NoteHandler.cs +++ b/Assets/Cryville/Crtr/NoteHandler.cs @@ -66,14 +66,6 @@ namespace Cryville.Crtr { bool invalidated = false; readonly List patchedJudgeEvents = new List(); - public override void StartUpdate(ContainerState s) { - base.StartUpdate(s); - /*if (s.CloneType == 16 && Event.judge != null) { - // var etor = new Evaluator(); - //CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.judge], s.Time, etor, patchedJudgeEvents, !Event.@long); - }*/ - } - public override void Update(ContainerState s, StampedEvent ev) { base.Update(s, ev); if (s.CloneType == 1) { @@ -103,73 +95,6 @@ namespace Cryville.Crtr { ChartPlayer.etor.ContextState = null; ChartPlayer.etor.ContextEvent = null; } - else if (ev.Unstamped is Chart.Motion) { - /*var tev = (Chart.Motion)ev.Unstamped; - if (tev.Name != "judge") return; - phMotions.Add(tev, (Vec1)s.GetRawValue(tev.Name).Clone());*/ - } - else if (ev.Unstamped is InstantEvent) { - /*var oev = ((InstantEvent)ev.Unstamped).Original; - if (oev is Chart.Motion) { - var tev = (Chart.Motion)oev; - if (tev.Name != "judge") return; - var v0 = phMotions[tev]; - var v1 = s.GetRawValue(tev.Name); - // var etor = new Evaluator(); - for (var vi = Mathf.Ceil(v0.Value); vi < v1.Value; vi++) { - var v = new Vec1(vi); - var t = MotionLerper.Delerp(v, ev.Time, v1, ev.Origin.Time, v0, tev.transition, tev.rate); - CompiledRuleset.PatchJudge( - Event, ChartPlayer.cruleset.primary_judges[tev.Name.SubName], - t, etor, patchedJudgeEvents - ); - } - phMotions.Remove(tev); - }*/ - } - } - } - - public override void ExUpdate(ContainerState s, StampedEvent ev) { - base.ExUpdate(s, ev); - if (ev is StampedEvent.Judge) { - var tev = (StampedEvent.Judge)ev; - if (tev.TargetJudge != null && s.CloneType == 0 && !invalidated) { - //judge.Issue(tev, this); - } - else if (tev.TargetJudge == null && s.CloneType == 17) { - //judge.RecordPos(tev.StartEvent, GetFramePoint(s.Parent, s.Track)); - } - else - return; - patchedJudgeEvents.Remove(tev); - // Logger.Log("main", 0, "Judge", "ir {0}", patchedJudgeEvents.Count); - } - } - - public override void MotionUpdate(byte ct, Chart.Motion ev) { - base.MotionUpdate(ct, ev); - if (ct == 0) { - /*if (ev.Name == "judge") { - if (invalidated) return; - if (ev.Name == null) - throw new InvalidOperationException(); - judge.IssueImmediate(this, ev.Name.SubName, GetFramePoint(cs.Parent, cs.Track)); - }*/ - } - else if (ct == 16) { - /*var etor = new EvalImpl(); - if (ev.MotionName == "judge") { - if (ev.MotionSubName == null) - throw new InvalidOperationException(); - var l = new List(); - float t = ps.Time; - CompiledRuleset.PatchJudge( - Event, ChartPlayer.cruleset.primary_judges[ev.MotionSubName], - t, etor, ref l - ); - cs.Bus.IssueEventPatch(l); - }*/ } } @@ -183,13 +108,6 @@ namespace Cryville.Crtr { a_tail.rotation = Quaternion.Euler(ts.Direction); #endif } - else if (s.CloneType == 16) { - /*if (Event.endjudge != null) { - //var etor = new Evaluator(); - //CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.endjudge], ps.Time, etor, patchedJudgeEvents, true); - } - cs.Bus.IssuePatch(patchedJudgeEvents.Cast());*/ - } OpenAnchor("tail"); base.EndUpdate(s); CloseAnchor("tail"); @@ -248,10 +166,5 @@ namespace Cryville.Crtr { } } } - - public List Invalidate() { - invalidated = true; - return patchedJudgeEvents; - } } }