From ff19b45a9f8598ae974d30ffac77de066dcae369 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Tue, 4 Apr 2023 22:12:10 +0800 Subject: [PATCH] Code cleanup. --- .../Cryville/Common/Pdt/PdtEvaluatorBase.cs | 2 +- Assets/Cryville/Crtr/Event/ContainerState.cs | 3 +- Assets/Cryville/Crtr/Motion.cs | 31 ------------------- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs b/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs index 70e105e..dfa3c60 100644 --- a/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs +++ b/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs @@ -254,7 +254,7 @@ namespace Cryville.Common.Pdt { } /// - /// The exception that is thrown when the evalution of a fails. + /// The exception that is thrown when the evaluation of a fails. /// public class EvaluationFailureException : Exception { /// diff --git a/Assets/Cryville/Crtr/Event/ContainerState.cs b/Assets/Cryville/Crtr/Event/ContainerState.cs index fb5f935..bb5cf6e 100644 --- a/Assets/Cryville/Crtr/Event/ContainerState.cs +++ b/Assets/Cryville/Crtr/Event/ContainerState.cs @@ -391,7 +391,7 @@ namespace Cryville.Crtr.Event { foreach (var m in PlayingMotions) { var tev = (Chart.Motion)m.Key.Unstamped; if (tev.Node.Id >= 0 && CloneType == 2) continue; - var value = GetMotionValue(tev.Name.Key/*, true*/); + var value = GetMotionValue(tev.Name.Key); InvalidateMotion(tev.Name.Key); if (m.Key.Duration == 0) { if (tev.Node.Id >= 0) { @@ -413,7 +413,6 @@ namespace Cryville.Crtr.Event { tev.Node.Value.LerpWith(m.Value.AbsoluteValue, lerpedTime, ref value.AbsoluteValue); } } - Values[tev.Name.Key] = value; } } diff --git a/Assets/Cryville/Crtr/Motion.cs b/Assets/Cryville/Crtr/Motion.cs index b9f4f48..cd3e0d8 100644 --- a/Assets/Cryville/Crtr/Motion.cs +++ b/Assets/Cryville/Crtr/Motion.cs @@ -300,7 +300,6 @@ namespace Cryville.Crtr { public abstract void ApplyFrom(Vector parent); public abstract void ReplaceFrom(Vector parent); public abstract void LerpWith(Vector start, float lerpedTime, ref Vector result); - public abstract float DelerpWith(Vector start, Vector value); public abstract bool IsZero(); public abstract override string ToString(); public abstract unsafe void ToArray(float* arr); @@ -365,12 +364,6 @@ namespace Cryville.Crtr { r.Value = s.Value * (1 - lerpedTime) + Value * lerpedTime; } - public override float DelerpWith(Vector start, Vector value) { - var s = (Vec1)start; - var v = (Vec1)value; - return (v.Value - s.Value) / (this.Value - s.Value); - } - public override bool IsZero() { throw new NotImplementedException(); } @@ -429,10 +422,6 @@ namespace Cryville.Crtr { r.Value = (int)(s.Value * (1 - lerpedTime) + Value * lerpedTime); } - public override float DelerpWith(Vector start, Vector value) { - throw new NotImplementedException(); - } - public override bool IsZero() { throw new NotImplementedException(); } @@ -491,10 +480,6 @@ namespace Cryville.Crtr { r.Value = s.Value * (1 - lerpedTime) + Value * lerpedTime; } - public override float DelerpWith(Vector start, Vector value) { - throw new NotImplementedException(); - } - public override bool IsZero() { throw new NotImplementedException(); } @@ -583,10 +568,6 @@ namespace Cryville.Crtr { throw new NotImplementedException(); } - public override float DelerpWith(Vector start, Vector value) { - throw new NotImplementedException(); - } - public override bool IsZero() { throw new NotImplementedException(); } @@ -682,10 +663,6 @@ namespace Cryville.Crtr { r.z = z.HasValue ? (s.z.Value * (1 - lerpedTime) + z.Value * lerpedTime) : s.z.Value; } - public override float DelerpWith(Vector start, Vector value) { - throw new NotImplementedException(); - } - public override bool IsZero() { throw new NotImplementedException(); } @@ -766,10 +743,6 @@ namespace Cryville.Crtr { r.yh = yh.HasValue ? (s.yh.Value * (1 - lerpedTime) + yh.Value * lerpedTime) : s.yh.Value; } - public override float DelerpWith(Vector start, Vector value) { - throw new NotImplementedException(); - } - public override bool IsZero() { throw new NotImplementedException(); } @@ -854,10 +827,6 @@ namespace Cryville.Crtr { r.z = z.HasValue ? (s.z.Value * (1 - lerpedTime) + z.Value * lerpedTime) : s.z.Value; } - public override float DelerpWith(Vector start, Vector value) { - throw new NotImplementedException(); - } - public override bool IsZero() { if (xw == null || xw != 0) return false; if (xh == null || xh != 0) return false;