Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Code cleanup.

Browse Source
This commit is contained in:
PopSlime
2023-04-04 22:12:10 +08:00
parent f467832115
commit ff19b45a9f
3 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs
View File

@@ -254,7 +254,7 @@ namespace Cryville.Common.Pdt {
} }
/// <summary> /// <summary>
/// The exception that is thrown when the evalution of a <see cref="PdtExpression" /> fails. /// The exception that is thrown when the evaluation of a <see cref="PdtExpression" /> fails.
/// </summary> /// </summary>
public class EvaluationFailureException : Exception { public class EvaluationFailureException : Exception {
/// <inheritdoc /> /// <inheritdoc />

3
Assets/Cryville/Crtr/Event/ContainerState.cs
View File

@@ -391,7 +391,7 @@ namespace Cryville.Crtr.Event {
foreach (var m in PlayingMotions) { foreach (var m in PlayingMotions) {
var tev = (Chart.Motion)m.Key.Unstamped; var tev = (Chart.Motion)m.Key.Unstamped;
if (tev.Node.Id >= 0 && CloneType == 2) continue; 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); InvalidateMotion(tev.Name.Key);
if (m.Key.Duration == 0) { if (m.Key.Duration == 0) {
if (tev.Node.Id >= 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); tev.Node.Value.LerpWith(m.Value.AbsoluteValue, lerpedTime, ref value.AbsoluteValue);
} }
} }
Values[tev.Name.Key] = value;
} }
} }

31
Assets/Cryville/Crtr/Motion.cs
View File

@@ -300,7 +300,6 @@ namespace Cryville.Crtr {
public abstract void ApplyFrom(Vector parent); public abstract void ApplyFrom(Vector parent);
public abstract void ReplaceFrom(Vector parent); public abstract void ReplaceFrom(Vector parent);
public abstract void LerpWith(Vector start, float lerpedTime, ref Vector result); 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 bool IsZero();
public abstract override string ToString(); public abstract override string ToString();
public abstract unsafe void ToArray(float* arr); public abstract unsafe void ToArray(float* arr);
@@ -365,12 +364,6 @@ namespace Cryville.Crtr {
r.Value = s.Value * (1 - lerpedTime) + Value * lerpedTime; 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() { public override bool IsZero() {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -429,10 +422,6 @@ namespace Cryville.Crtr {
r.Value = (int)(s.Value * (1 - lerpedTime) + Value * lerpedTime); r.Value = (int)(s.Value * (1 - lerpedTime) + Value * lerpedTime);
} }
public override float DelerpWith(Vector start, Vector value) {
throw new NotImplementedException();
}
public override bool IsZero() { public override bool IsZero() {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -491,10 +480,6 @@ namespace Cryville.Crtr {
r.Value = s.Value * (1 - lerpedTime) + Value * lerpedTime; r.Value = s.Value * (1 - lerpedTime) + Value * lerpedTime;
} }
public override float DelerpWith(Vector start, Vector value) {
throw new NotImplementedException();
}
public override bool IsZero() { public override bool IsZero() {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -583,10 +568,6 @@ namespace Cryville.Crtr {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public override float DelerpWith(Vector start, Vector value) {
throw new NotImplementedException();
}
public override bool IsZero() { public override bool IsZero() {
throw new NotImplementedException(); 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; 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() { public override bool IsZero() {
throw new NotImplementedException(); 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; 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() { public override bool IsZero() {
throw new NotImplementedException(); 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; 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() { public override bool IsZero() {
if (xw == null || xw != 0) return false; if (xw == null || xw != 0) return false;
if (xh == null || xh != 0) return false; if (xh == null || xh != 0) return false;