Optimize GC for PropSrc.

Assets/Cryville/Crtr/Judge.cs

@@ -244,17 +244,17 @@ namespace Cryville.Crtr {
 					_buf = null;
 				}
 			}
-			protected override unsafe void InternalGet(out int type, out byte[] value) {
+			protected override unsafe int InternalGet() {
 				var src = _cb();
 				int strlen = src.Length;
-				type = PdtInternalType.String;
-				value = _pool.Rent(sizeof(int) + strlen * sizeof(char));
-				fixed (byte* _ptr = value) {
+				buf = _pool.Rent(sizeof(int) + strlen * sizeof(char));
+				fixed (byte* _ptr = buf) {
 					char* ptr = (char*)(_ptr + sizeof(int));
 					*(int*)_ptr = strlen;
 					int i = 0;
 					foreach (var c in src) ptr[i++] = c;
 				}
+				return PdtInternalType.String;
 			}
 		}
 		#endregion

Assets/Cryville/Crtr/Motion.cs

@@ -928,25 +928,25 @@ namespace Cryville.Crtr {
 	public class VectorSrc : PropSrc {
 		readonly Func<Vector> _cb;
 		public VectorSrc(Func<Vector> cb) { _cb = cb; }
-		protected override unsafe void InternalGet(out int type, out byte[] value) {
+		protected override unsafe int InternalGet() {
 			var arr = _cb().ToArray();
 			if (arr.Length == 1) {
-				type = PdtInternalType.Number;
-				value = new byte[sizeof(float)];
-				fixed (byte* ptr = value) {
+				buf = new byte[sizeof(float)];
+				fixed (byte* ptr = buf) {
 					*(float*)ptr = arr[0];
 				}
+				return PdtInternalType.Number;
 			}
 			else {
-				type = PdtInternalType.Vector;
-				value = new byte[sizeof(float) * arr.Length + sizeof(int)];
-				fixed (byte* rptr = value) {
+				buf = new byte[sizeof(float) * arr.Length + sizeof(int)];
+				fixed (byte* rptr = buf) {
 					var ptr = (float*)rptr;
 					for (int i = 0; i < arr.Length; i++, ptr++) {
 						*ptr = arr[i];
 					}
 					*(int*)ptr = PdtInternalType.Number;
 				}
+				return PdtInternalType.Vector;
 			}
 		}
 	}

Assets/Cryville/Crtr/PropSrc.cs

@@ -5,14 +5,15 @@ using RBeatTime = Cryville.Crtr.BeatTime;
 namespace Cryville.Crtr {
 	public abstract class PropSrc {
 		int _type;
-		byte[] _buf = null;
-		public virtual void Invalidate() { _buf = null; }
+		protected byte[] buf = null;
+		protected virtual bool Invalidated { get { return buf == null; } }
+		public virtual void Invalidate() { buf = null; }
 		public void Get(out int type, out byte[] value) {
-			if (_buf == null) InternalGet(out _type, out _buf);
+			if (Invalidated) _type = InternalGet();
 			type = _type;
-			value = _buf;
+			value = buf;
 		}
-		protected abstract void InternalGet(out int type, out byte[] value);
+		protected abstract int InternalGet();
 		public class Arbitrary : PropSrc {
 			public int Type { get; private set; }
 			readonly byte[] _value;
@@ -20,65 +21,75 @@ namespace Cryville.Crtr {
 				Type = type;
 				_value = value;
 			}
-			protected override void InternalGet(out int type, out byte[] value) {
-				type = Type;
-				value = _value;
+			protected override int InternalGet() {
+				buf = _value;
+				return Type;
 			}
 		}
 		public class Boolean : PropSrc {
 			readonly Func<bool> _cb;
-			public Boolean(Func<bool> cb) { _cb = cb; }
-			protected override void InternalGet(out int type, out byte[] value) {
-				type = PdtInternalType.Number;
-				value = new byte[] { _cb() ? (byte)1 : (byte)0, 0, 0, 0 };
+			bool m_invalidated = true;
+			protected override bool Invalidated { get { return m_invalidated; } }
+			public override void Invalidate() { m_invalidated = true; }
+			public Boolean(Func<bool> cb) { _cb = cb; buf = new byte[4]; }
+			protected override int InternalGet() {
+				m_invalidated = false;
+				buf[0] = _cb() ? (byte)1 : (byte)0;
+				return PdtInternalType.Number;
 			}
 		}
 		public class Float : PropSrc {
 			readonly Func<float> _cb;
-			public Float(Func<float> cb) { _cb = cb; }
-			protected override void InternalGet(out int type, out byte[] value) {
-				type = PdtInternalType.Number;
-				value = BitConverter.GetBytes(_cb());
+			bool m_invalidated = true;
+			protected override bool Invalidated { get { return m_invalidated; } }
+			public override void Invalidate() { m_invalidated = true; }
+			public Float(Func<float> cb) { _cb = cb; buf = new byte[4]; }
+			protected override unsafe int InternalGet() {
+				m_invalidated = false;
+				fixed (byte* _ptr = buf) {
+					*(float*)_ptr = _cb();
+				}
+				return PdtInternalType.Number;
 			}
 		}
 		public class String : PropSrc {
 			readonly Func<string> _cb;
 			public String(Func<string> cb) { _cb = cb; }
-			protected override unsafe void InternalGet(out int type, out byte[] value) {
-				type = PdtInternalType.String;
+			protected override unsafe int InternalGet() {
 				var v = _cb();
 				int strlen = v.Length;
-				value = new byte[strlen * sizeof(char) + sizeof(int)];
-				fixed (byte* _ptr = value) {
+				buf = new byte[strlen * sizeof(char) + sizeof(int)];
+				fixed (byte* _ptr = buf) {
 					char* ptr = (char*)(_ptr + sizeof(int));
 					*(int*)_ptr = strlen;
 					int i = 0;
 					foreach (var c in v) ptr[i++] = c;
 				}
+				return PdtInternalType.String;
 			}
 		}
 		public class Identifier : PropSrc {
 			readonly Func<int> _cb;
 			public Identifier(Func<int> cb) { _cb = cb; }
-			protected override void InternalGet(out int type, out byte[] value) {
-				type = PdtInternalType.Undefined;
-				value = BitConverter.GetBytes(_cb());
+			protected override int InternalGet() {
+				buf = BitConverter.GetBytes(_cb());
+				return PdtInternalType.Undefined;
 			}
 		}
 		public class BeatTime : PropSrc {
 			readonly Func<RBeatTime> _cb;
 			public BeatTime(Func<RBeatTime> cb) { _cb = cb; }
-			protected override unsafe void InternalGet(out int type, out byte[] value) {
+			protected override unsafe int InternalGet() {
 				var bt = _cb();
-				type = PdtInternalType.Vector;
-				value = new byte[4 * sizeof(int)];
-				fixed (byte* _ptr = value) {
+				buf = new byte[4 * sizeof(int)];
+				fixed (byte* _ptr = buf) {
 					int* ptr = (int*)_ptr;
 					*ptr++ = bt.b;
 					*ptr++ = bt.n;
 					*ptr++ = bt.d;
 					*ptr++ = PdtInternalType.Number;
 				}
+				return PdtInternalType.Vector;
 			}
 		}
 	}