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-19 13:52:55 +08:00
parent bdbb1fcb07
commit 1b30d3e62c
4 changed files with 25 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Cryville/Crtr/Event/ContainerHandler.cs
View File

@@ -231,7 +231,7 @@ namespace Cryville.Crtr.Event {
tev.Time = time; tev.Time = time;
tev.Container = Container; tev.Container = Container;
tev.Target = anchor; tev.Target = anchor;
tev.CanDiscard = !forced; tev.Forced = forced;
tev.SetPriority(priority); tev.SetPriority(priority);
ts.Bus.PushTempEvent(tev); ts.Bus.PushTempEvent(tev);
} }

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

@@ -395,7 +395,7 @@ namespace Cryville.Crtr.Event {
value.SetRelativeNode(tev.Node); value.SetRelativeNode(tev.Node);
} }
else { else {
value.AbsoluteValue.ReplaceFrom(tev.Node.Value); tev.Node.Value.CopyTo(value.AbsoluteValue);
} }
} }
else { else {

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

@@ -4,7 +4,6 @@ using Cryville.Common.Pdt;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Text.RegularExpressions;
using UnityEngine; using UnityEngine;
namespace Cryville.Crtr { namespace Cryville.Crtr {
@@ -185,7 +184,6 @@ namespace Cryville.Crtr {
public abstract byte Dimension { get; } public abstract byte Dimension { get; }
public abstract void ApplyFrom(Vector parent); 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 void LerpWith(Vector start, float lerpedTime, ref Vector result);
public abstract override string ToString(); public abstract override string ToString();
public abstract unsafe void ToArray(float* arr); public abstract unsafe void ToArray(float* arr);
@@ -220,11 +218,6 @@ namespace Cryville.Crtr {
Value += p.Value; Value += p.Value;
} }
public override void ReplaceFrom(Vector parent) {
var p = (Vec1)parent;
Value = p.Value;
}
public override void LerpWith(Vector start, float lerpedTime, ref Vector result) { public override void LerpWith(Vector start, float lerpedTime, ref Vector result) {
var r = (Vec1)result; var r = (Vec1)result;
if (start == null) { if (start == null) {
@@ -267,11 +260,6 @@ namespace Cryville.Crtr {
Value += p.Value; Value += p.Value;
} }
public override void ReplaceFrom(Vector parent) {
var p = (VecI1)parent;
Value = p.Value;
}
public override void LerpWith(Vector start, float lerpedTime, ref Vector result) { public override void LerpWith(Vector start, float lerpedTime, ref Vector result) {
var r = (VecI1)result; var r = (VecI1)result;
if (start == null) { if (start == null) {
@@ -314,11 +302,6 @@ namespace Cryville.Crtr {
Value *= p.Value; Value *= p.Value;
} }
public override void ReplaceFrom(Vector parent) {
var p = (Vec1m)parent;
Value = p.Value;
}
public override void LerpWith(Vector start, float lerpedTime, ref Vector result) { public override void LerpWith(Vector start, float lerpedTime, ref Vector result) {
var r = (Vec1m)result; var r = (Vec1m)result;
if (start == null) { if (start == null) {
@@ -344,7 +327,7 @@ namespace Cryville.Crtr {
} }
public class Vec2 : Vector { public class Vec2 : Vector {
float? x, y; float x, y;
public Vec2() { x = y = 0; } public Vec2() { x = y = 0; }
public Vec2(float[] v) { public Vec2(float[] v) {
@@ -358,13 +341,7 @@ namespace Cryville.Crtr {
public override void ApplyFrom(Vector parent) { public override void ApplyFrom(Vector parent) {
var p = (Vec2)parent; var p = (Vec2)parent;
x += p.x.GetValueOrDefault(); y += p.y.GetValueOrDefault(); x += p.x; y += p.y;
}
public override void ReplaceFrom(Vector parent) {
var p = (Vec2)parent;
if (p.x.HasValue) x = p.x;
if (p.y.HasValue) y = p.y;
} }
public override void LerpWith(Vector start, float lerpedTime, ref Vector result) { public override void LerpWith(Vector start, float lerpedTime, ref Vector result) {
@@ -375,12 +352,12 @@ namespace Cryville.Crtr {
return; return;
} }
var s = (Vec2)start; var s = (Vec2)start;
r.x = x.HasValue ? (s.x.Value * (1 - lerpedTime) + x.Value * lerpedTime) : s.x.Value; r.x = s.x * (1 - lerpedTime) + x * lerpedTime;
r.y = y.HasValue ? (s.y.Value * (1 - lerpedTime) + y.Value * lerpedTime) : s.y.Value; r.y = s.y * (1 - lerpedTime) + y * lerpedTime;
} }
public Vector3 ToVector2() { public Vector3 ToVector2() {
return new Vector3(x.Value, y.Value); return new Vector3(x, y);
} }
public override void CopyTo(Vector dest) { public override void CopyTo(Vector dest) {
@@ -389,20 +366,17 @@ namespace Cryville.Crtr {
} }
public override string ToString() { public override string ToString() {
return string.Format("{0},{1}", return string.Format(CultureInfo.InvariantCulture, "{0},{1}", x, y);
x != null ? x.Value.ToString(CultureInfo.InvariantCulture) : "",
y != null ? y.Value.ToString(CultureInfo.InvariantCulture) : ""
);
} }
public override unsafe void ToArray(float* arr) { public override unsafe void ToArray(float* arr) {
arr[0] = x.Value; arr[0] = x;
arr[1] = y.Value; arr[1] = y;
} }
} }
public class Vec3 : Vector { public class Vec3 : Vector {
float? x, y, z; float x, y, z;
public Vec3() { x = y = z = 0; } public Vec3() { x = y = z = 0; }
public Vec3(float[] v) { public Vec3(float[] v) {
@@ -416,14 +390,7 @@ namespace Cryville.Crtr {
public override void ApplyFrom(Vector parent) { public override void ApplyFrom(Vector parent) {
var p = (Vec3)parent; var p = (Vec3)parent;
x += p.x.GetValueOrDefault(); y += p.y.GetValueOrDefault(); z += p.z.GetValueOrDefault(); x += p.x; y += p.y; z += p.z;
}
public override void ReplaceFrom(Vector parent) {
var p = (Vec3)parent;
if (p.x.HasValue) x = p.x;
if (p.y.HasValue) y = p.y;
if (p.z.HasValue) z = p.z;
} }
public override void LerpWith(Vector start, float lerpedTime, ref Vector result) { public override void LerpWith(Vector start, float lerpedTime, ref Vector result) {
@@ -435,13 +402,13 @@ namespace Cryville.Crtr {
return; return;
} }
var s = (Vec3)start; var s = (Vec3)start;
r.x = x.HasValue ? (s.x.Value * (1 - lerpedTime) + x.Value * lerpedTime) : s.x.Value; r.x = s.x * (1 - lerpedTime) + x * lerpedTime;
r.y = y.HasValue ? (s.y.Value * (1 - lerpedTime) + y.Value * lerpedTime) : s.y.Value; r.y = s.y * (1 - lerpedTime) + y * lerpedTime;
r.z = z.HasValue ? (s.z.Value * (1 - lerpedTime) + z.Value * lerpedTime) : s.z.Value; r.z = s.z * (1 - lerpedTime) + z * lerpedTime;
} }
public Vector3 ToVector3() { public Vector3 ToVector3() {
return new Vector3(x.Value, y.Value, z.Value); return new Vector3(x, y, z);
} }
public override void CopyTo(Vector dest) { public override void CopyTo(Vector dest) {
@@ -450,17 +417,13 @@ namespace Cryville.Crtr {
} }
public override string ToString() { public override string ToString() {
return string.Format("{0},{1},{2}", return string.Format(CultureInfo.InvariantCulture, "{0},{1},{2}", x, y, z);
x != null ? x.Value.ToString(CultureInfo.InvariantCulture) : "",
y != null ? y.Value.ToString(CultureInfo.InvariantCulture) : "",
z != null ? z.Value.ToString(CultureInfo.InvariantCulture) : ""
);
} }
public override unsafe void ToArray(float* arr) { public override unsafe void ToArray(float* arr) {
arr[0] = x.Value; arr[0] = x;
arr[1] = y.Value; arr[1] = y;
arr[2] = z.Value; arr[2] = z;
} }
} }

14
Assets/Cryville/Crtr/StampedEvent.cs
View File

@@ -21,12 +21,13 @@ namespace Cryville.Crtr {
public virtual int Priority { public virtual int Priority {
get { get {
if (Unstamped != null) return Unstamped.Priority; if (Unstamped != null) return Unstamped.Priority;
if (Origin != null) return Origin.Priority + 1;
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
public class Temporary : StampedEvent, IComparable<Temporary> { public class Temporary : StampedEvent, IComparable<Temporary> {
public bool CanDiscard; public virtual bool CanDiscard { get; set; }
public int CompareTo(Temporary other) { public int CompareTo(Temporary other) {
return base.CompareTo(other); return base.CompareTo(other);
} }
@@ -35,6 +36,8 @@ namespace Cryville.Crtr {
public class Anchor : Temporary { public class Anchor : Temporary {
public CAnchor Target; public CAnchor Target;
int m_priority; int m_priority;
public bool Forced { get; set; }
public override bool CanDiscard { get { return !Forced; } }
public override int Priority { get { return m_priority; } } public override int Priority { get { return m_priority; } }
public void SetPriority(int value) { m_priority = value; } public void SetPriority(int value) { m_priority = value; }
} }
@@ -51,14 +54,7 @@ namespace Cryville.Crtr {
} }
} }
StampedEvent relev = null; public StampedEvent ReleaseEvent { get; set; }
public StampedEvent ReleaseEvent {
get { return relev; }
set {
if (relev != null) throw new InvalidOperationException("Release event already set");
relev = value;
}
}
public override string ToString() { public override string ToString() {
if (Unstamped == null) if (Unstamped == null)