Cleanup CategorizedPool.

This reverts commit 4185303bd2.

Assets/Animations/IConfig.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2e0c61e29fd90f04b9e41265d93e2029
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/TConfig_Main.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d815e4d844e6a1c4d849e96e199f8881
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/TMain_Config.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 82867c59112ff5a419fbea2ebff2d3b9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/BinderAttribute.cs

@@ -33,12 +33,12 @@ namespace Cryville.Common {
 		public override object ChangeType(object value, Type type, CultureInfo culture) {
 			if (value == null)
 				return null;
-			else if (type == value.GetType())
+			else if (type.IsAssignableFrom(value.GetType()))
 				return value;
 			else if (type.IsEnum && value is string) {
 				return Enum.Parse(type, (string)value);
 			}
-			throw new InvalidCastException();
+			throw new InvalidCastException(string.Format("Cannot cast {0} to {1}", value.GetType(), type));
 		}
 		
 		public override void ReorderArgumentArray(ref object[] args, object state) {

Assets/Cryville/Common/Buffers/CategorizedPool.cs

@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+
+namespace Cryville.Common.Buffers {
+	/// <summary>
+	/// A set of resource pools categorized by a category type.
+	/// </summary>
+	/// <typeparam name="TCategory">The category type.</typeparam>
+	/// <typeparam name="TObject">The type of the objects in the pool.</typeparam>
+	public abstract class CategorizedPool<TCategory, TObject> where TObject : class {
+		/// <summary>
+		/// The set of underlying pools.
+		/// </summary>
+		/// <remarks>
+		/// <para>The <see cref="Rent(TCategory)" /> and <see cref="Return(TCategory, TObject)" /> method select an underlying pool directly from this set with the category as the key. When overridden, this set must be available since construction.</para>
+		/// </remarks>
+		protected abstract IReadOnlyDictionary<TCategory, ObjectPool<TObject>> Buckets { get; }
+		/// <summary>
+		/// The count of objects rented from the set of pools.
+		/// </summary>
+		public int RentedCount { get; private set; }
+		/// <summary>
+		/// Rents an object from the pool.
+		/// </summary>
+		/// <param name="category">The category.</param>
+		/// <returns>The rented object.</returns>
+		public TObject Rent(TCategory category) {
+			var obj = Buckets[category].Rent();
+			RentedCount++;
+			return obj;
+		}
+		/// <summary>
+		/// Returns a rented object to the pool.
+		/// </summary>
+		/// <param name="category">The category.</param>
+		/// <param name="obj">The object to return.</param>
+		public void Return(TCategory category, TObject obj) {
+			Buckets[category].Return(obj);
+			--RentedCount;
+		}
+	}
+	/// <summary>
+	/// A utility to access a categorized pool, representing a single unit that uses a shared categorized pool.
+	/// </summary>
+	/// <typeparam name="TCategory">The category type.</typeparam>
+	/// <typeparam name="TObject">The type of the objects in the pool.</typeparam>
+	public class CategorizedPoolAccessor<TCategory, TObject> where TObject : class {
+		readonly CategorizedPool<TCategory, TObject> _pool;
+		static readonly SimpleObjectPool<Dictionary<TObject, TCategory>> _dictPool
+			= new SimpleObjectPool<Dictionary<TObject, TCategory>>(1024);
+		Dictionary<TObject, TCategory> _rented;
+		/// <summary>
+		/// Creates an instance of the <see cref="CategorizedPoolAccessor{TCategory, TObject}" /> class.
+		/// </summary>
+		/// <param name="pool">The categorized pool.</param>
+		public CategorizedPoolAccessor(CategorizedPool<TCategory, TObject> pool) {
+			_pool = pool;
+		}
+		/// <summary>
+		/// Rents an object from the pool.
+		/// </summary>
+		/// <param name="category">The category.</param>
+		/// <returns>The rented object.</returns>
+		public TObject Rent(TCategory category) {
+			var obj = _pool.Rent(category);
+			if (_rented == null) _rented = _dictPool.Rent();
+			_rented.Add(obj, category);
+			return obj;
+		}
+		/// <summary>
+		/// Returns a rented object to the pool.
+		/// </summary>
+		/// <param name="obj">The object to return.</param>
+		public void Return(TObject obj) {
+			_pool.Return(_rented[obj], obj);
+			_rented.Remove(obj);
+		}
+		/// <summary>
+		/// Returns all objects rented by this accessor to the pool.
+		/// </summary>
+		public void ReturnAll() {
+			if (_rented == null) return;
+			foreach (var obj in _rented) {
+				_pool.Return(obj.Value, obj.Key);
+			}
+			_rented.Clear();
+			_dictPool.Return(_rented);
+			_rented = null;
+		}
+	}
+}

Assets/Cryville/Common/Buffers/CategorizedPool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec18f22479042d747b88c093aa90c5c0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Buffers/ObjectPool.cs

@@ -14,6 +14,10 @@
 			_objs = new T[capacity];
 		}
 		/// <summary>
+		/// The count of objects rented from the pool.
+		/// </summary>
+		public int RentedCount { get { return _index; } }
+		/// <summary>
 		/// Rents a object from the pool.
 		/// </summary>
 		/// <returns>The rented object.</returns>
@@ -24,6 +28,7 @@
 				_objs[_index++] = null;
 			}
 			if (obj == null) obj = Construct();
+			else Reset(obj);
 			return obj;
 		}
 		/// <summary>
@@ -38,5 +43,10 @@
 		/// </summary>
 		/// <returns>The new instance.</returns>
 		protected abstract T Construct();
+		/// <summary>
+		/// Resets an object.
+		/// </summary>
+		/// <param name="obj">The object.</param>
+		protected virtual void Reset(T obj) { }
 	}
 }

Assets/Cryville/Common/Buffers/TargetString.cs

@@ -18,7 +18,9 @@ namespace Cryville.Common.Buffers {
 		/// Creates an instance of the <see cref="TargetString" /> class.
 		/// </summary>
 		/// <param name="capacity">The initial capacity of the string.</param>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="capacity" /> is less than or equal to 0.</exception>
 		public TargetString(int capacity) {
+			if (capacity <= 0) throw new ArgumentOutOfRangeException("capacity");
 			_arr = new char[capacity];
 		}
 		/// <summary>
@@ -49,14 +51,16 @@ namespace Cryville.Common.Buffers {
 		/// <summary>
 		/// The length of the string.
 		/// </summary>
+		/// <exception cref="ArgumentOutOfRangeException">The value specified for a set operation is less than 0.</exception>
 		public int Length {
 			get {
 				return m_length;
 			}
 			set {
+				if (Length < 0) throw new ArgumentOutOfRangeException("length");
 				if (m_length == value) return;
 				if (_arr.Length < value) {
-					var len = m_length;
+					var len = _arr.Length;
 					while (len < value) len *= 2;
 					var arr2 = new char[len];
 					Array.Copy(_arr, arr2, m_length);
@@ -75,18 +79,29 @@ namespace Cryville.Common.Buffers {
 			var ev = OnUpdate;
 			if (ev != null) ev.Invoke();
 		}
+		internal char[] TrustedAsArray() { return _arr; }
 
-		IEnumerator IEnumerable.GetEnumerator() {
-			return GetEnumerator();
+		/// <summary>
+		/// Returns an enumerator that iterates through the <see cref="TargetString" />.
+		/// </summary>
+		/// <returns>A <see cref="Enumerator" /> for the <see cref="TargetString" />.</returns>
+		public Enumerator GetEnumerator() {
+			return new Enumerator(this);
 		}
-		public IEnumerator<char> GetEnumerator() {
+		IEnumerator<char> IEnumerable<char>.GetEnumerator() {
+			return new Enumerator(this);
+		}
+		IEnumerator IEnumerable.GetEnumerator() {
 			return new Enumerator(this);
 		}
 
-		class Enumerator : IEnumerator<char> {
+		public struct Enumerator : IEnumerator<char> {
 			readonly TargetString _self;
-			int _index = -1;
-			public Enumerator(TargetString self) { _self = self; }
+			int _index;
+			internal Enumerator(TargetString self) {
+				_self = self;
+				_index = -1;
+			}
 
 			public char Current {
 				get {

Assets/Cryville/Common/Culture.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: a5b20befc03909345bd7d08158c02462
+guid: 520554ce9a8205b4b91e0ff2b8011673
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Cryville/Common/Culture/ScriptUtils.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Cryville.Common.Culture {
+	public static class ScriptUtils {
+		public static string[] Scripts = new string[] { "adlm", "afak", "aghb", "ahom", "arab", "aran", "armi", "armn", "avst", "bali", "bamu", "bass", "batk", "beng", "bhks", "blis", "bopo", "brah", "brai", "bugi", "buhd", "cakm", "cans", "cari", "cham", "cher", "chrs", "cirt", "copt", "cpmn", "cprt", "cyrl", "cyrs", "deva", "diak", "dogr", "dsrt", "dupl", "egyd", "egyh", "egyp", "elba", "elym", "ethi", "geok", "geor", "glag", "gong", "gonm", "goth", "gran", "grek", "gujr", "guru", "hanb", "hang", "hani", "hano", "hans", "hant", "hatr", "hebr", "hira", "hluw", "hmng", "hmnp", "hrkt", "hung", "inds", "ital", "jamo", "java", "jpan", "jurc", "kali", "kana", "khar", "khmr", "khoj", "kitl", "kits", "knda", "kore", "kpel", "kthi", "lana", "laoo", "latf", "latg", "latn", "leke", "lepc", "limb", "lina", "linb", "lisu", "loma", "lyci", "lydi", "mahj", "maka", "mand", "mani", "marc", "maya", "medf", "mend", "merc", "mero", "mlym", "modi", "mong", "moon", "mroo", "mtei", "mult", "mymr", "nand", "narb", "nbat", "newa", "nkdb", "nkgb", "nkoo", "nshu", "ogam", "olck", "orkh", "orya", "osge", "osma", "ougr", "palm", "pauc", "pcun", "pelm", "perm", "phag", "phli", "phlp", "phlv", "phnx", "piqd", "plrd", "prti", "psin", "qaaa", "qaai", "qabx", "ranj", "rjng", "rohg", "roro", "runr", "samr", "sara", "sarb", "saur", "sgnw", "shaw", "shrd", "shui", "sidd", "sind", "sinh", "sogd", "sogo", "sora", "soyo", "sund", "sylo", "syrc", "syre", "syrj", "syrn", "tagb", "takr", "tale", "talu", "taml", "tang", "tavt", "telu", "teng", "tfng", "tglg", "thaa", "thai", "tibt", "tirh", "toto", "ugar", "vaii", "visp", "wara", "wcho", "wole", "xpeo", "xsux", "yezi", "yiii", "zanb", "zinh", "zmth", "zsye", "zsym", "zxxx", "zyyy", "zzzz", };
+		public static string UltimateFallbackScript = "zyyy";
+		public static Dictionary<string, string[]> FallbackScriptMap = new Dictionary<string, string[]> {
+			{ "aran", new string[] { "arab" } }, { "cyrs", new string[] { "cyrl" } },
+			{ "hanb", new string[] { "hant", "bopo" } }, { "hans", new string[] { "hani" } }, { "hant", new string[] { "hani" } },
+			{ "hrkt", new string[] { "hira", "kana" } }, { "jpan", new string[] { "hani", "hira", "kana" } },
+			{ "jamo", new string[] { "hang" } }, { "kore", new string[] { "hang", "hani" } },
+			{ "latf", new string[] { "latn" } }, { "latg", new string[] { "latn" } },
+			{ "syre", new string[] { "syrc" } }, { "syrj", new string[] { "syrc" } }, { "syrn", new string[] { "syrc" } },
+			{ "zsye", new string[] { "zsym" } },
+		};
+		public static void FillKeysWithScripts(IDictionary dict, Func<object> value) {
+			foreach (var s in Scripts) dict.Add(s, value());
+		}
+		public static IEnumerable<string> EnumerateFallbackScripts(string script) {
+			if (string.IsNullOrEmpty(script)) throw new ArgumentNullException("script");
+			script = script.ToLower();
+			if (script == UltimateFallbackScript) {
+				yield return null;
+				yield break;
+			}
+			string[] fblist;
+			if (FallbackScriptMap.TryGetValue(script, out fblist)) {
+				foreach (var fb in fblist) {
+					yield return fb;
+				}
+			}
+			else yield return UltimateFallbackScript;
+		}
+	}
+}

Assets/Cryville/Common/Culture/ScriptUtils.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ae9dab8f520fadc4194032f523ca87c1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Font/FontFile.cs

@@ -0,0 +1,113 @@
+using Cryville.Common.IO;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Cryville.Common.Font {
+	public abstract class FontFile : IEnumerable<Typeface> {
+		public abstract int Count { get; }
+		public abstract Typeface this[int index] { get; }
+		protected FileInfo File { get; private set; }
+		protected BinaryReader Reader { get; private set; }
+		public FontFile(FileInfo file) {
+			File = file;
+			Reader = new BinaryReaderBE(new FileStream(file.FullName, FileMode.Open, FileAccess.Read));
+		}
+		public void Close() { Reader.Close(); }
+
+		public static FontFile Create(FileInfo file) {
+			switch (file.Extension) {
+				case ".ttf": case ".otf": return new FontFileTTF(file);
+				case ".ttc": case ".otc": return new FontFileTTC(file);
+				default: return null;
+			}
+		}
+
+		public Enumerator GetEnumerator() {
+			return new Enumerator(this);
+		}
+		IEnumerator<Typeface> IEnumerable<Typeface>.GetEnumerator() {
+			return GetEnumerator();
+		}
+		IEnumerator IEnumerable.GetEnumerator() {
+			return GetEnumerator();
+		}
+
+		public struct Enumerator : IEnumerator<Typeface> {
+			readonly FontFile _self;
+			int _index;
+			internal Enumerator(FontFile self) {
+				_self = self;
+				_index = -1;
+			}
+
+			public Typeface Current {
+				get {
+					if (_index < 0)
+						throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended");
+					return _self[_index];
+				}
+			}
+
+			object IEnumerator.Current { get { return Current; } }
+
+			public void Dispose() {
+				_index = -2;
+			}
+
+			public bool MoveNext() {
+				if (_index == -2) return false;
+				_index++;
+				if (_index >= _self.Count) {
+					_index = -2;
+					return false;
+				}
+				return true;
+			}
+
+			public void Reset() {
+				_index = -1;
+			}
+		}
+	}
+	public class FontFileTTF : FontFile {
+		public override int Count { get { return 1; } }
+		public override Typeface this[int index] {
+			get {
+				if (index != 0) throw new ArgumentOutOfRangeException("index");
+				try {
+					return new TypefaceTTF(Reader, File, index);
+				}
+				catch (Exception) {
+					throw new InvalidDataException("Invalid font");
+				}
+			}
+		}
+		public FontFileTTF(FileInfo file) : base(file) { }
+	}
+	public class FontFileTTC : FontFile {
+		readonly IReadOnlyList<uint> _offsets;
+		public override int Count { get { return _offsets.Count; } }
+		public override Typeface this[int index] {
+			get {
+				if (index < 0 || index >= Count) throw new ArgumentOutOfRangeException("index");
+				Reader.BaseStream.Position = _offsets[index];
+				try {
+					return new TypefaceTTF(Reader, File, index);
+				}
+				catch (Exception) {
+					throw new InvalidDataException("Invalid font");
+				}
+			}
+		}
+		public FontFileTTC(FileInfo file) : base(file) {
+			try {
+				_offsets = new TTCHeader(Reader, 0).GetItems();
+			}
+			catch (Exception) {
+				throw new InvalidDataException("Invalid font");
+			}
+		}
+	}
+}

Assets/Cryville/Common/Font/FontFile.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c9f44ccf8ddd364418b4f4965414ff9c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Font/FontManager.cs

@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Cryville.Common.Font {
+	public abstract class FontManager {
+		public IReadOnlyDictionary<string, IReadOnlyCollection<Typeface>> MapFullNameToTypeface { get; private set; }
+		public IReadOnlyDictionary<string, IReadOnlyCollection<Typeface>> MapNameToTypefaces { get; private set; }
+		public FontManager() {
+			var map1 = new Dictionary<string, List<Typeface>>();
+			var map2 = new Dictionary<string, List<Typeface>>();
+			foreach (var f in EnumerateAllTypefaces()) {
+				List<Typeface> set1;
+				if (!map1.TryGetValue(f.FullName, out set1)) {
+					map1.Add(f.FullName, set1 = new List<Typeface>());
+				}
+				set1.Add(f);
+				List<Typeface> set2;
+				if (!map2.TryGetValue(f.FamilyName, out set2)) {
+					map2.Add(f.FamilyName, set2 = new List<Typeface>());
+				}
+				set2.Add(f);
+			}
+			MapFullNameToTypeface = map1.ToDictionary(i => i.Key, i => (IReadOnlyCollection<Typeface>)i.Value);
+			MapNameToTypefaces = map2.ToDictionary(i => i.Key, i => (IReadOnlyCollection<Typeface>)i.Value);
+		}
+		protected abstract IEnumerable<Typeface> EnumerateAllTypefaces();
+		protected static IEnumerable<Typeface> ScanDirectoryForTypefaces(string dir) {
+			foreach (var f in new DirectoryInfo(dir).EnumerateFiles()) {
+				FontFile file;
+				try {
+					file = FontFile.Create(f);
+				}
+				catch (InvalidDataException) {
+					continue;
+				}
+				if (file == null) continue;
+				var enumerator = file.GetEnumerator();
+				while (enumerator.MoveNext()) {
+					Typeface ret;
+					try {
+						ret = enumerator.Current;
+					}
+					catch (InvalidDataException) {
+						continue;
+					}
+					yield return ret;
+				}
+				file.Close();
+			}
+		}
+	}
+	public class FontManagerAndroid : FontManager {
+		protected override IEnumerable<Typeface> EnumerateAllTypefaces() {
+			return ScanDirectoryForTypefaces("/system/fonts");
+		}
+	}
+	public class FontManagerWindows : FontManager {
+		protected override IEnumerable<Typeface> EnumerateAllTypefaces() {
+			return ScanDirectoryForTypefaces("C:/Windows/Fonts");
+		}
+	}
+}

Assets/Cryville/Common/Font/FontMatcher.cs

@@ -0,0 +1,329 @@
+using Cryville.Common.Culture;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Cryville.Common.Font {
+	public abstract class FontMatcher {
+		protected FontManager Manager { get; private set; }
+		public FontMatcher(FontManager manafer) { Manager = manafer; }
+		public abstract IEnumerable<Typeface> MatchScript(string script = null, bool distinctFamily = false);
+	}
+	public class FallbackListFontMatcher : FontMatcher {
+		public Dictionary<string, List<string>> MapScriptToTypefaces = new Dictionary<string, List<string>>();
+		public void LoadDefaultWindowsFallbackList() {
+			if (Environment.OSVersion.Platform != PlatformID.Win32NT) return;
+			MapScriptToTypefaces.Clear();
+			ScriptUtils.FillKeysWithScripts(MapScriptToTypefaces, () => new List<string>());
+			// Reference: https://github.com/chromium/chromium/blob/main/third_party/blink/renderer/platform/fonts/win/font_fallback_win.cc
+			MapScriptToTypefaces["zyyy"].Insert(0, "SimSun"); // Custom
+			MapScriptToTypefaces["zyyy"].Insert(0, "SimHei"); // Custom
+			MapScriptToTypefaces["zyyy"].Insert(0, "Microsoft YaHei"); // Custom
+			MapScriptToTypefaces["zyyy"].Insert(0, "Arial");
+			MapScriptToTypefaces["zyyy"].Insert(0, "Times New Roman");
+			MapScriptToTypefaces["zyyy"].Insert(0, "Segoe UI"); // Custom
+			MapScriptToTypefaces["arab"].Insert(0, "Tahoma");
+			MapScriptToTypefaces["cyrl"].Insert(0, "Times New Roman");
+			MapScriptToTypefaces["grek"].Insert(0, "Times New Roman");
+			MapScriptToTypefaces["hebr"].Insert(0, "David");
+			MapScriptToTypefaces["jpan"].Insert(0, "MS PGothic");
+			MapScriptToTypefaces["latn"].Insert(0, "Times New Roman");
+			MapScriptToTypefaces["hans"].Insert(0, "SimSun");
+			MapScriptToTypefaces["hans"].Insert(0, "SimHei"); // Custom
+			MapScriptToTypefaces["thai"].Insert(0, "Tahoma");
+			MapScriptToTypefaces["hans"].Insert(0, "PMingLiU");
+			// Reference: https://learn.microsoft.com/en-us/globalization/input/font-support
+			var ver = Environment.OSVersion.Version;
+			if (ver >= new Version(5, 0)) { // Windows 2000
+				MapScriptToTypefaces["armn"].Insert(0, "Sylfaen");
+				MapScriptToTypefaces["deva"].Insert(0, "Mangal");
+				MapScriptToTypefaces["geor"].Insert(0, "Sylfaen");
+				MapScriptToTypefaces["taml"].Insert(0, "Latha");
+			}
+			if (ver >= new Version(5, 1)) { // Windows XP
+				MapScriptToTypefaces["gujr"].Insert(0, "Shruti");
+				MapScriptToTypefaces["guru"].Insert(0, "Raavi");
+				MapScriptToTypefaces["knda"].Insert(0, "Tunga");
+				MapScriptToTypefaces["syrc"].Insert(0, "Estrangelo Edessa");
+				MapScriptToTypefaces["telu"].Insert(0, "Gautami");
+				MapScriptToTypefaces["thaa"].Insert(0, "MV Boli");
+				// SP2
+				MapScriptToTypefaces["beng"].Insert(0, "Vrinda");
+				MapScriptToTypefaces["mlym"].Insert(0, "Kartika");
+			}
+			if (ver >= new Version(6, 0)) { // Windows Vista
+				MapScriptToTypefaces["cans"].Insert(0, "Euphemia");
+				MapScriptToTypefaces["cher"].Insert(0, "Plantagenet");
+				MapScriptToTypefaces["ethi"].Insert(0, "Nyala");
+				MapScriptToTypefaces["khmr"].Insert(0, "DaunPenh MoolBoran");
+				MapScriptToTypefaces["laoo"].Insert(0, "DokChampa");
+				MapScriptToTypefaces["mong"].Insert(0, "Mongolian Baiti");
+				MapScriptToTypefaces["orya"].Insert(0, "Kalinga");
+				MapScriptToTypefaces["sinh"].Insert(0, "Iskoola Pota");
+				MapScriptToTypefaces["tibt"].Insert(0, "Microsoft Himalaya");
+				MapScriptToTypefaces["yiii"].Insert(0, "Microsoft Yi Baiti");
+				MapScriptToTypefaces["arab"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["cyrl"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["grek"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["latn"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["hans"].Add("SimSun-ExtB");
+				MapScriptToTypefaces["hant"].Add("MingLiU-ExtB");
+				MapScriptToTypefaces["hant"].Add("MingLiU_HKSCS-ExtB");
+				MapScriptToTypefaces["arab"].Add("Microsoft Uighur");
+				MapScriptToTypefaces["zmth"].Insert(0, "Cambria Math");
+				// Reference: https://en.wikipedia.org/wiki/List_of_CJK_fonts
+				MapScriptToTypefaces["jpan"].Insert(0, "Meiryo");
+				MapScriptToTypefaces["hans"].Insert(0, "Microsoft YaHei");
+			}
+			if (ver >= new Version(6, 1)) { // Windows 7
+				MapScriptToTypefaces["brai"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["dsrt"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["talu"].Insert(0, "Microsoft New Tai Lue");
+				MapScriptToTypefaces["ogam"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["osma"].Insert(0, "Ebrima");
+				MapScriptToTypefaces["phag"].Insert(0, "Microsoft PhagsPa");
+				MapScriptToTypefaces["runr"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["zsym"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["tale"].Insert(0, "Microsoft Tai Le");
+				MapScriptToTypefaces["tfng"].Insert(0, "Ebrima");
+				MapScriptToTypefaces["vaii"].Insert(0, "Ebrima");
+			}
+			if (ver >= new Version(6, 2)) { // Windows 8
+				MapScriptToTypefaces["glag"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["goth"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["hang"].Add("Malgun Gothic");
+				MapScriptToTypefaces["ital"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["lisu"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["mymr"].Insert(0, "Myanmar Text");
+				MapScriptToTypefaces["nkoo"].Insert(0, "Ebrima");
+				MapScriptToTypefaces["orkh"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["ethi"].Insert(0, "Ebrima");
+				MapScriptToTypefaces["cans"].Insert(0, "Gadugi");
+				MapScriptToTypefaces["hant"].Insert(0, "Microsoft JhengHei UI");
+				MapScriptToTypefaces["hans"].Insert(0, "Microsoft YaHei UI");
+				MapScriptToTypefaces["beng"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["deva"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["gujr"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["guru"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				MapScriptToTypefaces["knda"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				MapScriptToTypefaces["mlym"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["orya"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["sinh"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				MapScriptToTypefaces["taml"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				MapScriptToTypefaces["telu"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["armn"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["geor"].Insert(0, "Segoe UI");
+				MapScriptToTypefaces["hebr"].Insert(0, "Segoe UI");
+			}
+			if (ver >= new Version(6, 3)) { // Windows 8.1
+				MapScriptToTypefaces["bugi"].Insert(0, "Leelawadee UI");
+				MapScriptToTypefaces["copt"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["java"].Insert(0, "Javanese Text");
+				MapScriptToTypefaces["merc"].Insert(0, "Segoe UI Symbol");
+				MapScriptToTypefaces["olck"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["sora"].Insert(0, "Nirmala UI");
+				MapScriptToTypefaces["khmr"].Insert(0, "Leelawadee UI");
+				MapScriptToTypefaces["laoo"].Insert(0, "Leelawadee UI");
+				MapScriptToTypefaces["thai"].Insert(0, "Leelawadee UI");
+				MapScriptToTypefaces["zsye"].Insert(0, "Segoe UI Emoji");
+			}
+			if (ver >= new Version(10, 0)) { // Windows 10
+				MapScriptToTypefaces["brah"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["cari"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["cprt"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["egyp"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["armi"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["phli"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["prti"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["khar"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["lyci"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["lydi"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["phnx"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["xpeo"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["sarb"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["shaw"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["xsux"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["ugar"].Insert(0, "Segoe UI Historic");
+				// Segoe UI Symbol -> Segoe UI Historic
+				MapScriptToTypefaces["glag"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["goth"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["merc"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["ogam"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["ital"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["orkh"].Insert(0, "Segoe UI Historic");
+				MapScriptToTypefaces["runr"].Insert(0, "Segoe UI Historic");
+				//
+				MapScriptToTypefaces["jpan"].Insert(0, "Yu Gothic UI");
+				MapScriptToTypefaces["zsym"].Add("Segoe MDL2 Assets");
+			}
+		}
+		public void LoadDefaultAndroidFallbackList() {
+			if (Environment.OSVersion.Platform != PlatformID.Unix) return;
+			MapScriptToTypefaces.Clear();
+			ScriptUtils.FillKeysWithScripts(MapScriptToTypefaces, () => new List<string>());
+			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK TC"); // TODO Modify default fallback
+			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK JP");
+			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK SC");
+			MapScriptToTypefaces["zyyy"].Insert(0, "Roboto");
+			MapScriptToTypefaces["zsye"].Insert(0, "Noto Color Emoji");
+			MapScriptToTypefaces["zsye"].Add("Noto Color Emoji Flags");
+			MapScriptToTypefaces["arab"].Insert(0, "Noto Naskh Arabic");
+			MapScriptToTypefaces["adlm"].Insert(0, "Noto Sans Adlam");
+			MapScriptToTypefaces["ahom"].Insert(0, "Noto Sans Ahom");
+			MapScriptToTypefaces["hluw"].Insert(0, "Noto Sans Anatolian Hieroglyphs");
+			MapScriptToTypefaces["armn"].Insert(0, "Noto Sans Armenian");
+			MapScriptToTypefaces["avst"].Insert(0, "Noto Sans Avestan");
+			MapScriptToTypefaces["bali"].Insert(0, "Noto Sans Balinese");
+			MapScriptToTypefaces["bamu"].Insert(0, "Noto Sans Bamum");
+			MapScriptToTypefaces["bass"].Insert(0, "Noto Sans Bassa Vah");
+			MapScriptToTypefaces["batk"].Insert(0, "Noto Sans Batak");
+			MapScriptToTypefaces["beng"].Insert(0, "Noto Sans Bengali");
+			MapScriptToTypefaces["bhks"].Insert(0, "Noto Sans Bhaiksuki");
+			MapScriptToTypefaces["brah"].Insert(0, "Noto Sans Brahmi");
+			MapScriptToTypefaces["bugi"].Insert(0, "Noto Sans Buginese");
+			MapScriptToTypefaces["buhd"].Insert(0, "Noto Sans Buhid");
+			MapScriptToTypefaces["jpan"].Insert(0, "Noto Sans CJK JP");
+			MapScriptToTypefaces["kore"].Insert(0, "Noto Sans CJK KR");
+			MapScriptToTypefaces["hans"].Insert(0, "Noto Sans CJK SC");
+			MapScriptToTypefaces["hant"].Insert(0, "Noto Sans CJK TC");
+			MapScriptToTypefaces["hant"].Add("Noto Sans CJK HK");
+			MapScriptToTypefaces["cans"].Insert(0, "Noto Sans Canadian Aboriginal");
+			MapScriptToTypefaces["cari"].Insert(0, "Noto Sans Carian");
+			MapScriptToTypefaces["cakm"].Insert(0, "Noto Sans Chakma");
+			MapScriptToTypefaces["cham"].Insert(0, "Noto Sans Cham");
+			MapScriptToTypefaces["cher"].Insert(0, "Noto Sans Cherokee");
+			MapScriptToTypefaces["copt"].Insert(0, "Noto Sans Coptic");
+			MapScriptToTypefaces["xsux"].Insert(0, "Noto Sans Cuneiform");
+			MapScriptToTypefaces["cprt"].Insert(0, "Noto Sans Cypriot");
+			MapScriptToTypefaces["dsrt"].Insert(0, "Noto Sans Deseret");
+			MapScriptToTypefaces["deva"].Insert(0, "Noto Sans Devanagari");
+			MapScriptToTypefaces["egyp"].Insert(0, "Noto Sans Egyptian Hieroglyphs");
+			MapScriptToTypefaces["elba"].Insert(0, "Noto Sans Elbasan");
+			MapScriptToTypefaces["ethi"].Insert(0, "Noto Sans Ethiopic");
+			MapScriptToTypefaces["geor"].Insert(0, "Noto Sans Georgian");
+			MapScriptToTypefaces["glag"].Insert(0, "Noto Sans Glagolitic");
+			MapScriptToTypefaces["goth"].Insert(0, "Noto Sans Gothic");
+			MapScriptToTypefaces["gran"].Insert(0, "Noto Sans Grantha");
+			MapScriptToTypefaces["gujr"].Insert(0, "Noto Sans Gujarati");
+			MapScriptToTypefaces["gong"].Insert(0, "Noto Sans Gunjala Gondi");
+			MapScriptToTypefaces["guru"].Insert(0, "Noto Sans Gurmukhi");
+			MapScriptToTypefaces["rohg"].Insert(0, "Noto Sans Hanifi Rohingya");
+			MapScriptToTypefaces["hano"].Insert(0, "Noto Sans Hanunoo");
+			MapScriptToTypefaces["hatr"].Insert(0, "Noto Sans Hatran");
+			MapScriptToTypefaces["hebr"].Insert(0, "Noto Sans Hebrew");
+			MapScriptToTypefaces["armi"].Insert(0, "Noto Sans Imperial Aramaic");
+			MapScriptToTypefaces["phli"].Insert(0, "Noto Sans Inscriptional Pahlavi");
+			MapScriptToTypefaces["prti"].Insert(0, "Noto Sans Inscriptional Parthian");
+			MapScriptToTypefaces["java"].Insert(0, "Noto Sans Javanese");
+			MapScriptToTypefaces["kthi"].Insert(0, "Noto Sans Kaithi");
+			MapScriptToTypefaces["knda"].Insert(0, "Noto Sans Kannada");
+			MapScriptToTypefaces["kali"].Insert(0, "Noto Sans KayahLi");
+			MapScriptToTypefaces["khar"].Insert(0, "Noto Sans Kharoshthi");
+			MapScriptToTypefaces["khmr"].Insert(0, "Noto Sans Khmer");
+			MapScriptToTypefaces["khoj"].Insert(0, "Noto Sans Khojki");
+			MapScriptToTypefaces["laoo"].Insert(0, "Noto Sans Lao");
+			MapScriptToTypefaces["lepc"].Insert(0, "Noto Sans Lepcha");
+			MapScriptToTypefaces["limb"].Insert(0, "Noto Sans Limbu");
+			MapScriptToTypefaces["lina"].Insert(0, "Noto Sans Linear A");
+			MapScriptToTypefaces["linb"].Insert(0, "Noto Sans Linear B");
+			MapScriptToTypefaces["lisu"].Insert(0, "Noto Sans Lisu");
+			MapScriptToTypefaces["lyci"].Insert(0, "Noto Sans Lycian");
+			MapScriptToTypefaces["lydi"].Insert(0, "Noto Sans Lydian");
+			MapScriptToTypefaces["mlym"].Insert(0, "Noto Sans Malayalam");
+			MapScriptToTypefaces["mand"].Insert(0, "Noto Sans Mandiac");
+			MapScriptToTypefaces["mani"].Insert(0, "Noto Sans Manichaean");
+			MapScriptToTypefaces["marc"].Insert(0, "Noto Sans Marchen");
+			MapScriptToTypefaces["gonm"].Insert(0, "Noto Sans Masaram Gondi");
+			MapScriptToTypefaces["medf"].Insert(0, "Noto Sans Medefaidrin");
+			MapScriptToTypefaces["mtei"].Insert(0, "Noto Sans Meetei Mayek");
+			MapScriptToTypefaces["merc"].Insert(0, "Noto Sans Meroitic");
+			MapScriptToTypefaces["mero"].Insert(0, "Noto Sans Meroitic");
+			MapScriptToTypefaces["plrd"].Insert(0, "Noto Sans Miao");
+			MapScriptToTypefaces["modi"].Insert(0, "Noto Sans Modi");
+			MapScriptToTypefaces["mong"].Insert(0, "Noto Sans Mongolian");
+			MapScriptToTypefaces["mroo"].Insert(0, "Noto Sans Mro");
+			MapScriptToTypefaces["mult"].Insert(0, "Noto Sans Multani");
+			MapScriptToTypefaces["mymr"].Insert(0, "Noto Sans Myanmar");
+			MapScriptToTypefaces["nkoo"].Insert(0, "Noto Sans Nko");
+			MapScriptToTypefaces["nbat"].Insert(0, "Noto Sans Nabataean");
+			MapScriptToTypefaces["talu"].Insert(0, "Noto Sans New Tai Lue");
+			MapScriptToTypefaces["newa"].Insert(0, "Noto Sans Newa");
+			MapScriptToTypefaces["ogam"].Insert(0, "Noto Sans Ogham");
+			MapScriptToTypefaces["olck"].Insert(0, "Noto Sans Ol Chiki");
+			MapScriptToTypefaces["ital"].Insert(0, "Noto Sans Old Italian");
+			MapScriptToTypefaces["narb"].Insert(0, "Noto Sans Old North Arabian");
+			MapScriptToTypefaces["perm"].Insert(0, "Noto Sans Old Permic");
+			MapScriptToTypefaces["xpeo"].Insert(0, "Noto Sans Old Persian");
+			MapScriptToTypefaces["sarb"].Insert(0, "Noto Sans Old South Arabian");
+			MapScriptToTypefaces["orkh"].Insert(0, "Noto Sans Old Turkic");
+			MapScriptToTypefaces["orya"].Insert(0, "Noto Sans Oriya");
+			MapScriptToTypefaces["osge"].Insert(0, "Noto Sans Osage");
+			MapScriptToTypefaces["osma"].Insert(0, "Noto Sans Osmanya");
+			MapScriptToTypefaces["hmng"].Insert(0, "Noto Sans Pahawh Hmong");
+			MapScriptToTypefaces["palm"].Insert(0, "Noto Sans Palmyrene");
+			MapScriptToTypefaces["pauc"].Insert(0, "Noto Sans Pau Cin Hau");
+			MapScriptToTypefaces["phag"].Insert(0, "Noto Sans Phags Pa");
+			MapScriptToTypefaces["phnx"].Insert(0, "Noto Sans Phoenician");
+			MapScriptToTypefaces["rjng"].Insert(0, "Noto Sans Rejang");
+			MapScriptToTypefaces["runr"].Insert(0, "Noto Sans Runic");
+			MapScriptToTypefaces["samr"].Insert(0, "Noto Sans Samaritan");
+			MapScriptToTypefaces["saur"].Insert(0, "Noto Sans Saurashtra");
+			MapScriptToTypefaces["shrd"].Insert(0, "Noto Sans Sharada");
+			MapScriptToTypefaces["shaw"].Insert(0, "Noto Sans Shavian");
+			MapScriptToTypefaces["sinh"].Insert(0, "Noto Sans Sinhala");
+			MapScriptToTypefaces["sora"].Insert(0, "Noto Sans Sora Sompeng");
+			MapScriptToTypefaces["soyo"].Insert(0, "Noto Sans Soyombo");
+			MapScriptToTypefaces["sund"].Insert(0, "Noto Sans Sundanese");
+			MapScriptToTypefaces["sylo"].Insert(0, "Noto Sans Syloti Nagri");
+			MapScriptToTypefaces["zsym"].Insert(0, "Noto Sans Symbols");
+			MapScriptToTypefaces["syrn"].Insert(0, "Noto Sans Syriac Eastern");
+			MapScriptToTypefaces["syre"].Insert(0, "Noto Sans Syriac Estrangela");
+			MapScriptToTypefaces["syrj"].Insert(0, "Noto Sans Syriac Western");
+			MapScriptToTypefaces["tglg"].Insert(0, "Noto Sans Tagalog");
+			MapScriptToTypefaces["tagb"].Insert(0, "Noto Sans Tagbanwa");
+			MapScriptToTypefaces["tale"].Insert(0, "Noto Sans Tai Le");
+			MapScriptToTypefaces["lana"].Insert(0, "Noto Sans Tai Tham");
+			MapScriptToTypefaces["tavt"].Insert(0, "Noto Sans Tai Viet");
+			MapScriptToTypefaces["takr"].Insert(0, "Noto Sans Takri");
+			MapScriptToTypefaces["taml"].Insert(0, "Noto Sans Tamil");
+			MapScriptToTypefaces["telu"].Insert(0, "Noto Sans Telugu");
+			MapScriptToTypefaces["thaa"].Insert(0, "Noto Sans Thaana");
+			MapScriptToTypefaces["thai"].Insert(0, "Noto Sans Thai");
+			MapScriptToTypefaces["tfng"].Insert(0, "Noto Sans Tifinagh");
+			MapScriptToTypefaces["ugar"].Insert(0, "Noto Sans Ugaritic");
+			MapScriptToTypefaces["vaii"].Insert(0, "Noto Sans Vai");
+			MapScriptToTypefaces["wcho"].Insert(0, "Noto Sans Wancho");
+			MapScriptToTypefaces["wara"].Insert(0, "Noto Sans Warang Citi");
+			MapScriptToTypefaces["yiii"].Insert(0, "Noto Sans Yi");
+		}
+		public FallbackListFontMatcher(FontManager manager) : base(manager) { }
+		public override IEnumerable<Typeface> MatchScript(string script = null, bool distinctFamily = false) {
+			if (string.IsNullOrEmpty(script)) script = ScriptUtils.UltimateFallbackScript;
+			List<string> candidates;
+			IEnumerable<string> candidateScripts = new string[] { script };
+			while (candidateScripts != null) {
+				foreach (var candidateScript in candidateScripts) {
+					if (MapScriptToTypefaces.TryGetValue(candidateScript, out candidates)) {
+						foreach (var candidate in candidates) {
+							IReadOnlyCollection<Typeface> typefaces1;
+							if (Manager.MapFullNameToTypeface.TryGetValue(candidate, out typefaces1)) {
+								foreach (var typeface in typefaces1) {
+									yield return typeface;
+								}
+							}
+							if (distinctFamily) continue;
+							IReadOnlyCollection<Typeface> typefaces2;
+							if (Manager.MapNameToTypefaces.TryGetValue(candidate, out typefaces2)) {
+								foreach (var typeface in typefaces2) {
+									if (typefaces1.Contains(typeface)) continue;
+									yield return typeface;
+								}
+							}
+						}
+					}
+				}
+				candidateScripts = ScriptUtils.EnumerateFallbackScripts(script);
+			}
+		}
+	}
+}

Assets/Cryville/Common/Font/FontMatcher.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: afcde0ad1865db24da79ca1ce7256791
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Font/FontTable.cs

@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Common.Font {
+	public abstract class FontTable<T> {
+		protected UInt32 Offset { get; private set; }
+		protected BinaryReader Reader { get; private set; }
+
+		protected FontTable(BinaryReader reader, UInt32 offset) {
+			Reader = reader;
+			Offset = offset;
+			reader.BaseStream.Position = offset;
+		}
+		public abstract IReadOnlyList<T> GetItems();
+	}
+	public abstract class FontTable<T, U> : FontTable<T> {
+		protected FontTable(BinaryReader reader, UInt32 offset) : base(reader, offset) { }
+		public abstract U GetSubTable(T item);
+	}
+	public sealed class TTCHeader : FontTable<UInt32, TableDirectory> {
+		readonly String ttcTag;
+		readonly UInt16 majorVersion;
+		readonly UInt16 minorVersion;
+		readonly UInt32 numFonts;
+		readonly List<UInt32> tableDirectoryOffsets = new List<UInt32>();
+		readonly String dsigTag;
+		readonly UInt32 dsigLength;
+		readonly UInt32 dsigOffset;
+		public TTCHeader(BinaryReader reader, UInt32 offset) : base(reader, offset) {
+			ttcTag = reader.ReadTag();
+			if (ttcTag != "ttcf") throw new NotImplementedException();
+			majorVersion = reader.ReadUInt16();
+			minorVersion = reader.ReadUInt16();
+			numFonts = reader.ReadUInt32();
+			for (UInt32 i = 0; i < numFonts; i++) tableDirectoryOffsets.Add(reader.ReadUInt32());
+			if (majorVersion == 2) {
+				dsigTag = reader.ReadTag();
+				dsigLength = reader.ReadUInt32();
+				dsigOffset = reader.ReadUInt32();
+			}
+		}
+		public override IReadOnlyList<UInt32> GetItems() {
+			return tableDirectoryOffsets;
+		}
+		public override TableDirectory GetSubTable(UInt32 item) {
+			var i = (UInt32)item;
+			return new TableDirectory(Reader, i);
+		}
+	}
+	public sealed class TableDirectory : FontTable<TableRecord, object> {
+		readonly UInt32 sfntVersion;
+		readonly UInt16 numTables;
+		readonly UInt16 searchRange;
+		readonly UInt16 entrySelector;
+		readonly UInt16 rangeShift;
+		readonly List<TableRecord> tableRecords = new List<TableRecord>();
+		public TableDirectory(BinaryReader reader, UInt32 offset) : base(reader, offset) {
+			sfntVersion = reader.ReadUInt32();
+			numTables = reader.ReadUInt16();
+			searchRange = reader.ReadUInt16();
+			entrySelector = reader.ReadUInt16();
+			rangeShift = reader.ReadUInt16();
+			for (int i = 0; i < numTables; i++)
+				tableRecords.Add(new TableRecord {
+					tableTag = reader.ReadTag(),
+					checksum = reader.ReadUInt32(),
+					offset = reader.ReadUInt32(),
+					length = reader.ReadUInt32(),
+				});
+		}
+		public override IReadOnlyList<TableRecord> GetItems() {
+			return tableRecords;
+		}
+		public override object GetSubTable(TableRecord item) {
+			switch (item.tableTag) {
+				case "name": return new NameTable(Reader, item.offset);
+				case "meta": return new MetaTable(Reader, item.offset);
+				default: throw new NotImplementedException();
+			}
+		}
+	}
+	public struct TableRecord {
+		public string tableTag;
+		public UInt32 checksum;
+		public UInt32 offset;
+		public UInt32 length;
+	}
+	public sealed class NameTable : FontTable<NameRecord> {
+		readonly UInt16 version;
+		readonly UInt16 count;
+		readonly UInt16 storageOffset;
+		readonly List<NameRecord> nameRecord = new List<NameRecord>();
+		readonly UInt16 langTagCount;
+		readonly List<LangTagRecord> langTagRecord = new List<LangTagRecord>();
+		public NameTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
+			version = reader.ReadUInt16();
+			count = reader.ReadUInt16();
+			storageOffset = reader.ReadUInt16();
+			for (UInt16 i = 0; i < count; i++)
+				nameRecord.Add(new NameRecord {
+					platformID = reader.ReadUInt16(),
+					encodingID = reader.ReadUInt16(),
+					languageID = reader.ReadUInt16(),
+					nameID = (NameID)reader.ReadUInt16(),
+					length = reader.ReadUInt16(),
+					stringOffset = reader.ReadUInt16(),
+				});
+			if (version == 1) {
+				langTagCount = reader.ReadUInt16();
+				for (UInt16 i = 0; i < langTagCount; i++)
+					langTagRecord.Add(new LangTagRecord {
+						length = reader.ReadUInt16(),
+						langTagOffset = reader.ReadUInt16(),
+					});
+			}
+			UInt32 origin = (UInt32)reader.BaseStream.Position;
+			for (int i = 0; i < nameRecord.Count; i++) nameRecord[i] = nameRecord[i].Load(reader, origin);
+			for (int i = 0; i < langTagRecord.Count; i++) langTagRecord[i] = langTagRecord[i].Load(reader, origin);
+		}
+		public sealed override IReadOnlyList<NameRecord> GetItems() {
+			return nameRecord;
+		}
+	}
+	public struct NameRecord {
+		public UInt16 platformID;
+		public UInt16 encodingID;
+		public UInt16 languageID;
+		public NameID nameID;
+		public UInt16 length;
+		public UInt16 stringOffset;
+		public String value { get; private set; }
+		public NameRecord Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + stringOffset;
+			Encoding encoding;
+			switch (platformID) {
+				case 0: encoding = Encoding.BigEndianUnicode; break;
+				case 3: encoding = Encoding.BigEndianUnicode; break;
+				default: return this;
+			}
+			value = encoding.GetString(reader.ReadBytes(length));
+			return this;
+		}
+	}
+	public enum NameID : UInt16 {
+		CopyrightNotice      =  0,
+		FontFamilyName       =  1,
+		FontSubfamilyName    =  2,
+		UniqueFontIdentifier =  3,
+		FullFontName         =  4,
+		VersionString        =  5,
+		PostScriptName       =  6,
+		Trademark            =  7,
+		ManufacturerName     =  8,
+		Designer             =  9,
+		Description          = 10,
+		URLVendor            = 11,
+		URLDesigner          = 12,
+		LicenseDescription   = 13,
+		LicenseInfoURL       = 14,
+
+		TypographicFamilyName          = 16,
+		TypographicSubfamilyName       = 17,
+		CompatibleFull                 = 18,
+		SampleText                     = 19,
+		PostScriptCIDFindfontName      = 20,
+		WWSFamilyName                  = 21,
+		WWSSubfamilyName               = 22,
+		LightBackgroundPalette         = 23,
+		DarkBackgroundPalette          = 24,
+		VariationsPostScriptNamePrefix = 25,
+	}
+	public struct LangTagRecord {
+		public UInt16 length;
+		public UInt16 langTagOffset;
+		public String value { get; private set; }
+		public LangTagRecord Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + langTagOffset;
+			value = Encoding.BigEndianUnicode.GetString(reader.ReadBytes(length));
+			return this;
+		}
+	}
+	public sealed class MetaTable : FontTable<DataMap> {
+		readonly UInt32 version;
+		readonly UInt32 flags;
+		readonly UInt32 dataMapCount;
+		readonly List<DataMap> dataMaps = new List<DataMap>();
+		public MetaTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
+			version = reader.ReadUInt32();
+			flags = reader.ReadUInt32();
+			reader.ReadUInt32();
+			dataMapCount = reader.ReadUInt32();
+			for (UInt32 i = 0; i < dataMapCount; i++)
+				dataMaps.Add(new DataMap {
+					tag = reader.ReadTag(),
+					dataOffset = reader.ReadUInt32(),
+					dataLength = reader.ReadUInt32(),
+				});
+			for (int i = 0; i < dataMaps.Count; i++) dataMaps[i] = dataMaps[i].Load(reader, offset);
+		}
+		public sealed override IReadOnlyList<DataMap> GetItems() {
+			return dataMaps;
+		}
+	}
+	public struct DataMap {
+		public String tag;
+		public UInt32 dataOffset;
+		public UInt32 dataLength;
+		public String value { get; private set; }
+		public DataMap Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + dataOffset;
+			value = Encoding.ASCII.GetString(reader.ReadBytes((int)dataLength));
+			return this;
+		}
+	}
+	public static class BinaryReaderExtensions {
+		public static string ReadTag(this BinaryReader reader) {
+			return Encoding.ASCII.GetString(reader.ReadBytes(4));
+		}
+	}
+}

Assets/Cryville/Common/Font/FontTable.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3eed6aa2387582346b7b21c6f8de5e1f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Font/FontUtil.cs

@@ -1,9 +0,0 @@
-using System.Globalization;
-
-namespace Cryville.Common.Font {
-	public static class FontUtil {
-		/*public static string MatchFontNameWithLang(string lang) {
-			
-		}*/
-	}
-}

Assets/Cryville/Common/Font/Typeface.cs

@@ -0,0 +1,31 @@
+using System.IO;
+using System.Linq;
+
+namespace Cryville.Common.Font {
+	public abstract class Typeface {
+		public FileInfo File { get; private set; }
+		public int IndexInFile { get; private set; }
+		public string FamilyName { get; protected set; }
+		public string SubfamilyName { get; protected set; }
+		public string FullName { get; protected set; }
+		protected abstract void GetName(BinaryReader reader);
+
+		public Typeface(BinaryReader reader, FileInfo file, int index) {
+			File = file;
+			IndexInFile = index;
+			GetName(reader);
+		}
+	}
+	public class TypefaceTTF : Typeface {
+		public TypefaceTTF(BinaryReader reader, FileInfo file, int index)
+			: base(reader, file, index) { }
+
+		protected override void GetName(BinaryReader reader) {
+			var dir = new TableDirectory(reader, (uint)reader.BaseStream.Position);
+			var nameTable = (NameTable)dir.GetSubTable((from i in dir.GetItems() where i.tableTag == "name" select i).Single());
+			FamilyName = (from i in nameTable.GetItems() where i.nameID == NameID.FontFamilyName && i.value != null select i.value).First();
+			SubfamilyName = (from i in nameTable.GetItems() where i.nameID == NameID.FontSubfamilyName && i.value != null select i.value).First();
+			FullName = (from i in nameTable.GetItems() where i.nameID == NameID.FullFontName && i.value != null select i.value).First();
+		}
+	}
+}

Assets/Cryville/Common/Font/Typeface.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0968fc12b50cffb4682f0c28d0d14703
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/IO.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 215ebdd4cb9187741a2e24f5e7d8511d
+guid: aaa0d8cecafb37b46a6abe372cfefd93
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Cryville/Common/IO/BinaryReaderBE.cs

@@ -0,0 +1,75 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Common.IO {
+	public class BinaryReaderBE : BinaryReader {
+		readonly byte[] m_buffer = new byte[8];
+
+		public BinaryReaderBE(Stream input) : base(input) { }
+
+		public BinaryReaderBE(Stream input, Encoding encoding) : base(input, encoding) { }
+
+		public BinaryReaderBE(Stream input, Encoding encoding, bool leaveOpen) : base(input, encoding, leaveOpen) { }
+
+		public override short ReadInt16() {
+			FillBuffer(2);
+			return (short)(m_buffer[1] | (m_buffer[0] << 8));
+		}
+		public override ushort ReadUInt16() {
+			FillBuffer(2);
+			return (ushort)(m_buffer[1] | (m_buffer[0] << 8));
+		}
+
+		public override int ReadInt32() {
+			FillBuffer(4);
+			return m_buffer[3] | (m_buffer[2] << 8) | (m_buffer[1] << 16) | (m_buffer[0] << 24);
+		}
+		public override uint ReadUInt32() {
+			FillBuffer(4);
+			return (uint)(m_buffer[3] | (m_buffer[2] << 8) | (m_buffer[1] << 16) | (m_buffer[0] << 24));
+		}
+
+		public override long ReadInt64() {
+			FillBuffer(8);
+			uint num = (uint)(m_buffer[7] | (m_buffer[6] << 8) | (m_buffer[5] << 16) | (m_buffer[4] << 24));
+			uint num2 = (uint)(m_buffer[3] | (m_buffer[2] << 8) | (m_buffer[1] << 16) | (m_buffer[0] << 24));
+			return (long)(((ulong)num2 << 32) | num);
+		}
+		public override ulong ReadUInt64() {
+			FillBuffer(8);
+			uint num = (uint)(m_buffer[7] | (m_buffer[6] << 8) | (m_buffer[5] << 16) | (m_buffer[4] << 24));
+			uint num2 = (uint)(m_buffer[3] | (m_buffer[2] << 8) | (m_buffer[1] << 16) | (m_buffer[0] << 24));
+			return ((ulong)num2 << 32) | num;
+		}
+		protected new void FillBuffer(int numBytes) {
+			if (m_buffer != null && (numBytes < 0 || numBytes > m_buffer.Length)) {
+				throw new ArgumentOutOfRangeException("numBytes", "Requested numBytes is larger than the internal buffer size");
+			}
+
+			int num = 0, num2;
+			if (BaseStream == null) {
+				throw new IOException("File not open");
+			}
+
+			if (numBytes == 1) {
+				num2 = BaseStream.ReadByte();
+				if (num2 == -1) {
+					throw new EndOfStreamException("The end of the stream is reached before numBytes could be read");
+				}
+				m_buffer[0] = (byte)num2;
+				return;
+			}
+
+			do {
+				num2 = BaseStream.Read(m_buffer, num, numBytes - num);
+				if (num2 == 0) {
+					throw new EndOfStreamException("The end of the stream is reached before numBytes could be read");
+				}
+
+				num += num2;
+			}
+			while (num < numBytes);
+		}
+	}
+}

Assets/Cryville/Common/IO/BinaryReaderBE.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aee537c74ab935940b54cb5d784b7f56
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Math/ColumnVector.cs

@@ -54,16 +54,13 @@ namespace Cryville.Common.Math {
 			return res;
 		}
 		/// <summary>
-		/// Creates a <see cref="System.Single" /> column vector and fills it with polynomial coefficients.
+		/// Fills a <see cref="System.Single" /> column vector with polynomial coefficients.
 		/// </summary>
-		/// <param name="size">The size of the column vector.</param>
+		/// <param name="vec">The column vector.</param>
 		/// <param name="num">The base number.</param>
-		/// <returns>A <see cref="System.Single" /> column vector filled with polynomial coefficients.</returns>
-		public static ColumnVector<float> WithPolynomialCoefficients(int size, float num) {
-			var m = new ColumnVector<float>(size);
-			for (var i = 0; i < size; i++)
-				m[i] = (float)System.Math.Pow(num, i);
-			return m;
+		public static void FillWithPolynomialCoefficients(ColumnVector<float> vec, float num) {
+			for (var i = 0; i < vec.Size; i++)
+				vec[i] = (float)System.Math.Pow(num, i);
 		}
 	}
 }

Assets/Cryville/Common/Math/SquareMatrix.cs

@@ -1,4 +1,4 @@
-using System;
+using UnsafeIL;
 
 namespace Cryville.Common.Math {
 	/// <summary>
@@ -40,11 +40,11 @@ namespace Cryville.Common.Math {
 		/// </summary>
 		/// <typeparam name="T">The vector type.</typeparam>
 		/// <param name="v">The column vector.</param>
+		/// <param name="result">The result column vector.</param>
 		/// <param name="o">The column operator.</param>
-		/// <returns>The column vector eliminated.</returns>
-		public ColumnVector<T> Eliminate<T>(ColumnVector<T> v, IVectorOperator<T> o) {
+		public void Eliminate<T>(ColumnVector<T> v, ColumnVector<T> result, IVectorOperator<T> o) {
 			int s = Size;
-			Array.Copy(content, buffer, Size * Size);
+			FillBuffer();
 			for (int i = 0; i < s; i++) refl[i] = i;
 			for (int r = 0; r < s; r++) {
 				for (int r0 = r; r0 < s; r0++)
@@ -66,14 +66,17 @@ namespace Cryville.Common.Math {
 					v[or1] = o.Add(v[or1], o.ScalarMultiply(-sf1, v[or]));
 				}
 			}
-			ColumnVector<T> res = new ColumnVector<T>(s);
 			for (int r2 = s - 1; r2 >= 0; r2--) {
 				var v2 = v[refl[r2]];
 				for (int c2 = r2 + 1; c2 < s; c2++)
-					v2 = o.Add(v2, o.ScalarMultiply(-buffer[refl[r2], c2], res[refl[c2]]));
-				res[refl[r2]] = v2;
+					v2 = o.Add(v2, o.ScalarMultiply(-buffer[refl[r2], c2], result[refl[c2]]));
+				result[refl[r2]] = v2;
+			}
+		}
+		unsafe void FillBuffer() {
+			fixed (void* ptrc = content, ptrb = buffer) {
+				Unsafe.CopyBlock(ptrb, ptrc, (uint)(Size * Size * sizeof(float)));
 			}
-			return res;
 		}
 		/// <summary>
 		/// Creates a square matrix and fills it with polynomial coefficients.

Assets/Cryville/Common/Pdt/PdtAttributes.cs

@@ -1,7 +1,21 @@
 using System;
 
 namespace Cryville.Common.Pdt {
+	/// <summary>
+	/// Indicates that the attributed member is an element list.
+	/// </summary>
+	/// <remarks>
+	/// <para>An element list is a <see cref="System.Collections.IDictionary" /> that represents a collection of PDT elements. There must be at most one element list in a class.</para>
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
 	public class ElementListAttribute : Attribute { }
-	public class ComponentListAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that the attributed member is a property list.
+	/// </summary>
+	/// <remarks>
+	/// <para>A property list is a <see cref="System.Collections.IDictionary" /> that represents a collection of PDT properties. There must be at most one property list in a class.</para>
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
 	public class PropertyListAttribute : Attribute { }
 }

Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
@@ -104,7 +105,7 @@ namespace Cryville.Common.Pdt {
 				else if (i is PdtInstruction.PushVariable) {
 					i.Execute(this);
 					var frame = _stack[_framecount - 1];
-					if (frame.Type != PdtInternalType.Undefined) {
+					if (frame.Type != PdtInternalType.Undefined && frame.Type != PdtInternalType.Error) {
 						_rip = il.AddAfter(_rip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length));
 						il.Remove(_rip.Previous);
 					}
@@ -147,10 +148,10 @@ namespace Cryville.Common.Pdt {
 				_goffset += value.Length;
 			}
 		}
-		internal unsafe void PushVariable(int name) {
+		internal unsafe void PushVariable(int name, bool forced) {
 			fixed (StackFrame* frame = &_stack[_framecount++]) {
 				byte[] value;
-				GetVariable(name, out frame->Type, out value);
+				GetVariable(name, forced, out frame->Type, out value);
 				frame->Offset = _goffset;
 				frame->Length = value.Length;
 				Array.Copy(value, 0, _mem, _goffset, value.Length);
@@ -161,16 +162,17 @@ namespace Cryville.Common.Pdt {
 		/// Gets a variable of the specified name.
 		/// </summary>
 		/// <param name="name">The name of the variable.</param>
+		/// <param name="forced">Whether to produce an error stack instead of an identifier stack if the variable is not found.</param>
 		/// <param name="type">The type of the variable.</param>
 		/// <param name="value">The value of the variable.</param>
-		protected abstract void GetVariable(int name, out int type, out byte[] value);
+		protected abstract void GetVariable(int name, bool forced, out int type, out byte[] value);
 		internal void Operate(PdtOperatorSignature sig) {
 			PdtOperator op;
 			try { op = GetOperator(sig); }
-			catch (Exception) {
+			catch (Exception ex) {
 				for (int i = 0; i < sig.ParamCount; i++)
 					DiscardStack();
-				throw;
+				throw new EvaluationFailureException(string.Format("Failed to get operator {0}", sig), ex);
 			}
 			Operate(op, sig.ParamCount);
 		}
@@ -222,4 +224,18 @@ namespace Cryville.Common.Pdt {
 			_goffset -= _stack[--_framecount].Length;
 		}
 	}
+
+	/// <summary>
+	/// The exception that is thrown when the evalution of a <see cref="PdtExpression" /> fails.
+	/// </summary>
+	public class EvaluationFailureException : Exception {
+		/// <inheritdoc />
+		public EvaluationFailureException() : base("Evaluation failed") { }
+		/// <inheritdoc />
+		public EvaluationFailureException(string message) : base(message) { }
+		/// <inheritdoc />
+		public EvaluationFailureException(string message, Exception innerException) : base(message, innerException) { }
+		/// <inheritdoc />
+		protected EvaluationFailureException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+	}
 }

Assets/Cryville/Common/Pdt/PdtExpression.cs

@@ -11,7 +11,7 @@ namespace Cryville.Common.Pdt {
 		/// <summary>
 		/// Whether the value of this expression is constant.
 		/// </summary>
-		/// <remarks>The value of this property is <c>false</c> until it is optimized.</remarks>
+		/// <remarks>The value of this property is <see langword="false" /> until it is optimized.</remarks>
 		public bool IsConstant { get; internal set; }
 		internal bool IsPotentialConstant;
 		internal PdtExpression(LinkedList<PdtInstruction> ins) {
@@ -51,13 +51,14 @@ namespace Cryville.Common.Pdt {
 		}
 		public class PushVariable : PdtInstruction {
 			public int Name { get; private set; }
-			public PushVariable(int name) { Name = name; }
-			public PushVariable(string name) : this(IdentifierManager.SharedInstance.Request(name)) { }
+			public bool Forced { get; private set; }
+			public PushVariable(int name, bool forced = false) { Name = name; Forced = forced; }
+			public PushVariable(string name, bool forced = false) : this(IdentifierManager.SharedInstance.Request(name)) { Forced = forced; }
 			internal override void Execute(PdtEvaluatorBase etor) {
-				etor.PushVariable(Name);
+				etor.PushVariable(Name, Forced);
 			}
 			public override string ToString() {
-				return string.Format("pushv {0}", IdentifierManager.SharedInstance.Retrieve(Name));
+				return string.Format(Forced ? "pushv ?{0}" : "pushv {0}", IdentifierManager.SharedInstance.Retrieve(Name));
 			}
 		}
 		public class Operate : PdtInstruction {
@@ -90,7 +91,7 @@ namespace Cryville.Common.Pdt {
 			}
 		}
 	}
-	public partial class PdtInterpreter<T> {
+	public partial class PdtInterpreter {
 		readonly static Dictionary<char, int> OP_PRIORITY = new Dictionary<char, int> {
 			{ '@', 7 },
 			{ '*', 6 }, { '/', 6 }, { '%', 6 },
@@ -239,7 +240,11 @@ namespace Cryville.Common.Pdt {
 					if (defs.TryGetValue(buf.Value.Value, out def)) {
 						foreach (var i in def.Instructions) ins.AddLast(i);
 					}
-					else ins.AddLast(new PdtInstruction.PushVariable(buf.Value.Value));
+					else {
+						var name = buf.Value.Value;
+						if (name[0] == '?') ins.AddLast(new PdtInstruction.PushVariable(name.Substring(1), true));
+						else ins.AddLast(new PdtInstruction.PushVariable(name));
+					}
 					buf = null;
 					TryPushAdjMul(ins, ref flag);
 				}

Assets/Cryville/Common/Pdt/PdtInterpreter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 
@@ -8,8 +9,7 @@ namespace Cryville.Common.Pdt {
 	/// <summary>
 	/// Interpreter for Property Definition Tree (PDT) file format.
 	/// </summary>
-	/// <typeparam name="T">The object type represented by the PDT.</typeparam>
-	public partial class PdtInterpreter<T> {
+	public partial class PdtInterpreter {
 		/// <summary>
 		/// The character category map.
 		/// </summary>
@@ -32,11 +32,11 @@ namespace Cryville.Common.Pdt {
 			0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000,
 			0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 			0x0001, 0x0080, 0x0100, 0x0000, 0x0030, 0x0080, 0x0080, 0x0000, 0x0200, 0x0400, 0x0080, 0x0080, 0x0080, 0x0080, 0x0040, 0x0080,
-			0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x1000, 0x1800, 0x0080, 0x0080, 0x0080, 0x0000,
+			0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x1000, 0x1800, 0x0080, 0x0080, 0x0080, 0x0030,
 			0x0080, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030,
-			0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0000, 0x0000, 0x0000, 0x0030,
+			0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0080, 0x0000, 0x0080, 0x0030,
 			0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030,
-			0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x1000, 0x0080, 0x1000, 0x0000, 0x0000,
+			0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x1000, 0x0080, 0x1000, 0x0080, 0x0000,
 		};
 
 		/// <summary>
@@ -44,52 +44,103 @@ namespace Cryville.Common.Pdt {
 		/// </summary>
 		/// <param name="src">The source string.</param>
 		/// <returns>The interpreted object.</returns>
-		public static T Interpret(string src) {
-			return Interpret(src, BinderAttribute.CreateBinderOfType(typeof(T)));
+		public static T Interpret<T>(string src) {
+			return Interpret<T>(src, BinderAttribute.CreateBinderOfType(typeof(T)));
 		}
 		/// <summary>
-		/// Interprets a source string to an object of type <typeparamref name="T" /> with a binder.
+		/// Interprets a source string to an object of type <typeparamref name="T"/> with a binder.
 		/// </summary>
 		/// <param name="src">The source string.</param>
 		/// <param name="binder">The binder.</param>
 		/// <returns>The interpreted object.</returns>
-		public static T Interpret(string src, Binder binder) {
-			return new PdtInterpreter<T>(src, binder).Interpret();
+		public static T Interpret<T>(string src, Binder binder) {
+			return (T)new PdtInterpreter(src, typeof(T), binder).Interpret();
 		}
 
-		readonly string _src;
+		/// <summary>
+		/// The source string.
+		/// </summary>
+		public string Source { get; private set; }
+		readonly Type _type;
 		readonly Binder _binder;
-		protected int Position { get; private set; }
+		/// <summary>
+		/// The current position in the string being parsed by the interpreter.
+		/// </summary>
+		public int Position { get; private set; }
 #pragma warning disable IDE1006
-		protected char cc { get { return _src[Position]; } }
+		/// <summary>
+		/// The character at the current position.
+		/// </summary>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		protected char cc { get { return Source[Position]; } }
+		/// <summary>
+		/// The category of the character.
+		/// </summary>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected int ct { get { return cm[cc]; } }
-		protected string tokenb(int flag) { // Token Whitelist
+		/// <summary>
+		/// Reads a token until a character of type <paramref name="flag" /> is met.
+		/// </summary>
+		/// <param name="flag">The type filter.</param>
+		/// <returns>A token from the current position (inclusive) to the next character of type <paramref name="flag" /> (exclusive).</returns>
+		/// <exception cref="IndexOutOfRangeException">No character of type <paramref name="flag" /> is met.</exception>
+		protected string tokenb(int flag) {
 			int sp = Position;
 			while ((ct & flag) == 0) Position++;
-			return _src.Substring(sp, Position - sp);
+			return Source.Substring(sp, Position - sp);
 		}
-		protected string tokenw(int flag) { // Token Whitelist
+		/// <summary>
+		/// Reads a token until a character that is not of type <paramref name="flag" /> is met.
+		/// </summary>
+		/// <param name="flag">The type filter.</param>
+		/// <returns>A token from the current position (inclusive) to the next character that is not of type <paramref name="flag" /> (exclusive).</returns>
+		/// <exception cref="IndexOutOfRangeException">No character that is not of type <paramref name="flag" /> is met.</exception>
+		protected string tokenw(int flag) {
 			int sp = Position;
 			while ((ct & flag) != 0) Position++;
-			return _src.Substring(sp, Position - sp);
+			return Source.Substring(sp, Position - sp);
 		}
+		/// <summary>
+		/// Skips over whitespaces.
+		/// </summary>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected void ws() {
 			while ((ct & 0x0001) != 0) Position++;
 		}
 #pragma warning restore IDE1006
 
+		/// <summary>
+		/// Reads the current character and increments the position.
+		/// </summary>
+		/// <returns>The current character.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected char GetChar() {
 			char r = cc;
 			Position++;
 			return r;
 		}
+		/// <summary>
+		/// Reads an identifier.
+		/// </summary>
+		/// <returns>An identifier.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected string GetIdentifier() {
 			if ((ct & 0x0020) == 0) return "";
 			return tokenw(0x0010);
 		}
+		/// <summary>
+		/// Reads a number.
+		/// </summary>
+		/// <returns>A number.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected string GetNumber() {
 			return tokenw(0x0040);
 		}
+		/// <summary>
+		/// Reads a string.
+		/// </summary>
+		/// <returns>A string.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected string GetString() {
 			int sp = Position;
 			do {
@@ -97,8 +148,13 @@ namespace Cryville.Common.Pdt {
 				Position++;
 			} while (ct != 0x0100);
 			Position++;
-			return Regex.Replace(_src.Substring(sp + 1, Position - sp - 2), @"\\(.)", "$1");
+			return Regex.Replace(Source.Substring(sp + 1, Position - sp - 2), @"\\(.)", "$1");
 		}
+		/// <summary>
+		/// Reads an expression.
+		/// </summary>
+		/// <returns>An expression.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected PdtExpression GetExp() {
 			var ins = new LinkedList<PdtInstruction>();
 			int _;
@@ -108,23 +164,30 @@ namespace Cryville.Common.Pdt {
 
 		readonly Dictionary<string, PdtExpression> defs = new Dictionary<string, PdtExpression>();
 		/// <summary>
-		/// Creates an instance of the <see cref="PdtInterpreter{T}" /> class.
+		/// Creates an instance of the <see cref="PdtInterpreter" /> class.
 		/// </summary>
 		/// <param name="src">The source string.</param>
+		/// <param name="type">The destination type.</param>
 		/// <param name="binder">The binder. May be <c>null</c>.</param>
-		public PdtInterpreter(string src, Binder binder) {
-			_src = src;
+		public PdtInterpreter(string src, Type type, Binder binder) {
+			Source = src;
+			_type = type;
 			_binder = binder;
 			if (_binder == null)
-				_binder = BinderAttribute.CreateBinderOfType(typeof(T));
+				_binder = BinderAttribute.CreateBinderOfType(_type);
 		}
 		/// <summary>
-		/// Interprets the source to an object of type <typeparamref name="T" />.
+		/// Interprets the source to an object.
 		/// </summary>
 		/// <returns>The interpreted object.</returns>
-		public T Interpret() {
-			InterpretDirectives();
-			return (T)InterpretObject(typeof(T));
+		public object Interpret() {
+			try {
+				InterpretDirectives();
+				return InterpretObject(_type);
+			}
+			catch (Exception ex) {
+				throw new PdtParsingException(this, ex);
+			}
 		}
 		void InterpretDirectives() {
 			bool flag = false;
@@ -159,7 +222,7 @@ namespace Cryville.Common.Pdt {
 		}
 		object InterpretObject(Type type) {
 			var result = ReflectionHelper.InvokeEmptyConstructor(type);
-			bool dictflag = ReflectionHelper.IsGenericDictionary(type);
+			bool dictflag = typeof(IDictionary).IsAssignableFrom(type);
 			while (true) {
 				try { ws(); }
 				catch (IndexOutOfRangeException) { return result; }
@@ -175,19 +238,20 @@ namespace Cryville.Common.Pdt {
 							((IDictionary)result).Add(key, value);
 						}
 						else {
-							MemberInfo prop;
-							bool flag = ReflectionHelper.TryFindMemberWithAttribute<ElementListAttribute>(type, out prop);
-							if (!flag && pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
+							MemberInfo prop = null;
+							bool flag = false;
+							if (pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
+							if (prop == null) flag = ReflectionHelper.TryFindMemberWithAttribute<ElementListAttribute>(type, out prop);
+							if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
 							Type ptype = ReflectionHelper.GetMemberType(prop);
-							if (ReflectionHelper.IsGenericDictionary(ptype)) {
+							if (flag) {
+								if (!typeof(IDictionary).IsAssignableFrom(ptype))
+									throw new InvalidOperationException("Internal error: Element list is not a dictionary");
 								var ktype = ptype.GetGenericArguments()[0];
 								var vtype = ptype.GetGenericArguments()[1];
-								if (flag) {
-									object key = _binder.ChangeType(pkey, ktype, null);
-									object value = InterpretObject(vtype);
-									((IDictionary)ReflectionHelper.GetValue(prop, result)).Add(key, value);
-								}
-								else ReflectionHelper.SetValue(prop, result, InterpretObject(ptype));
+								object key = _binder.ChangeType(pkey, ktype, null);
+								object value = InterpretObject(vtype);
+								((IDictionary)ReflectionHelper.GetValue(prop, result)).Add(key, value);
 							}
 							else ReflectionHelper.SetValue(prop, result, InterpretObject(ptype));
 						}
@@ -203,30 +267,72 @@ namespace Cryville.Common.Pdt {
 							((IDictionary)result).Add(key, value);
 						}
 						else {
-							MemberInfo prop;
-							bool flag = ReflectionHelper.TryFindMemberWithAttribute<PropertyListAttribute>(type, out prop);
-							if (!flag && pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
+							MemberInfo prop = null;
+							bool flag = false;
+							if (pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
+							if (prop == null) flag = ReflectionHelper.TryFindMemberWithAttribute<PropertyListAttribute>(type, out prop);
+							if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
 							var ptype = ReflectionHelper.GetMemberType(prop);
-							if (!typeof(IDictionary).IsAssignableFrom(ptype)) {
-								object value = _binder.ChangeType(exp, ptype, null);
-								ReflectionHelper.SetValue(prop, result, value, _binder);
-							}
-							else {
+							if (flag) {
+								if (!typeof(IDictionary).IsAssignableFrom(ptype))
+									throw new InvalidOperationException("Internal error: Property list is not a dictionary");
 								var ktype = ptype.GetGenericArguments()[0];
 								var vtype = ptype.GetGenericArguments()[1];
 								object key = _binder.ChangeType(pkey, ktype, null);
 								object value = _binder.ChangeType(exp, vtype, null);
 								((IDictionary)ReflectionHelper.GetValue(prop, result)).Add(key, value);
 							}
+							else {
+								object value = _binder.ChangeType(exp, ptype, null);
+								ReflectionHelper.SetValue(prop, result, value, _binder);
+							}
 						}
 						break;
 					case '}':
 						return result;
+					default:
+						throw new InvalidOperationException("Internal error: Invalid key interpretation");
 				}
 			}
 		}
+		/// <summary>
+		/// Interprets a key from the current position.
+		/// </summary>
+		/// <returns>The interpreted key.</returns>
 		protected virtual object InterpretKey(Type type) {
 			return tokenb(0x1000).Trim();
 		}
 	}
+	/// <summary>
+	/// The exception that is thrown when the interpretation of a PDT fails.
+	/// </summary>
+	public class PdtParsingException : Exception {
+		public PdtParsingException(PdtInterpreter interpreter) : this(interpreter, null) { }
+		public PdtParsingException(PdtInterpreter interpreter, Exception innerException)
+			: base(GenerateMessage(interpreter, innerException), innerException) { }
+		static string GenerateMessage(PdtInterpreter interpreter, Exception innerException) {
+			string src = interpreter.Source;
+			int pos = interpreter.Position;
+			if (pos >= src.Length) return "Failed to interpret the PDT: There are some missing or redundant tokens";
+			int lineStartPos = src.LastIndexOf('\n', pos) + 1;
+			int previewStartPos = src.LastIndexOf('\n', pos, 64);
+			if (previewStartPos == -1) {
+				previewStartPos = pos - 64;
+				if (previewStartPos < 0) previewStartPos = 0;
+			}
+			else previewStartPos++;
+			int previewEndPos = src.IndexOf('\n', pos, 64);
+			if (previewEndPos == -1) {
+				previewEndPos = pos + 64;
+				if (previewEndPos > src.Length) previewEndPos = src.Length;
+			}
+			return string.Format(
+				"Failed to interpret the PDT at line {0}, position {1}: {2}\n{3}",
+				src.Take(interpreter.Position).Count(c => c == '\n') + 1,
+				pos - lineStartPos + 1,
+				innerException == null ? "Unknown error" : innerException.Message,
+				src.Substring(previewStartPos, previewEndPos - previewStartPos)
+			);
+		}
+	}
 }

Assets/Cryville/Common/Pdt/PdtOperator.cs

@@ -11,7 +11,7 @@ namespace Cryville.Common.Pdt {
 		/// <summary>
 		/// The count of the operands loaded.
 		/// </summary>
-		protected int LoadedOperandCount { get { return ParamCount - _loadindex; } }
+		protected int LoadedOperandCount { get { return _pc - _loadindex; } }
 		/// <summary>
 		/// Gets the operand at the specified index.
 		/// </summary>
@@ -24,20 +24,20 @@ namespace Cryville.Common.Pdt {
 			int i = index + _loadindex;
 			return _operands[i];
 		}
-		internal int ParamCount { get; private set; }
+		readonly int _pc;
 		/// <summary>
 		/// Creates an instance of the <see cref="PdtOperator" /> class.
 		/// </summary>
 		/// <param name="pc">The suggested parameter count.</param>
 		protected PdtOperator(int pc) {
-			ParamCount = pc;
+			_pc = pc;
 			_operands = new PdtVariableMemory[pc];
 		}
 		PdtEvaluatorBase _etor;
 		bool _rfreq = true;
 		internal void Begin(PdtEvaluatorBase etor) {
 			_etor = etor;
-			_loadindex = ParamCount;
+			_loadindex = _pc;
 		}
 		internal void LoadOperand(PdtVariableMemory mem) {
 			if (_loadindex == 0) return;
@@ -48,13 +48,16 @@ namespace Cryville.Common.Pdt {
 			_rfreq = false;
 			try { Execute(); } catch (Exception ex) {
 				if (_rfreq) _etor.DiscardStack();
-				throw new InvalidOperationException("Evaluation failed", ex);
+				throw new EvaluationFailureException("Evaluation failed", ex);
 			}
-			if (!_rfreq && !noset) throw new InvalidOperationException("Return frame not set");
+			if (!_rfreq && !noset) throw new EvaluationFailureException("Return frame not set");
 		}
 		/// <summary>
 		/// Executes the operator.
 		/// </summary>
+		/// <remarks>
+		/// <para>When overridden, this method reads operands by calling <see cref="GetOperand(int)" />, and writes the result to the frame obtained by calling <see cref="GetReturnFrame(int, int)" />.</para>
+		/// </remarks>
 		protected abstract void Execute();
 		/// <summary>
 		/// Gets a return frame.

Assets/Cryville/Common/Pdt/PdtVariableMemory.cs

@@ -1,10 +1,11 @@
 using System;
+using UnsafeIL;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
 	/// Span on the memory of a <see cref="PdtEvaluatorBase" />.
 	/// </summary>
-	public unsafe struct PdtVariableMemory {
+	public unsafe struct PdtVariableMemory : IEquatable<PdtVariableMemory> {
 		readonly byte* _ptr;
 		/// <summary>
 		/// The length of the span.
@@ -42,10 +43,20 @@ namespace Cryville.Common.Pdt {
 		/// <param name="dest">The destination buffer.</param>
 		/// <param name="destOffset">The offset on the destination buffer to start copying to.</param>
 		/// <param name="length">The length to copy.</param>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="length" /> is greater than the length of the span.</exception>
 		public void CopyTo(byte* dest, int destOffset, int length) {
+			if (length > Length) throw new ArgumentOutOfRangeException("length");
 			for (int i = 0; i < length; i++)
 				dest[destOffset + i] = _ptr[i];
 		}
+		/// <inheritdoc />
+		public bool Equals(PdtVariableMemory obj) {
+			if (Type != obj.Type || Length != obj.Length) return false;
+			for (int i = 0; i < Length; i++) {
+				if (*(_ptr + i) != *(obj._ptr + i)) return false;
+			}
+			return true;
+		}
 		/// <summary>
 		/// Gets the memory of the span as a number.
 		/// </summary>
@@ -118,10 +129,43 @@ namespace Cryville.Common.Pdt {
 				throw new InvalidCastException("Not an identifier");
 			return *(int*)(_ptr + offset);
 		}
-		internal void* TrustedAsOfLength(int len) {
-			if (Length < len)
-				throw new InvalidCastException("Type not matched");
-			return _ptr;
+		/// <summary>
+		/// Gets the memory of the span as an instance of the specified type.
+		/// </summary>
+		/// <typeparam name="T">The specified type.</typeparam>
+		/// <param name="offset">The offset on the span to start reading from.</param>
+		/// <returns>An instance of the specified type.</returns>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="offset" /> is not less than the length of the span.</exception>
+		/// <exception cref="InvalidCastException">The length of the span is not sufficient.</exception>
+		/// <remarks>
+		/// <para>Use <see cref="AsNumber(int)" /> instead while reading an unaligned number.</para>
+		/// </remarks>
+		public T As<T>(int offset = 0) {
+			var len = Unsafe.SizeOf<T>();
+			if (offset >= Length)
+				throw new ArgumentOutOfRangeException("offset");
+			if (offset + len > Length)
+				throw new InvalidCastException("Frame length not sufficient");
+			return Unsafe.Read<T>(_ptr + offset);
+		}
+		/// <summary>
+		/// Sets the memory of the span to an instance of the specified type.
+		/// </summary>
+		/// <typeparam name="T">The specified type.</typeparam>
+		/// <param name="value">The value.</param>
+		/// <param name="offset">The offset from the start of the span.</param>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="offset" /> is not less than the length of the span.</exception>
+		/// <exception cref="InvalidCastException">The length of the span is not sufficient.</exception>
+		/// <remarks>
+		/// <para>Use <see cref="SetNumber(float, int)" /> instead while writing an unaligned number.</para>
+		/// </remarks>
+		public void Set<T>(T value, int offset = 0) {
+			var len = Unsafe.SizeOf<T>();
+			if (offset >= Length)
+				throw new ArgumentOutOfRangeException("offset");
+			if (offset + len > Length)
+				throw new InvalidCastException("Frame length not sufficient");
+			Unsafe.Write(_ptr + offset, value);
 		}
 		/// <summary>
 		/// Gets the array suffix.

Assets/Cryville/Common/ReflectionHelper.cs

@@ -145,7 +145,7 @@ namespace Cryville.Common {
 		/// <returns>An array containing all the subclasses of the type in the current app domain.</returns>
 		public static Type[] GetSubclassesOf<T>() where T : class {
 			var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-			IEnumerable<Type> r = new List<Type>();
+			IEnumerable<Type> r = Enumerable.Empty<Type>();
 			foreach (var a in assemblies)
 				r = r.Concat(a.GetTypes().Where(
 					t => t.IsClass

Assets/Cryville/Common/Unity/Input/InputHandler.cs

@@ -4,7 +4,19 @@ using UnityEngine;
 namespace Cryville.Common.Unity.Input {
 	public delegate void InputEventDelegate(InputIdentifier id, InputVector vec);
 	public abstract class InputHandler : IDisposable {
-		public event InputEventDelegate OnInput;
+		InputEventDelegate m_onInput;
+		public event InputEventDelegate OnInput {
+			add {
+				if (m_onInput == null) Activate();
+				m_onInput -= value;
+				m_onInput += value;
+			}
+			remove {
+				if (m_onInput == null) return;
+				m_onInput -= value;
+				if (m_onInput == null) Deactivate();
+			}
+		}
 
 		~InputHandler() {
 			Dispose(false);
@@ -14,26 +26,15 @@ namespace Cryville.Common.Unity.Input {
 			GC.SuppressFinalize(this);
 		}
 
-		public bool Activated { get; private set; }
-		public void Activate() {
-			if (Activated) return;
-			Activated = true;
-			ActivateImpl();
-		}
-		protected abstract void ActivateImpl();
-		public void Deactivate() {
-			if (!Activated) return;
-			Activated = false;
-			DeactivateImpl();
-		}
-		protected abstract void DeactivateImpl();
+		protected abstract void Activate();
+		protected abstract void Deactivate();
 		public abstract void Dispose(bool disposing);
 		public abstract bool IsNullable(int type);
 		public abstract byte GetDimension(int type);
 		public abstract string GetTypeName(int type);
 		public abstract double GetCurrentTimestamp();
 		protected void Feed(int type, int id, InputVector vec) {
-			var del = OnInput;
+			var del = m_onInput;
 			if (del != null) del(new InputIdentifier { Source = new InputSource { Handler = this, Type = type }, Id = id }, vec);
 		}
 	}

Assets/Cryville/Common/Unity/Input/InputManager.cs

@@ -4,28 +4,22 @@ using System.Reflection;
 
 namespace Cryville.Common.Unity.Input {
 	public class InputManager {
-		static readonly List<Type> HandlerRegistries = new List<Type> {
+		static readonly HashSet<Type> HandlerRegistries = new HashSet<Type> {
 			typeof(WindowsPointerHandler),
 			typeof(UnityKeyHandler<UnityKeyboardReceiver>),
 			typeof(UnityKeyHandler<UnityMouseButtonReceiver>),
 			typeof(UnityMouseHandler),
 			typeof(UnityTouchHandler),
 		};
-		readonly List<InputHandler> _handlers = new List<InputHandler>();
+		readonly HashSet<InputHandler> _handlers = new HashSet<InputHandler>();
 		readonly Dictionary<Type, InputHandler> _typemap = new Dictionary<Type, InputHandler>();
-		readonly Dictionary<InputHandler, double> _timeOrigins = new Dictionary<InputHandler, double>();
-		readonly object _lock = new object();
-		readonly Dictionary<InputIdentifier, InputVector> _vectors = new Dictionary<InputIdentifier, InputVector>();
-		readonly List<InputEvent> _events = new List<InputEvent>();
 		public InputManager() {
 			foreach (var t in HandlerRegistries) {
 				try {
 					if (!typeof(InputHandler).IsAssignableFrom(t)) continue;
 					var h = (InputHandler)ReflectionHelper.InvokeEmptyConstructor(t);
 					_typemap.Add(t, h);
-					h.OnInput += OnInput;
 					_handlers.Add(h);
-					_timeOrigins.Add(h, 0);
 					Logger.Log("main", 1, "Input", "Initialized {0}", ReflectionHelper.GetSimpleName(t));
 				}
 				catch (TargetInvocationException ex) {
@@ -36,49 +30,8 @@ namespace Cryville.Common.Unity.Input {
 		public InputHandler GetHandler(string name) {
 			return _typemap[Type.GetType(name)];
 		}
-		public void Activate() {
-			lock (_lock) {
-				_events.Clear();
-			}
-			foreach (var h in _handlers) h.Activate();
-		}
-		public void SyncTime(double time) {
-			foreach (var h in _handlers) {
-				_timeOrigins[h] = time - h.GetCurrentTimestamp();
-			}
-		}
-		public void Deactivate() {
-			foreach (var h in _handlers) h.Deactivate();
-		}
-		void OnInput(InputIdentifier id, InputVector vec) {
-			lock (_lock) {
-				double timeOrigin = _timeOrigins[id.Source.Handler];
-				vec.Time += timeOrigin;
-				InputVector vec0;
-				if (_vectors.TryGetValue(id, out vec0)) {
-					_events.Add(new InputEvent {
-						Id = id,
-						From = vec0,
-						To = vec,
-					});
-					if (vec.IsNull) _vectors.Remove(id);
-					else _vectors[id] = vec;
-				}
-				else {
-					_events.Add(new InputEvent {
-						Id = id,
-						From = new InputVector(vec.Time),
-						To = vec,
-					});
-					_vectors.Add(id, vec);
-				}
-			}
-		}
-		public void EnumerateEvents(Action<InputEvent> cb) {
-			lock (_lock) {
-				foreach (var ev in _events) cb(ev);
-				_events.Clear();
-			}
+		public void EnumerateHandlers(Action<InputHandler> cb) {
+			foreach (var h in _handlers) cb(h);
 		}
 	}
 

Assets/Cryville/Common/Unity/Input/SimpleInputConsumer.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+
+namespace Cryville.Common.Unity.Input {
+	public class SimpleInputConsumer {
+		readonly InputManager _manager;
+		readonly object _lock = new object();
+		readonly Dictionary<InputIdentifier, InputVector> _vectors = new Dictionary<InputIdentifier, InputVector>();
+		readonly List<InputEvent> _events = new List<InputEvent>();
+		public SimpleInputConsumer(InputManager manager) { _manager = manager; }
+		public void Activate() {
+			lock (_lock) {
+				_events.Clear();
+			}
+			_manager.EnumerateHandlers(h => h.OnInput += OnInput);
+		}
+		public void Deactivate() {
+			_manager.EnumerateHandlers(h => h.OnInput -= OnInput);
+		}
+		protected void OnInput(InputIdentifier id, InputVector vec) {
+			lock (_lock) {
+				InputVector vec0;
+				if (_vectors.TryGetValue(id, out vec0)) {
+					_events.Add(new InputEvent {
+						Id = id,
+						From = vec0,
+						To = vec,
+					});
+					if (vec.IsNull) _vectors.Remove(id);
+					else _vectors[id] = vec;
+				}
+				else {
+					_events.Add(new InputEvent {
+						Id = id,
+						From = new InputVector(vec.Time),
+						To = vec,
+					});
+					_vectors.Add(id, vec);
+				}
+			}
+		}
+		public void EnumerateEvents(Action<InputEvent> cb) {
+			lock (_lock) {
+				foreach (var ev in _events) cb(ev);
+				_events.Clear();
+			}
+		}
+	}
+}

Assets/Cryville/Common/Unity/Input/SimpleInputConsumer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8fd2d5f1c7ba0c74c9ce8775075750db
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Unity/Input/UnityKeyHandler.cs

@@ -9,19 +9,19 @@ namespace Cryville.Common.Unity.Input {
 
 		public UnityKeyHandler() { }
 
-		protected override void ActivateImpl() {
+		protected override void Activate() {
 			receiver = new GameObject("__keyrecv__");
 			recvcomp = receiver.AddComponent<T>();
 			recvcomp.SetCallback(Feed);
 		}
 
-		protected override void DeactivateImpl() {
+		protected override void Deactivate() {
 			if (receiver) GameObject.Destroy(receiver);
 		}
 
 		public override void Dispose(bool disposing) {
 			if (disposing) {
-				DeactivateImpl();
+				Deactivate();
 			}
 		}
 
@@ -44,7 +44,7 @@ namespace Cryville.Common.Unity.Input {
 
 	public abstract class UnityKeyReceiver<T> : MonoBehaviour where T : UnityKeyReceiver<T> {
 		protected Action<int, int, InputVector> Callback;
-		protected readonly List<int> Keys = new List<int>();
+		protected readonly HashSet<int> Keys = new HashSet<int>();
 		public void SetCallback(Action<int, int, InputVector> h) {
 			Callback = h;
 		}

Assets/Cryville/Common/Unity/Input/UnityMouseHandler.cs

@@ -12,18 +12,18 @@ namespace Cryville.Common.Unity.Input {
 			}
 		}
 
-		protected override void ActivateImpl() {
+		protected override void Activate() {
 			receiver = new GameObject("__mouserecv__");
 			receiver.AddComponent<UnityMouseReceiver>().SetHandler(this);
 		}
 
-		protected override void DeactivateImpl() {
+		protected override void Deactivate() {
 			if (receiver) GameObject.Destroy(receiver);
 		}
 
 		public override void Dispose(bool disposing) {
 			if (disposing) {
-				DeactivateImpl();
+				Deactivate();
 			}
 		}
 

Assets/Cryville/Common/Unity/Input/UnityTouchHandler.cs

@@ -12,18 +12,18 @@ namespace Cryville.Common.Unity.Input {
 			}
 		}
 
-		protected override void ActivateImpl() {
+		protected override void Activate() {
 			receiver = new GameObject("__touchrecv__");
 			receiver.AddComponent<UnityPointerReceiver>().SetHandler(this);
 		}
 
-		protected override void DeactivateImpl() {
+		protected override void Deactivate() {
 			if (receiver) GameObject.Destroy(receiver);
 		}
 
 		public override void Dispose(bool disposing) {
 			if (disposing) {
-				DeactivateImpl();
+				Deactivate();
 			}
 		}
 

Assets/Cryville/Common/Unity/Input/WindowsPointerHandler.cs

@@ -31,6 +31,8 @@ namespace Cryville.Common.Unity.Input {
 		public WindowsPointerHandler() {
 			if (Instance != null)
 				throw new InvalidOperationException("WindowsPointerHandler already created");
+			if (Environment.OSVersion.Platform != PlatformID.Win32NT)
+				throw new NotSupportedException("Windows pointer is not supported on this device");
 			Instance = this;
 			usePointerMessage = true;
 
@@ -61,7 +63,7 @@ namespace Cryville.Common.Unity.Input {
 		public const int TABLET_DISABLE_PENBARRELFEEDBACK = 0x00000010;
 		public const int TABLET_DISABLE_FLICKS = 0x00010000;
 
-		protected override void ActivateImpl() {
+		protected override void Activate() {
 			newWndProc = WndProc;
 			newWndProcPtr = Marshal.GetFunctionPointerForDelegate(newWndProc);
 			oldWndProcPtr = SetWindowLongPtr(hMainWindow, -4, newWndProcPtr);
@@ -77,7 +79,7 @@ namespace Cryville.Common.Unity.Input {
 			);
 		}
 
-		protected override void DeactivateImpl() {
+		protected override void Deactivate() {
 			if (pressAndHoldAtomID != 0) {
 				NativeMethods.RemoveProp(hMainWindow, PRESS_AND_HOLD_ATOM);
 				NativeMethods.GlobalDeleteAtom(pressAndHoldAtomID);
@@ -142,9 +144,11 @@ namespace Cryville.Common.Unity.Input {
 		}
 
 		public override void Dispose(bool disposing) {
-			DeactivateImpl();
-			if (usePointerMessage)
-				NativeMethods.EnableMouseInPointer(false);
+			if (disposing) {
+				Deactivate();
+				if (usePointerMessage)
+					NativeMethods.EnableMouseInPointer(false);
+			}
 			Instance = null;
 		}
 

Assets/Cryville/Common/Unity/UI/SetIntegerParameterBehaviour.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace Cryville.Common.Unity.UI {
+	public class SetIntegerParameterBehaviour : SetParameterBehaviour {
+		[SerializeField] int m_value;
+		public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+			animator.SetInteger(m_name, m_value);
+		}
+	}
+}

Assets/Cryville/Common/Unity/UI/SetIntegerParameterBehaviour.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 57079cdf55a0d1149903f00ee732fa85
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs

@@ -0,0 +1,8 @@
+using UnityEngine;
+
+namespace Cryville.Common.Unity.UI {
+	public abstract class SetParameterBehaviour : StateMachineBehaviour {
+		[SerializeField] protected string m_name;
+		public override abstract void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex);
+	}
+}

Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d48088ca586ef5a41a42f6564e35b230
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Common/Unity/UI/TMPAutoFont.cs

@@ -0,0 +1,66 @@
+using Cryville.Common.Font;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using TMPro;
+using UnityEngine;
+using UnityEngine.TextCore.LowLevel;
+using UnityEngine.TextCore.Text;
+
+namespace Cryville.Common.Unity.UI {
+	[RequireComponent(typeof(TextMeshProUGUI))]
+	public class TMPAutoFont : MonoBehaviour {
+		public static Shader DefaultShader;
+		public static FontMatcher FontMatcher;
+		public static int MaxFallbackCount = 4;
+		static FontAsset _font;
+		TextMeshProUGUI _text;
+
+		[SerializeField]
+		Shader m_shader;
+		void Awake() {
+			if (FontMatcher == null) return;
+			_text = GetComponent<TextMeshProUGUI>();
+			if (_font == null) {
+				foreach (var typeface in FontMatcher.MatchScript(null, true)) {
+					try {
+						var ifont = CreateFontAsset(typeface.File.FullName, typeface.IndexInFile);
+						if (m_shader) ifont.material.shader = m_shader;
+						else if (DefaultShader) ifont.material.shader = DefaultShader;
+						if (_font == null) {
+							_font = ifont;
+							if (MaxFallbackCount <= 0) break;
+						}
+						else {
+							if (_font.fallbackFontAssetTable == null)
+								_font.fallbackFontAssetTable = new List<FontAsset>();
+							_font.fallbackFontAssetTable.Add(ifont);
+							if (_font.fallbackFontAssetTable.Count >= MaxFallbackCount) break;
+						}
+					}
+					catch (Exception) { }
+				}
+			}
+			_text.font = _font;
+		}
+
+		static MethodInfo _methodCreateFontAsset;
+		static readonly object[] _paramsCreateFontAsset = new object[] { null, null, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, Type.Missing, Type.Missing };
+		static FontAsset CreateFontAsset(string path, int index) {
+			if (_methodCreateFontAsset == null) {
+				_methodCreateFontAsset = typeof(FontAsset).GetMethod(
+					"CreateFontAsset", BindingFlags.Static | BindingFlags.NonPublic, null,
+					new Type[] {
+						typeof(string), typeof(int), typeof(int), typeof(int),
+						typeof(GlyphRenderMode), typeof(int), typeof(int),
+						typeof(AtlasPopulationMode), typeof(bool)
+					},
+					null
+				);
+			}
+			_paramsCreateFontAsset[0] = path;
+			_paramsCreateFontAsset[1] = index;
+			return (FontAsset)_methodCreateFontAsset.Invoke(null, _paramsCreateFontAsset);
+		}
+	}
+}

Assets/Cryville/Common/Unity/UI/TMPAutoFont.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 57404eb6519ecae44b051485280e879f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: -120
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Anchor.cs

@@ -1,15 +1,17 @@
-using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace Cryville.Crtr {
 	public class Anchor {
-		bool _opened;
-		public bool Opened { get { return _opened; } }
-		public Transform Transform { get; set; }
-		public void Open() {
-			_opened = true;
-		}
-		public void Close() {
-			_opened = false;
+		public int Name { get; private set; }
+		public Transform Transform { get; private set; }
+		public SkinContext SkinContext { get; private set; }
+		public Dictionary<int, PropSrc> PropSrcs { get; private set; }
+		public Anchor(int name, Transform transform, int propSrcCount = 0) {
+			Name = name;
+			Transform = transform;
+			if (propSrcCount > 0) PropSrcs = new Dictionary<int, PropSrc>(propSrcCount);
+			SkinContext = new SkinContext(transform, PropSrcs);
 		}
 	}
 }

Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using TMPro;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace Cryville.Crtr.Browsing {
@@ -10,14 +11,14 @@ namespace Cryville.Crtr.Browsing {
 
 		private bool _dir;
 		private Image _icon;
-		private Text _title;
-		private Text _desc;
+		private TMP_Text _title;
+		private TMP_Text _desc;
 
 #pragma warning disable IDE0051
 		void Awake() {
 			_icon = transform.Find("__content__/Icon").GetComponent<Image>();
-			_title = transform.Find("__content__/Texts/Title/__text__").GetComponent<Text>();
-			_desc = transform.Find("__content__/Texts/Description/__text__").GetComponent<Text>();
+			_title = transform.Find("__content__/Texts/Title/__text__").GetComponent<TMP_Text>();
+			_desc = transform.Find("__content__/Texts/Description/__text__").GetComponent<TMP_Text>();
 		}
 		void OnDestroy() {
 			if (meta.Icon != null) meta.Icon.Cancel();

Assets/Cryville/Crtr/Browsing/DetailPanel.cs

@@ -1,6 +1,7 @@
 using Cryville.Common;
 using Cryville.Common.Unity.UI;
 using System;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -18,8 +19,8 @@ namespace Cryville.Crtr.Browsing {
 		DockOccupiedRatioLayoutGroup _outerContentGroup;
 		Transform _content;
 		Image _cover;
-		Text _title;
-		Text _desc;
+		TMP_Text _title;
+		TMP_Text _desc;
 
 		protected override void Awake() {
 			base.Awake();
@@ -28,8 +29,8 @@ namespace Cryville.Crtr.Browsing {
 			_outerContentGroup = _outerContent.GetComponent<DockOccupiedRatioLayoutGroup>();
 			_content = _outerContent.transform.Find("__content__");
 			_cover = _content.Find("Cover").GetComponent<Image>();
-			_title = _content.Find("Texts/Title").GetComponent<Text>();
-			_desc = _content.Find("Texts/Description").GetComponent<Text>();
+			_title = _content.Find("Texts/Title").GetComponent<TMP_Text>();
+			_desc = _content.Find("Texts/Description").GetComponent<TMP_Text>();
 		}
 		void OnDestroy() {
 			if (_data.Cover != null) _data.Cover.Cancel();

Assets/Cryville/Crtr/Browsing/ExtensionInterface.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Cryville.Crtr.Browsing {
 	public abstract class ExtensionInterface {

Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Unity.UI;
+using Cryville.Crtr.Config;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using UnityEngine;
@@ -12,11 +13,12 @@ namespace Cryville.Crtr.Browsing {
 		private Button m_playButton;
 		[SerializeField]
 		private Button m_configButton;
+		[SerializeField]
+		private ConfigPanelMaster m_configPanel;
 
 		private DockLayoutGroup _group;
 		public ResourceBrowser MainBrowser { get; private set; }
 		private DetailPanel _detailPanel;
-		private SettingsPanel _settingsPanel;
 		readonly List<ResourceBrowserUnit> _units = new List<ResourceBrowserUnit>();
 
 #pragma warning disable IDE0051
@@ -25,7 +27,6 @@ namespace Cryville.Crtr.Browsing {
 			MainBrowser = transform.GetChild(0).GetComponent<ResourceBrowser>();
 			MainBrowser.ResourceManager = new LegacyResourceManager(Settings.Default.GameDataPath);
 			_detailPanel = transform.GetChild(1).GetComponent<DetailPanel>();
-			_settingsPanel = transform.GetChild(2).GetComponent<SettingsPanel>();
 			_units.Add(MainBrowser);
 			_units.Add(_detailPanel);
 		}
@@ -80,12 +81,6 @@ namespace Cryville.Crtr.Browsing {
 
 		public void OpenConfig(int id, ChartDetail detail) {
 			SetDataSettings(id, detail);
-#if UNITY_5_3_OR_NEWER
-			SceneManager.LoadScene("Config", LoadSceneMode.Additive);
-#else
-			Application.LoadLevelAdditive("Config");
-#endif
-			GameObject.Find("/Master").GetComponent<Master>().HideMenu();
 		}
 
 		void SetDataSettings(int id, ChartDetail detail) {

Assets/Cryville/Crtr/Chart.cs

@@ -109,10 +109,11 @@ namespace Cryville.Crtr {
 		public float BeatOffset;
 		
 		[JsonIgnore]
-		public abstract int Priority {
-			get;
-		}
-		
+		public abstract int Priority { get; }
+
+		[JsonIgnore]
+		public virtual bool Standalone { get { return false; } }
+
 		public ChartEvent Clone() {
 			return (ChartEvent)MemberwiseClone();
 		}
@@ -130,20 +131,11 @@ namespace Cryville.Crtr {
 			get { return Duration > 0; }
 		}
 
-		private InstantEvent attev = null;
+		private ReleaseEvent relev = null;
 		[JsonIgnore]
-		public InstantEvent AttackEvent {
+		public ReleaseEvent ReleaseEvent {
 			get {
-				if (attev == null) attev = new InstantEvent(this);
-				return attev;
-			}
-		}
-
-		private InstantEvent relev = null;
-		[JsonIgnore]
-		public InstantEvent ReleaseEvent {
-			get {
-				if (relev == null) relev = new InstantEvent(this, true);
+				if (relev == null) relev = new ReleaseEvent(this);
 				return relev;
 			}
 		}
@@ -170,18 +162,12 @@ namespace Cryville.Crtr {
 		}
 	}
 	
-	public class InstantEvent : ChartEvent {
+	public class ReleaseEvent : ChartEvent {
 		public readonly ChartEvent Original;
-		public bool IsRelease;
 		
-		public InstantEvent(ChartEvent orig, bool release = false) {
-			IsRelease = release;
-			if (orig != null) {
-				Original = orig;
-				time = orig.time;
-				if (IsRelease)
-					BeatOffset = orig.Duration;
-			}
+		public ReleaseEvent(ChartEvent orig) {
+			Original = orig;
+			time = orig.endtime;
 		}
 		
 		public override int Priority {
@@ -192,6 +178,13 @@ namespace Cryville.Crtr {
 	}
 	public abstract class EventContainer : ChartEvent {
 		public List<Chart.Motion> motions = new List<Chart.Motion>();
+
+		[JsonIgnore]
+		public Clip Clip { get; private set; }
+
+		public EventContainer() {
+			SubmitPropOp("clip", new PropOp.Clip(v => Clip = v));
+		}
 		
 		[JsonIgnore]
 		public virtual IEnumerable<ChartEvent> Events {
@@ -203,7 +196,7 @@ namespace Cryville.Crtr {
 		public virtual EventList GetEventsOfType(string type) {
 			switch (type) {
 				case "motions": return new EventList<Chart.Motion>(motions);
-				default: throw new ArgumentException(string.Format("Unknown event type {0}", type));
+				default: throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type));
 			}
 		}
 	}
@@ -267,9 +260,7 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		public override int Priority {
-			get { return 10; }
-		}
+		public override int Priority { get { return 10; } }
 
 		public class Group : EventContainer {
 			public List<Track> tracks = new List<Track>();
@@ -289,15 +280,11 @@ namespace Cryville.Crtr {
 					default: return base.GetEventsOfType(type);
 				}
 			}
-			public override int Priority {
-				get { return 10; }
-			}
+			public override int Priority { get { return 10; } }
 		}
 
 		public class Track : EventContainer {
-			public override int Priority {
-				get { return 10; }
-			}
+			public override int Priority { get { return 10; } }
 		}
 
 		public class Motion : ChartEvent {
@@ -310,6 +297,8 @@ namespace Cryville.Crtr {
 #pragma warning restore IDE1006
 
 			private void LoadFromString(string s) {
+				if (RelativeNode != null || AbsoluteValue != null)
+					throw new InvalidOperationException("The motion property can only be set at initialization");
 				Match m = Regex.Match(s, @"^(.+?)(#(\d+))?(@(.+?))?(\^(.+?))?(\*(.+?))?(:(.+))?$");
 				if (!m.Success) throw new ArgumentException("Invalid motion string format");
 				name = new Identifier(m.Groups[1].Value);
@@ -331,6 +320,10 @@ namespace Cryville.Crtr {
 				else {
 					AbsoluteValue = Vector.Construct(registry.Type, m.Groups[11].Value);
 				}
+				SubmitPropSrc("value", VectorSrc.Construct(() => {
+					if (RelativeNode != null) return RelativeNode.Value;
+					else return AbsoluteValue;
+				}));
 			}
 
 			public override string ToString() {
@@ -377,15 +370,9 @@ namespace Cryville.Crtr {
 			[DefaultValue(0.0f)]
 			public float sumfix = 0.0f;
 
-			public override int Priority {
-				get { return -2; }
-			}
+			public override int Priority { get { return -2; } }
 
 			public Motion() {
-				SubmitPropSrc("value", new VectorSrc(() => {
-					if (RelativeNode != null) return RelativeNode.Value;
-					else return AbsoluteValue;
-				}));
 				SubmitPropOp("motion", new PropOp.String(v => motion = v));
 				SubmitPropOp("name", new PropOp.Identifier(v => {
 					var n = new Identifier(v);
@@ -419,9 +406,7 @@ namespace Cryville.Crtr {
 					default: return base.GetEventsOfType(type);
 				}
 			}
-			public override int Priority {
-				get { return 12; }
-			}
+			public override int Priority { get { return 12; } }
 		}
 
 		public class Judge : ChartEvent {
@@ -434,9 +419,8 @@ namespace Cryville.Crtr {
 			}
 #pragma warning restore IDE1006
 
-			public override int Priority {
-				get { return 0; }
-			}
+			public override int Priority { get { return 0; } }
+			public override bool Standalone { get { return true; } }
 
 			public Judge() {
 				SubmitPropSrc("name", new PropSrc.Identifier(() => Id.Key));
@@ -450,9 +434,7 @@ namespace Cryville.Crtr {
 		public class Signature : ChartEvent {
 			public float? tempo;
 
-			public override int Priority {
-				get { return -4; }
-			}
+			public override int Priority { get { return -4; } }
 		}
 
 		public List<Sound> sounds;
@@ -463,9 +445,7 @@ namespace Cryville.Crtr {
 			// TODO [Obsolete]
 			public float offset;
 
-			public override int Priority {
-				get { return 0; }
-			}
+			public override int Priority { get { return 0; } }
 		}
 	}
 }

Assets/Cryville/Crtr/ChartHandler.cs

@@ -14,22 +14,12 @@ namespace Cryville.Crtr {
 			chart = _chart;
 		}
 
-		public override string TypeName {
-			get {
-				return "chart";
-			}
-		}
+		public override string TypeName { get { return "chart"; } }
 
 		public override void PreInit() {
 			base.PreInit();
 		}
 
-		public override void Dispose() {
-			if (Disposed) return;
-			base.Dispose();
-			foreach (var s in sounds) s.Dispose();
-		}
-
 		public override void Update(ContainerState s, StampedEvent ev) {
 			base.Update(s, ev);
 			if (s.CloneType == 16) {
@@ -50,9 +40,14 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		public override void EndUpdate(ContainerState s) {
-			base.EndUpdate(s);
+		public override void EndLogicalUpdate(ContainerState s) {
+			base.EndLogicalUpdate(s);
 			// TODO End of chart
 		}
+
+		public override void DisposeAll() {
+			base.DisposeAll();
+			foreach (var s in sounds) s.Dispose();
+		}
 	}
 }

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -1,6 +1,7 @@
 #define BUILD
 
 using Cryville.Common;
+using Cryville.Common.Buffers;
 using Cryville.Crtr.Config;
 using Cryville.Crtr.Event;
 using Newtonsoft.Json;
@@ -8,7 +9,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Text.Formatting;
 using System.Threading;
+using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
 using UnityEngine.SceneManagement;
@@ -19,6 +22,7 @@ using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr {
 	public class ChartPlayer : MonoBehaviour {
+		#region Fields
 		Chart chart;
 		Skin skin;
 		PdtSkin pskin;
@@ -44,7 +48,9 @@ namespace Cryville.Crtr {
 
 		static bool initialized;
 		static Text logs;
-		Text status;
+		TextMeshProUGUI status;
+		readonly TargetString statusstr = new TargetString();
+		readonly StringBuffer statusbuf = new StringBuffer();
 
 		static Vector2 screenSize;
 		public static Rect hitRect;
@@ -57,6 +63,7 @@ namespace Cryville.Crtr {
 		static double renderStep = 0.05;
 		public static double actualRenderStep = 0;
 		static bool autoRenderStep = false;
+		public static float graphicalOffset = 0;
 		public static float soundOffset = 0;
 		static float startOffset = 0;
 		public static float sv = 16f;
@@ -66,6 +73,7 @@ namespace Cryville.Crtr {
 		public static PdtEvaluator etor;
 		
 		InputProxy inputProxy;
+		#endregion
 
 		#region MonoBehaviour
 		void Start() {
@@ -79,7 +87,7 @@ namespace Cryville.Crtr {
 			}
 			OnSettingsUpdate();
 
-			status = GameObject.Find("Status").GetComponent<Text>();
+			status = GameObject.Find("Status").GetComponent<TextMeshProUGUI>();
 
 			texHandler = new DownloadHandlerTexture();
 #if BUILD
@@ -105,7 +113,6 @@ namespace Cryville.Crtr {
 			if (texLoader != null) texLoader.Dispose();
 			if (inputProxy != null) inputProxy.Dispose();
 			if (texs != null) foreach (var t in texs) Texture.Destroy(t.Value);
-			Camera.onPostRender -= OnCameraPostRender;
 			GC.Collect();
 		}
 
@@ -127,7 +134,7 @@ namespace Cryville.Crtr {
 				if (forceSyncFrames != 0) {
 					forceSyncFrames--;
 					double target = Game.AudioClient.Position - atime0;
-					dt = target - cbus.Time;
+					dt = target - cbus.Time - graphicalOffset;
 					step = autoRenderStep ? 1f / Application.targetFrameRate : renderStep;
 					inputProxy.SyncTime(target);
 				}
@@ -136,6 +143,7 @@ namespace Cryville.Crtr {
 					step = autoRenderStep ? Time.smoothDeltaTime : renderStep;
 				}
 				inputProxy.ForceTick();
+				if (paused) return;
 				cbus.ForwardByTime(dt);
 				bbus.ForwardByTime(dt);
 				UnityEngine.Profiling.Profiler.BeginSample("ChartPlayer.Forward");
@@ -146,12 +154,13 @@ namespace Cryville.Crtr {
 				actualRenderStep = step;
 
 				nbus.ForwardStepByTime(clippingDist, step);
-				nbus.BroadcastEndUpdate();
+				nbus.EndPreGraphicalUpdate();
 				nbus.Anchor();
 
+				tbus.StripTempEvents();
 				tbus.ForwardStepByTime(clippingDist, step);
 				tbus.ForwardStepByTime(renderDist, step);
-				tbus.BroadcastEndUpdate();
+				tbus.EndGraphicalUpdate();
 				UnityEngine.Profiling.Profiler.EndSample();
 			}
 			catch (Exception ex) {
@@ -213,7 +222,6 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
-		string timetext = string.Empty;
 		void LogUpdate() {
 			string _logs = logs.text;
 			Game.MainLogger.Enumerate((level, module, msg) => {
@@ -233,36 +241,49 @@ namespace Cryville.Crtr {
 				);
 			});
 			logs.text = _logs.Substring(Mathf.Max(0, _logs.IndexOf('\n', Mathf.Max(0, _logs.Length - 4096))));
-			var sttext = string.Format(
-					"FPS: i{0:0} / s{1:0}\nSMem: {2:N0} / {3:N0}\nIMem: {4:N0} / {5:N0}",
-					1 / Time.deltaTime,
-					1 / Time.smoothDeltaTime,
+			statusbuf.Clear();
+			statusbuf.AppendFormat(
+				"FPS: i{0:0} / s{1:0}\nSMem: {2:N0} / {3:N0}\nIMem: {4:N0} / {5:N0}",
+				1 / Time.deltaTime,
+				1 / Time.smoothDeltaTime,
 #if UNITY_5_6_OR_NEWER
-					UnityEngine.Profiling.Profiler.GetMonoUsedSizeLong(),
-					UnityEngine.Profiling.Profiler.GetMonoHeapSizeLong(),
-					UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong(),
-					UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong()
+				UnityEngine.Profiling.Profiler.GetMonoUsedSizeLong(),
+				UnityEngine.Profiling.Profiler.GetMonoHeapSizeLong(),
+				UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong(),
+				UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong()
 #else
-					UnityEngine.Profiling.Profiler.GetMonoUsedSize(),
-					UnityEngine.Profiling.Profiler.GetMonoHeapSize(),
-					UnityEngine.Profiling.Profiler.GetTotalAllocatedMemory(),
-					UnityEngine.Profiling.Profiler.GetTotalReservedMemory()
+				UnityEngine.Profiling.Profiler.GetMonoUsedSize(),
+				UnityEngine.Profiling.Profiler.GetMonoHeapSize(),
+				UnityEngine.Profiling.Profiler.GetTotalAllocatedMemory(),
+				UnityEngine.Profiling.Profiler.GetTotalReservedMemory()
 #endif
-				);
-			sttext += timetext;
-			if (judge != null) sttext += "\n== Scores ==\n" + judge.GetFullFormattedScoreString();
-			status.text = sttext;
-		}
-		void OnCameraPostRender(Camera cam) {
-			if (!started) return;
-			if (!logEnabled) return;
-			timetext = string.Format(
-				"\nSTime: {0:R}s {3}\ndATime: {1:+0.0ms;-0.0ms;0} {3}\ndITime: {2:+0.0ms;-0.0ms;0} {3}",
-				cbus.Time,
-				(Game.AudioClient.Position - atime0 - cbus.Time) * 1e3,
-				(inputProxy.GetTimestampAverage() - cbus.Time) * 1e3,
-				forceSyncFrames != 0 ? "(force sync)" : ""
 			);
+			if (started) {
+				statusbuf.AppendFormat(
+					"\nStates: c{0} / b{1}\nPools: RMV {2}, MC {3}",
+					cbus.ActiveStateCount, bbus.ActiveStateCount,
+					ContainerState.RMVPool.RentedCount,
+					ContainerState.MCPool.RentedCount
+				);
+				statusbuf.AppendFormat(
+					"\nSTime: {0:G17}s {3} {4}\ndATime: {1:+0.0ms;-0.0ms;0} {3} {4}\ndITime: {2:+0.0ms;-0.0ms;0} {3} {5}",
+					cbus.Time,
+					(Game.AudioClient.Position - atime0 - cbus.Time) * 1e3,
+					(inputProxy.GetTimestampAverage() - cbus.Time) * 1e3,
+					forceSyncFrames != 0 ? "(force sync)" : "",
+					paused ? "(paused)" : "",
+					paused ? "(semi-locked)" : ""
+				);
+				if (judge != null) {
+					statusbuf.Append("\n== Scores ==\n");
+					var fullScoreStr = judge.GetFullFormattedScoreString();
+					statusbuf.Append(fullScoreStr.TrustedAsArray(), 0, fullScoreStr.Length);
+				}
+			}
+			statusstr.Length = statusbuf.Count;
+			var arr = statusstr.TrustedAsArray();
+			statusbuf.CopyTo(0, arr, 0, statusbuf.Count);
+			status.SetText(arr, 0, statusbuf.Count);
 		}
 		#endregion
 
@@ -293,7 +314,7 @@ namespace Cryville.Crtr {
 		bool logEnabled = true;
 		public void ToggleLogs() {
 			logs.text = "";
-			status.text = "";
+			status.SetText("");
 			logEnabled = !logEnabled;
 		}
 
@@ -304,6 +325,20 @@ namespace Cryville.Crtr {
 				else Logger.Log("main", 2, "Load/MainThread", "The chart is currently loading");
 			}
 		}
+
+		bool paused = false;
+		public void TogglePause() {
+			paused = !paused;
+			if (!paused) {
+				forceSyncFrames = Settings.Default.ForceSyncFrames;
+				Game.AudioClient.Start();
+				inputProxy.UnlockTime();
+			}
+			else {
+				Game.AudioClient.Pause();
+				inputProxy.LockTime();
+			}
+		}
 		#endregion
 
 		#region Load
@@ -314,15 +349,14 @@ namespace Cryville.Crtr {
 			renderStep = Settings.Default.RenderStep;
 			actualRenderStep = renderStep;
 			autoRenderStep = renderStep == 0;
+			graphicalOffset = Settings.Default.GraphicalOffset;
 			soundOffset = Settings.Default.SoundOffset;
 			startOffset = Settings.Default.StartOffset;
-			forceSyncFrames= Settings.Default.ForceSyncFrames;
+			forceSyncFrames = Settings.Default.ForceSyncFrames;
 			texloaddone = false;
 			Game.NetworkTaskWorker.SuspendBackgroundTasks();
 			Game.AudioSession = Game.AudioSequencer.NewSession();
 
-			Camera.onPostRender += OnCameraPostRender;
-
 			var hitPlane = new Plane(Vector3.forward, Vector3.zero);
 			var r0 = Camera.main.ViewportPointToRay(new Vector3(0, 0, 1));
 			float dist;
@@ -355,6 +389,7 @@ namespace Cryville.Crtr {
 				});
 			}
 			sv = _rscfg.generic.ScrollVelocity;
+			soundOffset += _rscfg.generic.SoundOffset;
 
 			FileInfo skinFile = new FileInfo(
 				string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin)
@@ -434,12 +469,13 @@ namespace Cryville.Crtr {
 		public void Stop() {
 			try {
 				Logger.Log("main", 1, "Game", "Stopping");
+				Game.AudioClient.Start();
 				Game.AudioSession = Game.AudioSequencer.NewSession();
 				inputProxy.Deactivate();
-				if (cbus != null) { cbus.Dispose(); cbus = null; }
-				if (bbus != null) { bbus.Dispose(); bbus = null; }
-				if (tbus != null) { tbus.Dispose(); tbus = null; }
 				if (nbus != null) { nbus.Dispose(); nbus = null; }
+				if (tbus != null) { tbus.Dispose(); tbus = null; }
+				if (bbus != null) { bbus.Dispose(); bbus = null; }
+				if (cbus != null) { cbus.Dispose(); cbus.DisposeAll(); cbus = null; }
 				Logger.Log("main", 1, "Game", "Stopped");
 			}
 			catch (Exception ex) {
@@ -483,7 +519,6 @@ namespace Cryville.Crtr {
 			try {
 				workerTimer = new diag::Stopwatch();
 				workerTimer.Start();
-				RMVPool.Prepare();
 				LoadChart(info);
 				workerTimer.Stop();
 				Logger.Log("main", 1, "Load/WorkerThread", "Worker thread done ({0}ms)", workerTimer.Elapsed.TotalMilliseconds);
@@ -515,11 +550,11 @@ namespace Cryville.Crtr {
 				var batcher = new EventBatcher(chart);
 				batcher.Forward();
 				cbus = batcher.Batch();
-				Logger.Log("main", 0, "Load/WorkerThread", "Batched {0} event batches", cbus.events.Count);
 
 				LoadSkin(info.skinFile);
 
-				judge = new Judge(pruleset);
+				Logger.Log("main", 0, "Load/WorkerThread", "Initializing judge and input");
+				judge = new Judge(this, pruleset);
 				etor.ContextJudge = judge;
 
 				inputProxy = new InputProxy(pruleset, judge);
@@ -537,10 +572,10 @@ namespace Cryville.Crtr {
 					foreach (var ts in gs.Value.Children) {
 						ContainerHandler th;
 						if (ts.Key is Chart.Note) {
-							th = new NoteHandler(gh, (Chart.Note)ts.Key, pruleset);
+							th = new NoteHandler((Chart.Note)ts.Key, gh);
 						}
 						else {
-							th = new TrackHandler(gh, (Chart.Track)ts.Key);
+							th = new TrackHandler((Chart.Track)ts.Key, gh);
 						}
 						ts.Value.AttachHandler(th);
 					}
@@ -572,6 +607,8 @@ namespace Cryville.Crtr {
 				pruleset = ruleset.Root;
 				pruleset.Optimize(etor);
 			}
+			ContainerState.RMVPool = new RMVPool();
+			ContainerState.MCPool = new MotionCachePool();
 		}
 
 		void LoadSkin(FileInfo file) {

Assets/Cryville/Crtr/Clip.cs

@@ -0,0 +1,10 @@
+namespace Cryville.Crtr {
+	public struct Clip {
+		public float Behind { get; set; }
+		public float Ahead { get; set; }
+		public Clip(float behind, float ahead) {
+			Behind = behind;
+			Ahead = ahead;
+		}
+	}
+}

Assets/Cryville/Crtr/Clip.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 31109f74226deb947b93732206b112ed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Components/SectionalGameObject.cs

@@ -19,7 +19,7 @@ namespace Cryville.Crtr.Components {
 
 		public SectionalGameObject() {
 			SubmitProperty("partial", new PropOp.Boolean(v => part = Part.idle));
-			SubmitProperty("part", new PropOp.Enum<Part>(v => part = v, v => (Part)v));
+			SubmitProperty("part", new PropOp.Enum<Part>(v => part = v, v => (Part)v), 2);
 		}
 
 		protected override void OnDestroy() {
@@ -80,11 +80,10 @@ namespace Cryville.Crtr.Components {
 				var o = GetOperand(0);
 				if (o.Type != PdtInternalType.Vector) throw new ArgumentException("Not a vector");
 				_self._shapeLength = (o.Length - sizeof(int)) / sizeof(Vector2);
-				var ptr = (Vector2*)o.TrustedAsOfLength(sizeof(Vector2));
 				if (_self._shape != null) _shapePool.Return(_self._shape);
 				_self._shape = _shapePool.Rent(_self._shapeLength);
 				for (int i = 0; i < _self._shapeLength; i++) {
-					_self._shape[i] = ptr[i];
+					_self._shape[i] = o.As<Vector2>(i * sizeof(Vector2));
 				}
 			}
 		}
@@ -104,6 +103,7 @@ namespace Cryville.Crtr.Components {
 		public SpriteInfo body = new SpriteInfo();
 		public SpriteInfo tail = new SpriteInfo();
 
+		Material[] mats;
 		List<Vector3> vertices;
 		List<float> lengths;
 		float sumLength = 0;
@@ -112,7 +112,7 @@ namespace Cryville.Crtr.Components {
 			base.Init();
 			mesh.Init(transform);
 
-			var mats = mesh.Renderer.materials = new Material[] { mesh.NewMaterial, mesh.NewMaterial, mesh.NewMaterial };
+			mats = mesh.Renderer.materials = new Material[] { mesh.NewMaterial, mesh.NewMaterial, mesh.NewMaterial };
 			head.Bind(mats[0]);
 			body.Bind(mats[1]);
 			tail.Bind(mats[2]);
@@ -123,7 +123,7 @@ namespace Cryville.Crtr.Components {
 		protected override void OnDestroy() {
 			base.OnDestroy();
 			Reset();
-			foreach (var m in mesh.Renderer.materials) Material.Destroy(m);
+			foreach (var m in mats) Material.Destroy(m);
 			if (_shape != null) _shapePool.Return(_shape);
 			if (vertices != null) {
 				_ptPool.Return(vertices);
@@ -152,6 +152,7 @@ namespace Cryville.Crtr.Components {
 		List<Vector3> verts;
 		List<Vector2> uvs;
 		List<int> trih = null, trib = null, trit = null;
+		static readonly List<int> _emptyTris = new List<int>();
 
 		public override void Seal() {
 			if (vertCount <= 1 || sumLength == 0) return;
@@ -192,13 +193,13 @@ namespace Cryville.Crtr.Components {
 			if (body.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
 			if (tail.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
 
-			mesh.Mesh.subMeshCount = m;
+			mesh.Mesh.subMeshCount = 3;
 			m = 0;
 			mesh.Mesh.SetVertices(verts);
 			mesh.Mesh.SetUVs(0, uvs);
-			if (head.Frame != null) mesh.Mesh.SetTriangles(trih, m++);
-			if (body.Frame != null) mesh.Mesh.SetTriangles(trib, m++);
-			if (tail.Frame != null) mesh.Mesh.SetTriangles(trit, m++);
+			mesh.Mesh.SetTriangles(head.Frame == null ? _emptyTris : trih, m++);
+			mesh.Mesh.SetTriangles(body.Frame == null ? _emptyTris : trib, m++);
+			mesh.Mesh.SetTriangles(tail.Frame == null ? _emptyTris : trit, m++);
 			mesh.Mesh.RecalculateNormals();
 
 			_vertPool.Return(verts); verts = null;

Assets/Cryville/Crtr/Components/SpriteBase.cs

@@ -16,10 +16,10 @@ namespace Cryville.Crtr.Components {
 			public op_set_bound(SpriteBase self) : base(2) {
 				_self = self;
 			}
-			protected unsafe override void Execute() {
+			protected override void Execute() {
 				_self.SetBound(
-					*(Vector2*)GetOperand(0).TrustedAsOfLength(sizeof(Vector2)),
-					*(Vector3*)GetOperand(1).TrustedAsOfLength(sizeof(Vector3))
+					GetOperand(0).As<Vector2>(),
+					GetOperand(1).As<Vector3>()
 				);
 			}
 		}

Assets/Cryville/Crtr/Config/ConfigPanelMaster.cs

@@ -0,0 +1,91 @@
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Text;
+using UnityEngine;
+using Logger = Cryville.Common.Logger;
+
+namespace Cryville.Crtr.Config {
+	public class ConfigPanelMaster : MonoBehaviour {
+		[SerializeField]
+		Menu m_menu;
+
+		[SerializeField]
+		Transform m_content;
+
+		[SerializeField]
+		SettingsPanel m_genericConfigPanel;
+
+		[SerializeField]
+		InputConfigPanel m_inputConfigPanel;
+
+		public Ruleset ruleset;
+		RulesetConfig _rscfg;
+
+		void OnEnable() {
+			try {
+				ChartPlayer.etor = new PdtEvaluator();
+				FileInfo file = new FileInfo(
+					Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
+				);
+				if (!file.Exists) {
+					throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
+				}
+				DirectoryInfo dir = file.Directory;
+				using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+					ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
+						MissingMemberHandling = MissingMemberHandling.Error
+					});
+					if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
+					ruleset.LoadPdt(dir);
+				}
+				FileInfo cfgfile = new FileInfo(
+					Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
+				);
+				if (!cfgfile.Exists) {
+					if (!cfgfile.Directory.Exists) cfgfile.Directory.Create();
+					_rscfg = new RulesetConfig();
+				}
+				else {
+					using (StreamReader cfgreader = new StreamReader(cfgfile.FullName, Encoding.UTF8)) {
+						_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
+							MissingMemberHandling = MissingMemberHandling.Error
+						});
+					}
+				}
+
+				m_genericConfigPanel.Target = _rscfg.generic;
+
+				var proxy = new InputProxy(ruleset.Root, null);
+				proxy.LoadFrom(_rscfg.inputs);
+				m_inputConfigPanel.proxy = proxy;
+
+				m_inputConfigPanel.OnConfigEnable();
+			}
+			catch (Exception ex) {
+				Popup.CreateException(ex);
+				Logger.Log("main", 4, "Config", "An error occured while loading the config: {0}", ex);
+				m_menu.Back();
+			}
+		}
+
+		public void SwitchCategory(GameObject cat) {
+			foreach (Transform c in m_content) {
+				c.gameObject.SetActive(false);
+			}
+			cat.SetActive(true);
+		}
+
+		void OnDisable() {
+			m_inputConfigPanel.proxy.SaveTo(_rscfg.inputs);
+			m_inputConfigPanel.proxy.Dispose();
+			FileInfo cfgfile = new FileInfo(
+				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
+			);
+			using (StreamWriter cfgwriter = new StreamWriter(cfgfile.FullName, false, Encoding.UTF8)) {
+				cfgwriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
+			}
+			m_inputConfigPanel.OnConfigDisable();
+		}
+	}
+}

Assets/Cryville/Crtr/Config/ConfigScene.cs

@@ -1,91 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.IO;
-using System.Text;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-namespace Cryville.Crtr.Config {
-	public class ConfigScene : MonoBehaviour {
-		[SerializeField]
-		Transform m_content;
-
-		[SerializeField]
-		SettingsPanel m_genericConfigPanel;
-
-		[SerializeField]
-		InputConfigPanel m_inputConfigPanel;
-
-		public Ruleset ruleset;
-		RulesetConfig _rscfg;
-
-		void Awake() {
-			ChartPlayer.etor = new PdtEvaluator();
-			FileInfo file = new FileInfo(
-				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
-			);
-			if (!file.Exists) {
-				Popup.Create("Ruleset for the chart not found\nMake sure you have imported the ruleset");
-				ReturnToMenu();
-				return;
-			}
-			DirectoryInfo dir = file.Directory;
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
-					MissingMemberHandling = MissingMemberHandling.Error
-				});
-				if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
-				ruleset.LoadPdt(dir);
-			}
-			FileInfo cfgfile = new FileInfo(
-				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
-			);
-			if (!cfgfile.Exists) {
-				if (!cfgfile.Directory.Exists) cfgfile.Directory.Create();
-				_rscfg = new RulesetConfig();
-			}
-			else {
-				using (StreamReader cfgreader = new StreamReader(cfgfile.FullName, Encoding.UTF8)) {
-					_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
-						MissingMemberHandling = MissingMemberHandling.Error
-					});
-				}
-			}
-
-			m_genericConfigPanel.Target = _rscfg.generic;
-
-			var proxy = new InputProxy(ruleset.Root, null);
-			proxy.LoadFrom(_rscfg.inputs);
-			m_inputConfigPanel.proxy = proxy;
-			Game.InputManager.Activate();
-		}
-
-		public void SwitchCategory(GameObject cat) {
-			foreach (Transform c in m_content) {
-				c.gameObject.SetActive(false);
-			}
-			cat.SetActive(true);
-		}
-
-		public void SaveAndReturnToMenu() {
-			Game.InputManager.Deactivate();
-			m_inputConfigPanel.proxy.SaveTo(_rscfg.inputs);
-			m_inputConfigPanel.proxy.Dispose();
-			FileInfo cfgfile = new FileInfo(
-				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
-			);
-			using (StreamWriter cfgwriter = new StreamWriter(cfgfile.FullName, false, Encoding.UTF8)) {
-				cfgwriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
-			}
-			ReturnToMenu();
-		}
-		public void ReturnToMenu() {
-			GameObject.Find("Master").GetComponent<Master>().ShowMenu();
-#if UNITY_5_5_OR_NEWER
-			SceneManager.UnloadSceneAsync("Config");
-#elif UNITY_5_3_OR_NEWER
-			SceneManager.UnloadScene("Config");
-#endif
-		}
-	}
-}

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -7,7 +7,7 @@ using UnityEngine.UI;
 namespace Cryville.Crtr.Config {
 	public class InputConfigPanel : MonoBehaviour {
 		[SerializeField]
-		ConfigScene m_configScene;
+		ConfigPanelMaster m_configScene;
 
 		[SerializeField]
 		GameObject m_inputDialog;
@@ -24,6 +24,7 @@ namespace Cryville.Crtr.Config {
 		[SerializeField]
 		GameObject m_prefabInputConfigEntry;
 
+		SimpleInputConsumer _consumer;
 		public InputProxy proxy;
 		readonly Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
 
@@ -32,7 +33,7 @@ namespace Cryville.Crtr.Config {
 			_sel = entry;
 			m_inputDialog.SetActive(true);
 			CallHelper.Purge(m_deviceList);
-			Game.InputManager.EnumerateEvents(ev => { });
+			_consumer.EnumerateEvents(ev => { });
 			_recvsrcs.Clear();
 			AddSourceItem(null);
 		}
@@ -46,10 +47,14 @@ namespace Cryville.Crtr.Config {
 				Target = _sel,
 				Source = src,
 			});
-			m_inputDialog.SetActive(false);
+			CloseDialog();
 		}
 
-		void Start() {
+		public void OnConfigEnable() {
+			CallHelper.Purge(m_entryList);
+			_entries.Clear();
+			_consumer = new SimpleInputConsumer(Game.InputManager);
+			_consumer.Activate();
 			foreach (var i in m_configScene.ruleset.Root.inputs) {
 				var e = GameObject.Instantiate(m_prefabInputConfigEntry, m_entryList.transform).GetComponent<InputConfigPanelEntry>();
 				_entries.Add(i.Key, e);
@@ -59,15 +64,18 @@ namespace Cryville.Crtr.Config {
 			proxy.ProxyChanged += OnProxyChanged;
 		}
 
+		public void OnConfigDisable() {
+			_consumer.Deactivate();
+		}
+
 		void OnProxyChanged(object sender, ProxyChangedEventArgs e) {
-			_entries[e.Name].SetEnabled(!e.Used);
-			_entries[e.Name].SetValue(e.Proxy == null ? "None" : e.Proxy.Value.Handler.GetTypeName(e.Proxy.Value.Type));
+			_entries[e.Name].OnProxyChanged(e);
 		}
 
 		readonly List<InputSource?> _recvsrcs = new List<InputSource?>();
 		void Update() {
 			if (m_inputDialog.activeSelf) {
-				Game.InputManager.EnumerateEvents(ev => {
+				_consumer.EnumerateEvents(ev => {
 					AddSourceItem(ev.Id.Source);
 				});
 			}
@@ -77,7 +85,7 @@ namespace Cryville.Crtr.Config {
 			if (_recvsrcs.Contains(src)) return;
 			_recvsrcs.Add(src);
 			var obj = Instantiate(m_prefabListItem, m_deviceList);
-			obj.transform.Find("Text").GetComponent<Text>().text = src == null ? "None" : src.Value.Handler.GetTypeName(src.Value.Type);
+			obj.transform.Find("Text").GetComponent<Text>().text = src == null ? "(None)" : src.Value.Handler.GetTypeName(src.Value.Type);
 			var btn = obj.GetComponent<Button>();
 			if (src != null) btn.interactable = !proxy.IsUsed(src.Value);
 			btn.onClick.AddListener(() => {

Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 namespace Cryville.Crtr.Config {
@@ -17,9 +18,29 @@ namespace Cryville.Crtr.Config {
 			m_value.text = "None";
 			m_button.onClick.AddListener(() => {
 				master.OpenDialog(name);
+				EventSystem.current.SetSelectedGameObject(null);
 			});
 		}
 
+		public void OnProxyChanged(ProxyChangedEventArgs e) {
+			if (e.Used) {
+				m_button.interactable = false;
+				m_value.text = "(Not Required)";
+				m_value.color = Color.black;
+			}
+			else {
+				m_button.interactable = true;
+				if (e.Proxy == null) {
+					m_value.text = "(Unassigned)";
+					m_value.color = Color.yellow;
+				}
+				else {
+					m_value.text = e.Proxy.Value.Handler.GetTypeName(e.Proxy.Value.Type);
+					m_value.color = Color.black;
+				}
+			}
+		}
+
 		public void SetValue(string name) {
 			m_value.text = name;
 		}

Assets/Cryville/Crtr/Config/RulesetConfig.cs

@@ -12,6 +12,12 @@ namespace Cryville.Crtr.Config {
 			[JsonProperty("skin")]
 			public string Skin { get; set; }
 
+			[Category("gameplay")]
+			[JsonProperty("sound_offset")]
+			[Step(0.04f)]
+			[Precision(1e-3)]
+			public float SoundOffset { get; set; }
+
 			[Category("deprecated")][Obsolete]
 			[JsonProperty("scroll_velocity")][DefaultValue(1)]
 			[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
@@ -19,6 +25,7 @@ namespace Cryville.Crtr.Config {
 
 			public Generic() {
 				Skin = "";
+				SoundOffset = 0;
 				ScrollVelocity = 1;
 			}
 		}

Assets/Cryville/Crtr/DiscordController.cs

@@ -1,6 +1,7 @@
 using Discord;
 using System;
 using UnityEngine;
+using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr {
 	internal class DiscordController : MonoBehaviour {
@@ -16,22 +17,42 @@ namespace Cryville.Crtr {
 		void Start() {
 			Instance = this;
 			launchTime = (long)(DateTime.UtcNow - DateTime.UnixEpoch).TotalSeconds;
-			dc = new Discord.Discord(CLIENT_ID, (UInt64)CreateFlags.Default);
-			am = dc.GetActivityManager();
-			SetIdle();
+			try {
+				dc = new Discord.Discord(CLIENT_ID, (UInt64)CreateFlags.NoRequireDiscord);
+				Logger.Log("main", 1, "Discord", "Connected to Discord");
+				am = dc.GetActivityManager();
+				SetIdle();
+			}
+			catch (ResultException) {
+				if (dc != null) {
+					dc.Dispose();
+					dc = null;
+				}
+				Logger.Log("main", 3, "Discord", "Cannot connect to Discord");
+			}
 		}
 
 		void Update() {
-			dc.RunCallbacks();
+			if (dc == null) return;
+			try {
+				dc.RunCallbacks();
+			}
+			catch (ResultException ex) {
+				dc.Dispose();
+				dc = null;
+				Logger.Log("main", 4, "Discord", "An error occured while running callbacks: {0}", ex);
+			}
 		}
 
 		void OnApplicationQuit() {
+			if (dc == null) return;
 			dc.Dispose();
 		}
 
 		void Callback(Result result) { }
 
 		public void SetIdle() {
+			if (dc == null) return;
 			am.UpdateActivity(new Activity {
 				State = "Idle",
 				Instance = false,
@@ -40,6 +61,7 @@ namespace Cryville.Crtr {
 		}
 
 		public void SetPlaying(string detail, double? duration) {
+			if (dc == null) return;
 			long now = (long)(DateTime.UtcNow - DateTime.UnixEpoch).TotalSeconds;
 			am.UpdateActivity(new Activity {
 				State = "Playing a chart",

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -4,10 +4,15 @@ using Cryville.Crtr.Components;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using UnityEngine;
 
 namespace Cryville.Crtr.Event {
-	public abstract class ContainerHandler : IDisposable {
+	public abstract class ContainerHandler {
+		#region Struct
+		public ContainerHandler() { }
+		public abstract string TypeName { get; }
+
 		/// <summary>
 		/// Prehandling <see cref="ContainerState"/>, prehandling the events.
 		/// </summary>
@@ -36,22 +41,34 @@ namespace Cryville.Crtr.Event {
 		/// <summary>
 		/// <see cref="GameObject"/> group, the <see cref="Transform"/> containing all the generated elements in the <see cref="ContainerHandler"/>.
 		/// </summary>
-		public Transform gogroup;
+		protected Transform gogroup;
+		public SkinContext SkinContext;
 
-		public readonly Dictionary<int, Anchor> Anchors = new Dictionary<int, Anchor>();
-		protected Transform a_cur;
-		protected Transform a_head;
-		protected Transform a_tail;
 		public Vector3 Position { get; protected set; }
 		public Quaternion Rotation { get; protected set; }
 		public bool Alive { get; private set; }
-		public bool Awoken { get; private set; }
-		public bool Disposed { get; private set; }
+		bool PreGraphicalActive;
+		public void SetPreGraphicalActive(bool value, ContainerState s) {
+			if (PreGraphicalActive == value) return;
+			PreGraphicalActive = value;
+			if (PreGraphicalActive) StartPreGraphicalUpdate(s);
+			else EndPreGraphicalUpdate(s);
+		}
+		bool GraphicalActive;
+		public void SetGraphicalActive(bool value, ContainerState s) {
+			if (GraphicalActive == value) return;
+			GraphicalActive = value;
+			if (GraphicalActive) StartGraphicalUpdate(s);
+			else EndGraphicalUpdate(s);
+		}
 
 		public EventContainer Container {
 			get { return cs.Container; }
 		}
 
+		static readonly int _var_current_time = IdentifierManager.SharedInstance.Request("current_time");
+		static readonly int _var_invisible_bounds = IdentifierManager.SharedInstance.Request("invisible_bounds");
+		public readonly Dictionary<int, PropSrc> PropSrcs = new Dictionary<int, PropSrc>();
 		SkinContainer skinContainer;
 		protected Judge judge;
 		public void AttachSystems(PdtSkin skin, Judge judge) {
@@ -59,108 +76,162 @@ namespace Cryville.Crtr.Event {
 			this.judge = judge;
 		}
 
-		public ContainerHandler() { }
-		public abstract string TypeName {
-			get;
-		}
-		protected readonly static int _a_cur = IdentifierManager.SharedInstance.Request("cur");
-		protected readonly static int _a_head = IdentifierManager.SharedInstance.Request("head");
-		protected readonly static int _a_tail = IdentifierManager.SharedInstance.Request("tail");
-		public virtual void PreInit() {
-			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString(CultureInfo.InvariantCulture)).transform;
-			if (cs.Parent != null)
-				gogroup.SetParent(cs.Parent.Handler.gogroup, false);
-			a_cur = RegisterAnchor(_a_cur).Transform;
-			a_head = RegisterAnchor(_a_head).Transform;
-			a_tail = RegisterAnchor(_a_tail).Transform;
-		}
-		protected Anchor RegisterAnchor(int name) {
-			var go = new GameObject("." + IdentifierManager.SharedInstance.Retrieve(name)).transform;
+		public readonly Dictionary<int, List<Anchor>> Anchors = new Dictionary<int, List<Anchor>>();
+		public readonly Dictionary<int, Anchor> DynamicAnchors = new Dictionary<int, Anchor>();
+		public readonly Dictionary<int, bool> DynamicAnchorSet = new Dictionary<int, bool>();
+		public Anchor OpenedAnchor;
+		Anchor a_cur;
+		Anchor a_head;
+		Anchor a_tail;
+		readonly static int _a_cur = IdentifierManager.SharedInstance.Request("cur");
+		readonly static int _a_head = IdentifierManager.SharedInstance.Request("head");
+		readonly static int _a_tail = IdentifierManager.SharedInstance.Request("tail");
+		double atime_head;
+		double atime_tail;
+		public Anchor RegisterAnchor(int name, bool dyn = false, int propSrcCount = 0) {
+			var strname = IdentifierManager.SharedInstance.Retrieve(name);
+			var go = new GameObject("." + strname).transform;
 			go.SetParent(gogroup, false);
-			var result = new Anchor() { Transform = go };
-			Anchors.Add(name, result);
+			var result = new Anchor(name, go, propSrcCount);
+			if (dyn) {
+				if (DynamicAnchors.ContainsKey(name))
+					throw new ArgumentException(string.Format("The anchor \"{0}\" already exists", strname));
+				DynamicAnchors.Add(name, result);
+				DynamicAnchorSet.Add(name, false);
+			}
+			List<Anchor> list;
+			if (!Anchors.TryGetValue(name, out list))
+				Anchors.Add(name, list = new List<Anchor>());
+			list.Add(result);
 			return result;
 		}
+		protected void OpenAnchor(Anchor anchor) {
+			if (OpenedAnchor != null) throw new InvalidOperationException("An anchor has been opened");
+			anchor.Transform.gameObject.SetActive(true);
+			OpenedAnchor = anchor;
+		}
+		protected void CloseAnchor() {
+			OpenedAnchor = null;
+		}
+		#endregion
 
-		/// <summary>
-		/// Called upon StartUpdate of ps 17.
-		/// </summary>
+		#region Logic
+		#region Init methods: Called on prehandle
+		public virtual void PreInit() {
+			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString(CultureInfo.InvariantCulture)).transform;
+			SkinContext = new SkinContext(gogroup);
+			if (cs.Parent != null)
+				gogroup.SetParent(cs.Parent.Handler.gogroup, false);
+			a_cur = RegisterAnchor(_a_cur);
+			a_head = RegisterAnchor(_a_head, true);
+			a_tail = RegisterAnchor(_a_tail, true);
+		}
 		public virtual void Init() {
 			skinContainer.MatchStatic(ps);
 			foreach (var i in gogroup.GetComponentsInChildren<SkinComponent>())
 				i.Init();
 		}
 		public virtual void PostInit() {
+			PropSrcs.Add(_var_current_time, new PropSrc.Float(() => (float)cs.rootPrototype.Time));
+			PropSrcs.Add(_var_invisible_bounds, new PropSrc.Boolean(() => atime_head > atime_tail));
 			gogroup.gameObject.SetActive(false);
 		}
+		#endregion
+		#region Start methods
+		public virtual void StartPhysicalUpdate(ContainerState s) {
+			if (s.CloneType < 16) Alive = true;
+			else if (s.CloneType == 17) Init();
+		}
+		public virtual void StartLogicalUpdate(ContainerState s) { }
+		public virtual void StartPreGraphicalUpdate(ContainerState s) { }
+		public virtual void StartGraphicalUpdate(ContainerState s) {
+			if (gogroup) gogroup.gameObject.SetActive(true);
+		}
+		#endregion
+		public virtual void Update(ContainerState s, StampedEvent ev) {
+			if (s.CloneType == 3) SetPreGraphicalActive(true, s);
+			else if (ev is StampedEvent.Anchor) {
+				var tev = (StampedEvent.Anchor)ev;
+				if (gogroup) {
+					OpenAnchor(tev.Target);
+#if UNITY_5_6_OR_NEWER
+					tev.Target.Transform.SetPositionAndRotation(Position, Rotation);
+#else
+					tev.Target.Transform.position = Position;
+					tev.Target.Transform.rotation = Rotation;
+#endif
+					skinContainer.MatchDynamic(s);
+					CloseAnchor();
+				}
+				if (tev.Target == a_head) {
+					SetGraphicalActive(true, s);
+				}
+				else if (tev.Target == a_tail) {
+					SetGraphicalActive(false, s);
+				}
+				anchorEvPool.Return(tev);
+			}
+			else if (gogroup && s.CloneType == 2) skinContainer.MatchDynamic(s);
+		}
+		#region End methods
+		public virtual void EndGraphicalUpdate(ContainerState s) { }
+		public virtual void EndPreGraphicalUpdate(ContainerState s) { }
+		public virtual void EndLogicalUpdate(ContainerState s) { }
+		public virtual void EndPhysicalUpdate(ContainerState s) { }
 		public virtual void Dispose() {
-			if (Disposed) return;
-			Disposed = true;
 			if (gogroup)
 				GameObject.Destroy(gogroup.gameObject);
-				// gogroup.gameObject.SetActive(false);
 			Alive = false;
 		}
-		protected virtual void PreAwake(ContainerState s) {
-			if (gogroup) gogroup.gameObject.SetActive(true);
-			Awoken = true; Alive = true;
-			OpenAnchor(_a_head);
-		}
-		protected virtual void Awake(ContainerState s) {
-			CloseAnchor(_a_head);
-		}
-		protected virtual void GetPosition(ContainerState s) { }
-		public virtual void StartUpdate(ContainerState s) {
-			if (s.CloneType >= 2 && s.CloneType < 16) {
-				PreAwake(s);
-				Awake(s);
-			}
-			else if (s.CloneType == 17) {
-				Init();
+		public virtual void DisposeAll() { }
+		#endregion
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		protected static bool CanDoGraphicalUpdate(ContainerState s) { return s.CloneType >= 2 && s.CloneType < 16; }
+		#region Anchor
+		public virtual void Anchor() {
+			foreach (var p in PropSrcs.Values) p.Invalidate();
+			foreach (var a in DynamicAnchors.Keys) DynamicAnchorSet[a] = false;
+			atime_head = cs.StampedContainer.Time;
+			atime_tail = atime_head + cs.StampedContainer.Duration;
+			skinContainer.MatchDynamic(cs);
+			if (cs.Active) PushAnchorEvent(cs.Time, a_cur);
+			if (Alive) {
+				if (!DynamicAnchorSet[_a_head]) PushAnchorEvent(atime_head, a_head, -1, true);
+				if (!DynamicAnchorSet[_a_tail]) PushAnchorEvent(atime_tail, a_tail, 1, true);
+				foreach (var anchors in Anchors.Values) foreach (var anchor in anchors) anchor.Transform.gameObject.SetActive(false);
 			}
 		}
 		static readonly SimpleObjectPool<StampedEvent.Anchor> anchorEvPool
 			= new SimpleObjectPool<StampedEvent.Anchor>(1024);
-		protected void PushAnchorEvent(int name, double time) {
+		public void PushAnchorEvent(double time, int name) {
+			Anchor anchor;
+			if (!DynamicAnchors.TryGetValue(name, out anchor))
+				throw new ArgumentException(string.Format("Specified anchor \"{0}\" not found", IdentifierManager.SharedInstance.Retrieve(name)));
+			if (DynamicAnchorSet[name])
+				throw new InvalidOperationException(string.Format("Specified anchor \"{0}\" has been set", IdentifierManager.SharedInstance.Retrieve(name)));
+			int priority = 0;
+			bool forced = true;
+			if (name == _a_head) { priority = -1; atime_head = time; }
+			else if (name == _a_tail) { priority = 1; atime_tail = time; }
+			else forced = false;
+			PushAnchorEvent(time, anchor, priority, forced);
+			DynamicAnchorSet[name] = true;
+		}
+		void PushAnchorEvent(double time, Anchor anchor, int priority = 0, bool forced = false) {
 			var tev = anchorEvPool.Rent();
 			tev.Time = time;
 			tev.Container = Container;
-			tev.Name = name;
+			tev.Target = anchor;
+			tev.CanDiscard = !forced;
+			tev.SetPriority(priority);
 			ts.Bus.PushTempEvent(tev);
 		}
-		public virtual void Update(ContainerState s, StampedEvent ev) {
-			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
-			if (flag) PreAwake(s);
-			if (s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s);
-			if (flag) Awake(s);
-		}
-		public virtual void ExUpdate(ContainerState s, StampedEvent ev) {
+		public virtual void Discard(ContainerState s, StampedEvent ev) {
 			if (ev is StampedEvent.Anchor) {
-				var tev = (StampedEvent.Anchor)ev;
-				if (gogroup) {
-					OpenAnchor(tev.Name);
-					Anchors[tev.Name].Transform.SetPositionAndRotation(Position, Rotation);
-					skinContainer.MatchDynamic(s);
-					CloseAnchor(tev.Name);
-				}
-				anchorEvPool.Return(tev);
+				anchorEvPool.Return((StampedEvent.Anchor)ev);
 			}
 		}
-		public virtual void MotionUpdate(byte ct, Chart.Motion ev) { }
-		public virtual void EndUpdate(ContainerState s) {
-			if (s.CloneType < 16) {
-				Awoken = false;
-				if (gogroup && s.CloneType <= 2) skinContainer.MatchDynamic(s);
-			}
-		}
-		public virtual void Anchor() {
-			if (cs.Working) PushAnchorEvent(_a_cur, cs.Time);
-		}
-		protected void OpenAnchor(int name) {
-			if (Anchors.ContainsKey(name)) Anchors[name].Open();
-		}
-		protected void CloseAnchor(int name) {
-			if (Anchors.ContainsKey(name)) Anchors[name].Close();
-		}
+		#endregion
+		#endregion
 	}
 }

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -1,22 +1,24 @@
 //#define DISABLE_CACHE
 
 using Cryville.Common;
+using Cryville.Common.Buffers;
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using UnityEngine;
 
 namespace Cryville.Crtr.Event {
 	public class ContainerState {
+		#region Struct
 		public EventBus Bus;
 		public EventContainer Container;
+		public StampedEvent StampedContainer;
 		public ContainerState Parent = null;
 		public ushort Depth;
 
 		public Dictionary<EventContainer, ContainerState> Children
 			= new Dictionary<EventContainer, ContainerState>();
-		readonly HashSet<EventContainer> WorkingChildren
-			= new HashSet<EventContainer>();
-		readonly HashSet<EventContainer> InvalidatedChildren
+		HashSet<EventContainer> ActiveChildren
 			= new HashSet<EventContainer>();
 		public Dictionary<Type, List<ContainerState>> TypedChildren
 			= new Dictionary<Type, List<ContainerState>>();
@@ -28,28 +30,47 @@ namespace Cryville.Crtr.Event {
 			return Children[ev];
 		}
 
-		void NotifyWorkingChanged(EventContainer key) {
-			InvalidatedChildren.Add(key);
-		}
-		void ValidateChildren() {
-			foreach (var cev in InvalidatedChildren)
-				if (Children[cev].Working && !WorkingChildren.Contains(cev)) WorkingChildren.Add(cev);
-				else if (!Children[cev].Working && WorkingChildren.Contains(cev)) WorkingChildren.Remove(cev);
-			InvalidatedChildren.Clear();
-		}
-
-		private bool m_Working;
-		public bool Working {
-			get { return m_Working; }
-			set {
-				m_Working = value;
-				if (Parent != null) Parent.NotifyWorkingChanged(Container);
-				Bus.NotifyWorkingChanged(this);
+		private bool m_active;
+		public bool Active {
+			get { return m_active; }
+			private set {
+				if (m_active == value) return;
+				m_active = value;
+				if (!m_active && CloneType == 1) Dispose();
+				if (Parent != null) {
+					if (m_active) Parent.ActiveChildren.Add(Container);
+					else Parent.ActiveChildren.Remove(Container);
+				}
+				Bus.NotifyActiveChanged(this);
 			}
 		}
+		private bool m_lActive;
+		public bool LogicalActive {
+			get { return m_lActive; }
+			set {
+				if (m_lActive == value) return;
+				m_lActive = value;
+				UpdateActive();
+				if (m_lActive) Handler.StartLogicalUpdate(this);
+				else Handler.EndLogicalUpdate(this);
+			}
+		}
+		private bool m_pActive;
+		public bool PhysicalActive {
+			get { return m_pActive; }
+			set {
+				if (m_pActive == value) return;
+				m_pActive = value;
+				UpdateActive();
+				if (m_pActive) Handler.StartPhysicalUpdate(this);
+				else Handler.EndPhysicalUpdate(this);
+			}
+		}
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		void UpdateActive() { Active = m_lActive || m_pActive; }
+
 		public byte CloneType;
-		private ContainerState rootPrototype = null;
-		private ContainerState prototype = null;
+		public ContainerState rootPrototype = null;
 
 		public ContainerHandler Handler {
 			get;
@@ -62,65 +83,32 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 
-		readonly RMVPool RMVPool = new RMVPool();
-		protected Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new Dictionary<StampedEvent, RealtimeMotionValue>();
-		protected Dictionary<Identifier, RealtimeMotionValue> Values;
-		protected Dictionary<Identifier, CacheEntry> CachedValues;
-		protected class CacheEntry {
-			public bool Valid { get; set; }
-			public Vector Value { get; set; }
-			public CacheEntry Clone() {
-				return new CacheEntry { Valid = Valid, Value = Value == null ? null : Value.Clone() };
-			}
-		}
-
-		/// <summary>
-		/// Gets a motion value.
-		/// </summary>
-		/// <param name="name">The motion name.</param>
-		/// <param name="clone">Returns a cloned motion value instead.</param>
-		/// <returns>A motion value.</returns>
-		RealtimeMotionValue GetMotionValue(Identifier name, bool clone = false) {
-			RealtimeMotionValue value;
-			if (!Values.TryGetValue(name, out value)) {
-				value = new RealtimeMotionValue().Init(Parent == null
-					? ChartPlayer.motionRegistry[name].GlobalInitValue
-					: ChartPlayer.motionRegistry[name].InitValue
-				);
-				Values.Add(name, value);
-			}
-			if (clone) return value.Clone();
-			return value;
-		}
-
-		void InvalidateMotion(Identifier name) {
-			CacheEntry cache;
-			if (!CachedValues.TryGetValue(name, out cache))
-				CachedValues.Add(name, cache = new CacheEntry());
-			cache.Valid = false;
-			foreach (var c in Children)
-				c.Value.InvalidateMotion(name);
-		}
-
-		public ContainerState(Chart c, EventContainer _ev, ContainerState parent = null) {
+		public ContainerState(EventContainer _ev, ContainerState parent = null) {
 			Container = _ev;
 
 			if (parent != null) {
-				AddChild(_ev, this, parent);
+				AddChild(_ev, parent);
 				Parent = parent;
 			}
 
+			_rmvpa = new CategorizedPoolAccessor<Identifier, RealtimeMotionValue>(RMVPool);
+			_mcpa = new CategorizedPoolAccessor<Identifier, MotionCache>(MCPool);
+
 			Values = new Dictionary<Identifier, RealtimeMotionValue>(ChartPlayer.motionRegistry.Count);
-			CachedValues = new Dictionary<Identifier, CacheEntry>(ChartPlayer.motionRegistry.Count);
+			CachedValues = new Dictionary<Identifier, MotionCache>(ChartPlayer.motionRegistry.Count);
 			foreach (var m in ChartPlayer.motionRegistry)
 				Values.Add(m.Key, new RealtimeMotionValue().Init(Parent == null ? m.Value.GlobalInitValue : m.Value.InitValue));
+
+			rootPrototype = this;
 		}
 
-		static void AddChild(EventContainer c, ContainerState s, ContainerState target) {
-			target.Children.Add(c, s);
+		void AddChild(EventContainer c, ContainerState parent) {
+			parent.Children.Add(c, this);
 			Type t = c.GetType();
-			if (!target.TypedChildren.ContainsKey(t)) target.TypedChildren.Add(t, new List<ContainerState>());
-			target.TypedChildren[t].Add(s);
+			List<ContainerState> tc;
+			if (!parent.TypedChildren.TryGetValue(t, out tc))
+				parent.TypedChildren.Add(t, tc = new List<ContainerState>());
+			tc.Add(this);
 		}
 
 		public ContainerState Clone(byte ct) {
@@ -132,20 +120,20 @@ namespace Cryville.Crtr.Event {
 			}
 			r.Values = mvs;
 
-			var cvs = new Dictionary<Identifier, CacheEntry>(ChartPlayer.motionRegistry.Count);
-			foreach (var cv in CachedValues) {
-				cvs.Add(cv.Key, cv.Value.Clone());
-			}
+			var cvs = new Dictionary<Identifier, MotionCache>(ChartPlayer.motionRegistry.Count);
 			r.CachedValues = cvs;
 
 			r.Children = new Dictionary<EventContainer, ContainerState>();
+			r.TypedChildren = new Dictionary<Type, List<ContainerState>>();
 			foreach (var child in Children) {
 				var cc = child.Value.Clone(ct);
 				cc.Parent = r;
-				AddChild(child.Key, cc, r);
+				cc.AddChild(child.Key, r);
 			}
 
-			var pms = new Dictionary<StampedEvent, RealtimeMotionValue>(PlayingMotions.Count);
+			r.ActiveChildren = new HashSet<EventContainer>();
+
+			var pms = new Dictionary<StampedEvent, RealtimeMotionValue>(Math.Max(4, PlayingMotions.Count));
 			foreach (var m in PlayingMotions)
 				pms.Add(m.Key, m.Value);
 			r.PlayingMotions = pms;
@@ -155,15 +143,15 @@ namespace Cryville.Crtr.Event {
 			else if (ct == 3) Handler.ns = r;
 			else if (ct >= 16) Handler.ps = r;
 			else throw new InvalidOperationException("Invalid clone type");
-			r.prototype = this;
-			if (prototype == null) r.rootPrototype = this;
-			else r.rootPrototype = rootPrototype;
 			r.CloneType = ct;
 			return r;
 		}
 
 		public void CopyTo(byte ct, ContainerState dest) {
-			dest.Working = Working;
+			dest.m_lActive = m_lActive;
+			dest.m_pActive = m_pActive;
+			dest.m_active = m_active;
+			if (dest.m_active) dest.Bus.NotifyActiveChanged(dest);
 
 			foreach (var mv in Values) {
 				RealtimeMotionValue dv;
@@ -171,20 +159,24 @@ namespace Cryville.Crtr.Event {
 				else dest.Values.Add(mv.Key, mv.Value.Clone());
 			}
 
+			foreach (var cv in dest.CachedValues) cv.Value.Valid = false;
 			foreach (var cv in CachedValues) {
-				CacheEntry dv;
-				if (dest.CachedValues.TryGetValue(cv.Key, out dv)) {
-					dv.Valid = cv.Value.Valid;
-					if (cv.Value.Value != null) cv.Value.Value.CopyTo(dv.Value);
+				MotionCache dv;
+				if (!dest.CachedValues.TryGetValue(cv.Key, out dv)) {
+					dest.CachedValues.Add(cv.Key, dv = dest._mcpa.Rent(cv.Key));
 				}
-				else dest.CachedValues.Add(cv.Key, cv.Value.Clone());
+				cv.Value.CopyTo(dv);
 			}
 
-			if (ct != 1) foreach (var cev in WorkingChildren)
+			foreach (var cev in dest.ActiveChildren) {
+				if (!ActiveChildren.Contains(cev))
+					Children[cev].CopyTo(ct, dest.Children[cev]);
+			}
+			dest.ActiveChildren.Clear();
+			foreach (var cev in ActiveChildren) {
+				dest.ActiveChildren.Add(cev);
 				Children[cev].CopyTo(ct, dest.Children[cev]);
-			else foreach (var child in Children)
-				child.Value.CopyTo(ct, dest.Children[child.Key]);
-			ValidateChildren();
+			}
 
 			dest.PlayingMotions.Clear();
 			foreach (var m in PlayingMotions) dest.PlayingMotions.Add(m.Key, m.Value);
@@ -197,10 +189,18 @@ namespace Cryville.Crtr.Event {
 		public void Dispose() {
 			if (Disposed) return;
 			Disposed = true;
-			if (CloneType < 16 && Handler != null) Handler.Dispose();
+			if (CloneType == 1) Handler.Dispose();
+			if (CloneType == 1 || CloneType == 17) {
+				_rmvpa.ReturnAll();
+				_mcpa.ReturnAll();
+			}
 			foreach (var s in Children)
 				s.Value.Dispose();
-			RMVPool.ReturnAll();
+		}
+		public void DisposeAll() {
+			foreach (var s in Children)
+				s.Value.DisposeAll();
+			Handler.DisposeAll();
 		}
 
 		public void AttachHandler(ContainerHandler h) {
@@ -213,13 +213,42 @@ namespace Cryville.Crtr.Event {
 		public void AttachSystems(PdtSkin skin, Judge judge) {
 			Handler.AttachSystems(skin, judge);
 		}
+		#endregion
+
+		#region Motion
+		internal static RMVPool RMVPool;
+		internal static MotionCachePool MCPool;
+		readonly CategorizedPoolAccessor<Identifier, RealtimeMotionValue> _rmvpa;
+		readonly CategorizedPoolAccessor<Identifier, MotionCache> _mcpa;
+		Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new Dictionary<StampedEvent, RealtimeMotionValue>(4);
+		Dictionary<Identifier, RealtimeMotionValue> Values;
+		Dictionary<Identifier, MotionCache> CachedValues;
+
+		/// <summary>
+		/// Gets a motion value.
+		/// </summary>
+		/// <param name="name">The motion name.</param>
+		/// <param name="clone">Returns a cloned motion value instead.</param>
+		/// <returns>A motion value.</returns>
+		RealtimeMotionValue GetMotionValue(Identifier name, bool clone = false) {
+			RealtimeMotionValue value = Values[name];
+			if (clone) return value.Clone();
+			return value;
+		}
+
+		void InvalidateMotion(Identifier name) {
+			MotionCache cache;
+			if (!CachedValues.TryGetValue(name, out cache))
+				CachedValues.Add(name, cache = _mcpa.Rent(name));
+			cache.Valid = false;
+			foreach (var c in ActiveChildren)
+				Children[c].InvalidateMotion(name);
+		}
 
 		public Vector GetRawValue(Identifier key) {
-			CacheEntry tr;
+			MotionCache tr;
 			if (!CachedValues.TryGetValue(key, out tr))
-				CachedValues.Add(key, tr = new CacheEntry { Valid = false });
-			if (tr.Value == null)
-				tr.Value = RMVPool.Rent(key).AbsoluteValue;
+				CachedValues.Add(key, tr = _mcpa.Rent(key));
 			Vector r = tr.Value;
 #if !DISABLE_CACHE
 			if (tr.Valid) return r;
@@ -308,75 +337,70 @@ namespace Cryville.Crtr.Event {
 				return GetRawValue<Vec1>(n_track).Value;
 			}
 		}
+		#endregion
 
+		#region Update
 		bool breakflag = false;
 
 		public void Break() {
-			Handler.EndUpdate(this);
+			// Handler.EndLogicalUpdate(this);
 			breakflag = true;
-			Working = false;
+			// LogicalActive = false;
 		}
 
-		public void Handle(StampedEvent ev, Action<StampedEvent> callback = null) {
+		public void Discard(StampedEvent ev) {
+			Handler.Discard(this, ev);
+		}
+
+		public void Handle(StampedEvent ev) {
 			if (breakflag) return;
 			if (ev != null) {
 				if (ev.Unstamped is Chart.Motion) {
 					var tev = (Chart.Motion)ev.Unstamped;
-					var mv = RMVPool.Rent(tev.Name);
+					var mv = _rmvpa.Rent(tev.Name);
 					mv.CloneTypeFlag = CloneType;
 					GetMotionValue(tev.Name).CopyTo(mv);
 					PlayingMotions.Add(ev, mv);
-					Callback(ev, callback);
+					Update(ev);
 					if (!ev.Unstamped.IsLong) {
 						PlayingMotions.Remove(ev);
-						RMVPool.Return(mv);
+						_rmvpa.Return(mv);
 					}
 				}
 				else if (ev.Unstamped is EventContainer) {
 					var cev = (EventContainer)ev.Unstamped;
 					var ccs = GetChild(cev);
-					ccs.Working = true;
-					ccs.StartUpdate();
+					ccs.LogicalActive = true;
 					UpdateMotions();
-					if (!ev.Unstamped.IsLong) {
-						ccs.Working = false;
-						ccs.BroadcastEndUpdate();
-						if (CloneType == 1) ccs.Dispose();
+					if (!cev.IsLong) {
+						ccs.LogicalActive = false;
 					}
 				}
-				else if (ev.Unstamped is InstantEvent) {
-					var tev = (InstantEvent)ev.Unstamped;
-					if (tev.IsRelease) {
-						var nev = tev.Original;
-						if (nev is Chart.Motion) {
-							Callback(ev, callback);
-							var mv = PlayingMotions[ev.Origin];
-							if (mv.CloneTypeFlag == CloneType) RMVPool.Return(mv);
-							PlayingMotions.Remove(ev.Origin);
-						}
-						else if (nev is EventContainer) {
-							var cev = (EventContainer)ev.Origin.Unstamped;
-							var ccs = GetChild(cev);
-							UpdateMotions();
-							ccs.Working = false;
-							ccs.BroadcastEndUpdate();
-							if (CloneType == 1) ccs.Dispose();
-						}
+				else if (ev.Unstamped is ReleaseEvent) {
+					var tev = (ReleaseEvent)ev.Unstamped;
+					var nev = tev.Original;
+					if (nev is Chart.Motion) {
+						Update(ev);
+						var mv = PlayingMotions[ev.Origin];
+						if (mv.CloneTypeFlag == CloneType) _rmvpa.Return(mv);
+						PlayingMotions.Remove(ev.Origin);
+					}
+					else if (nev is EventContainer) {
+						var cev = (EventContainer)ev.Origin.Unstamped;
+						var ccs = GetChild(cev);
+						UpdateMotions();
+						ccs.LogicalActive = false;
 					}
 				}
-				Callback(ev.Unstamped == null || ev.Unstamped.Priority >= 0 ? ev : null, callback);
+				Update(ev.Unstamped == null || ev.Unstamped.Priority >= 0 ? ev : null);
 			}
-			else Callback(null, callback);
+			else Update(null);
 		}
 
-		void Callback(StampedEvent ev, Action<StampedEvent> callback) {
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		void Update(StampedEvent ev) {
 			UpdateMotions();
-			if (callback != null)
-				callback(ev);
-			if (ev == null || ev.Unstamped != null) Handler.Update(this, ev);
-			else Handler.ExUpdate(this, ev);
-			foreach (var m in PlayingMotions)
-				Handler.MotionUpdate(CloneType, (Chart.Motion)m.Key.Unstamped);
+			Handler.Update(this, ev);
 		}
 
 		private void UpdateMotions() {
@@ -421,14 +445,17 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 
-		public void StartUpdate() {
-			Handler.StartUpdate(this);
+		public void EndPreGraphicalUpdate() {
+			Handler.SetPreGraphicalActive(false, this);
+			foreach (var ls in ActiveChildren) {
+				Children[ls].EndPreGraphicalUpdate();
+			}
 		}
 
-		public void BroadcastEndUpdate() {
-			Handler.EndUpdate(this);
-			foreach (var ls in Children.Values) {
-				if (ls.Working) ls.BroadcastEndUpdate();
+		public void EndGraphicalUpdate() {
+			Handler.SetGraphicalActive(false, this);
+			foreach (var ls in ActiveChildren) {
+				Children[ls].EndGraphicalUpdate();
 			}
 		}
 
@@ -438,5 +465,6 @@ namespace Cryville.Crtr.Event {
 				if (ls.Handler.Alive) ls.Anchor();
 			}
 		}
+		#endregion
 	}
 }

Assets/Cryville/Crtr/Event/EventBatcher.cs

@@ -9,124 +9,148 @@ namespace Cryville.Crtr.Event {
 			get;
 			private set;
 		}
-		ContainerState RootState;
-		/// <summary>
-		/// event => the container state that handles the event
-		/// </summary>
-		readonly Dictionary<ChartEvent, ContainerState> table
+		readonly Chart chart;
+		ContainerState rootState;
+		readonly Dictionary<ChartEvent, ContainerState> containerMap
 			= new Dictionary<ChartEvent, ContainerState>();
-		public List<StampedEvent> stampedEvents = new List<StampedEvent>();
+		readonly Dictionary<EventContainer, ContainerState> stateMap
+			= new Dictionary<EventContainer, ContainerState>();
+		readonly Dictionary<ChartEvent, StampedEvent> map
+			= new Dictionary<ChartEvent, StampedEvent>();
+		readonly Dictionary<EventContainer, List<StampedEvent>> coeventMap
+			= new Dictionary<EventContainer, List<StampedEvent>>();
+		readonly HashSet<ChartEvent> coevents = new HashSet<ChartEvent>();
+		readonly List<StampedEvent> stampedEvents = new List<StampedEvent>();
 		readonly List<EventBatch> batches = new List<EventBatch>();
 
 		double beat;
 		float tempo;
 		
-		public EventBatcher(Chart c) : base(c, new List<ChartEvent>()) {
+		public EventBatcher(Chart c) : base(new List<ChartEvent>()) {
+			chart = c;
 			beat = chart.BeatPosition;
 			tempo = (float)c.sigs[0].tempo;
-			events.Add(c);
-			events.Add(c.ReleaseEvent);
+			Events.Add(c);
+			Events.Add(c.ReleaseEvent);
 			AddEventContainer(c);
-			events.Sort((a, b) => a.BeatPosition.CompareTo(b.BeatPosition));
+			Events.Sort((a, b) => a.BeatPosition.CompareTo(b.BeatPosition));
 		}
 
 		void AddEventContainer(EventContainer c, ContainerState parent = null) {
-			var cs = new ContainerState(chart, c, parent);
+			var cs = new ContainerState(c, parent);
+			stateMap.Add(c, cs);
 			if (parent == null) {
 				cs.Depth = 0;
-				RootState = cs;
+				rootState = cs;
 			}
 			else {
 				cs.Depth = (ushort)(parent.Depth + 1);
 			}
 			foreach (var ev in c.Events) {
 				if (ev.time == null) {
+					if (!ev.Standalone) coevents.Add(ev);
 					ev.time = c.time;
 					if (ev is EventContainer)
 						ev.endtime = c.endtime;
 				}
 				if (ev.IsLong) {
-					events.Add(ev.ReleaseEvent);
-					table.Add(ev.ReleaseEvent, cs);
+					Events.Add(ev.ReleaseEvent);
+					containerMap.Add(ev.ReleaseEvent, cs);
 				}
-				events.Add(ev);
-				table.Add(ev, cs);
+				Events.Add(ev);
+				containerMap.Add(ev, cs);
 				if (ev is EventContainer)
 					AddEventContainer((EventContainer)ev, cs);
 			}
 		}
 		
-		public override void ForwardOnceToTime(double toTime, Action<ChartEvent> callback) {
+		public override void ForwardOnceToTime(double toTime) {
 			double toBeat = Math.Round(beat + (toTime - Time) * tempo / 60f, 6);
-			if (EventId >= events.Count)
+			if (EventId >= Events.Count)
 				goto return_ahead;
-			double ebeat = events[EventId].BeatPosition;
+			double ebeat = Events[EventId].BeatPosition;
 			double etime = Math.Round((ebeat - beat) / tempo * 60f + Time, 6);
 			if (etime > toTime)
 				goto return_ahead;
 			var batch = GetEventBatch();
 			Time = etime;
 			beat = ebeat;
-			bool flag = false;
 			foreach (var ev in batch) {
 				EventContainer con = null;
-				if (table.ContainsKey(ev)) con = table[ev].Container;
+				if (containerMap.ContainsKey(ev)) con = containerMap[ev].Container;
 				var sev = new StampedEvent() {
 					Time = etime,
 					Unstamped = ev,
 					Container = con
 				};
-				if (ev is InstantEvent) {
-					var tev = (InstantEvent)ev;
-					var pev = stampedEvents.First(tpev => tpev.Unstamped == tev.Original);
-					pev.Subevents.Add(sev);
+				if (ev is EventContainer) {
+					var tev = (EventContainer)ev;
+					stateMap[tev].StampedContainer = sev;
+					stampedEvents.Add(new StampedEvent.ClipBehind {
+						Container = con,
+						Origin = sev,
+						Time = etime + tev.Clip.Behind,
+					});
+					if (!ev.IsLong) {
+						stampedEvents.Add(new StampedEvent.ClipAhead {
+							Container = con,
+							Origin = sev,
+							Time = etime + tev.Clip.Ahead,
+						});
+					}
+				}
+				if (ev is ReleaseEvent) {
+					var tev = (ReleaseEvent)ev;
+					var oev = tev.Original;
+					var pev = map[oev];
+					pev.ReleaseEvent = sev;
 					sev.Origin = pev;
+					if (oev is EventContainer) {
+						stampedEvents.Add(new StampedEvent.ClipAhead {
+							Container = con,
+							Origin = pev,
+							Time = etime + ((EventContainer)oev).Clip.Ahead,
+						});
+					}
 				}
-				stampedEvents.Add(sev);
-				if (ev.Priority >= 0) {
-					if (callback != null) callback(ev);
-					flag = true;
+				if (con != null && coevents.Contains(ev)) {
+					List<StampedEvent> cevs;
+					if (!coeventMap.TryGetValue(con, out cevs)) {
+						coeventMap.Add(con, cevs = new List<StampedEvent>());
+					}
+					cevs.Add(sev);
 				}
+				else stampedEvents.Add(sev);
+				map.Add(ev, sev);
 				if (ev is Chart.Signature) {
 					var tev = (Chart.Signature)ev;
 					if (tev.tempo != null) tempo = (float)tev.tempo;
 				}
 				EventId++;
 			}
-			if (callback != null && !flag) callback(batch.First());
 			return;
 		return_ahead:
 			Time = toTime;
 			beat = toBeat;
-			if (callback != null) callback(null);
 		}
 		
 		IOrderedEnumerable<ChartEvent> GetEventBatch() {
-			float cbeat = events[EventId].BeatPosition;
+			float cbeat = Events[EventId].BeatPosition;
 			int b = EventId;
-			while (Mathf.Approximately(events[b].BeatPosition, cbeat)) {
+			while (Mathf.Approximately(Events[b].BeatPosition, cbeat)) {
 				b--;
 				if (b == -1) break;
 			}
 			int a = EventId;
-			while (Mathf.Approximately(events[a].BeatPosition, cbeat)) {
+			while (Mathf.Approximately(Events[a].BeatPosition, cbeat)) {
 				a++;
-				if (a == events.Count) break;
+				if (a == Events.Count) break;
 			}
-			return from ev in events.GetRange(b + 1, a - b - 1) orderby ev.Priority select ev;
+			return from ev in Events.GetRange(b + 1, a - b - 1) orderby ev.Priority select ev;
 		}
 		
 		public EventBus Batch() {
-			stampedEvents.Sort((a, b) => {
-				int u = a.CompareTo(b);
-				if (u != 0) return u;
-				if (a.Unstamped != null && b.Unstamped != null)
-					if (table.ContainsKey(a.Unstamped) && table.ContainsKey(b.Unstamped)) {
-						u = table[a.Unstamped].Depth.CompareTo(table[b.Unstamped].Depth);
-						if (u != 0) return u;
-					}
-				return a.GetHashCode().CompareTo(b.GetHashCode());
-			});
+			stampedEvents.Sort(CompareStampedEvents);
 			var cb = new EventBatch(stampedEvents[0].Time);
 			foreach (var ev in stampedEvents) {
 				if (ev.Time != cb.Time) {
@@ -134,10 +158,36 @@ namespace Cryville.Crtr.Event {
 					cb = new EventBatch(ev.Time);
 				}
 				cb.Enqueue(ev);
+				BatchCoevents(ev);
 			}
 			batches.Add(cb);
-			Bus = new EventBus(chart, RootState, batches);
+			Bus = new EventBus(rootState, batches);
 			return Bus;
 		}
+
+		void BatchCoevents(StampedEvent ev, List<StampedEvent> ocevs = null) {
+			if (!(ev.Unstamped is EventContainer)) return;
+			List<StampedEvent> cevs;
+			if (coeventMap.TryGetValue((EventContainer)ev.Unstamped, out cevs)) {
+				var rootFlag = ocevs == null;
+				if (rootFlag) ev.Coevents = ocevs = new List<StampedEvent>();
+				foreach (var cev in cevs) {
+					ocevs.Add(cev);
+					BatchCoevents(cev, ocevs);
+				}
+				if (rootFlag) ocevs.Sort(CompareStampedEvents);
+				else ocevs.Add(ev);
+			}
+		}
+
+		int CompareStampedEvents(StampedEvent a, StampedEvent b) {
+			int u = a.CompareTo(b);
+			if (u != 0) return u;
+			if (a.Unstamped != null && b.Unstamped != null && containerMap.ContainsKey(a.Unstamped) && containerMap.ContainsKey(b.Unstamped)) {
+				u = containerMap[a.Unstamped].Depth.CompareTo(containerMap[b.Unstamped].Depth);
+				if (u != 0) return u;
+			}
+			return 0;
+		}
 	}
 }

Assets/Cryville/Crtr/Event/EventBus.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 
 namespace Cryville.Crtr.Event {
 	public class EventBus : StateBase<EventBatch>, IDisposable {
-		EventBus prototype = null;
 		public ContainerState RootState {
 			get;
 			private set;
@@ -11,32 +11,26 @@ namespace Cryville.Crtr.Event {
 
 		Dictionary<EventContainer, ContainerState> states
 			= new Dictionary<EventContainer, ContainerState>();
-		List<EventContainer> activeContainers
-			= new List<EventContainer>();
-		HashSet<ContainerState> workingStates
+		HashSet<ContainerState> activeStates
 			= new HashSet<ContainerState>();
 		HashSet<ContainerState> invalidatedStates
 			= new HashSet<ContainerState>();
+		public int ActiveStateCount { get { return activeStates.Count; } }
 
-		public EventBus(Chart c, ContainerState root, List<EventBatch> b)
-			: base(c, b) {
+		public EventBus(ContainerState root, List<EventBatch> b) : base(b) {
 			RootState = root;
 			Expand();
 			AttachBus();
-			RootState.Working = true;
 		}
 
 		public EventBus Clone(byte ct, float offsetTime = 0) {
 			var r = (EventBus)MemberwiseClone();
-			r.prototype = this;
 			r.states = new Dictionary<EventContainer, ContainerState>();
-			r.activeContainers = new List<EventContainer>();
-			r.workingStates = new HashSet<ContainerState>();
+			r.activeStates = new HashSet<ContainerState>();
 			r.invalidatedStates = new HashSet<ContainerState>();
-			r.tempEvents = new List<StampedEvent>();
+			r.tempEvents = new List<StampedEvent.Temporary>();
 			r.Time += offsetTime;
 			r.RootState = RootState.Clone(ct);
-			r.RootState.StartUpdate();
 			r.Expand();
 			r.AttachBus();
 			foreach (var s in r.states) r.invalidatedStates.Add(s.Value);
@@ -46,26 +40,20 @@ namespace Cryville.Crtr.Event {
 
 		public void CopyTo(byte ct, EventBus dest) {
 			base.CopyTo(dest);
-			dest.workingStates.Clear();
+			dest.activeStates.Clear();
 			dest.invalidatedStates.Clear();
 			RootState.CopyTo(ct, dest.RootState);
-			if (ct >= 2) {
-				dest.activeContainers.Clear();
-				foreach (var c in activeContainers) {
-					if (states[c].Working) {
-						states[c].CopyTo(ct, dest.states[c]);
-						dest.activeContainers.Add(c);
-					}
-				}
-			}
 			dest.ValidateStates();
 		}
 
 		public void Dispose() {
 			RootState.Dispose();
 		}
+		public void DisposeAll() {
+			RootState.DisposeAll();
+		}
 
-		public void NotifyWorkingChanged(ContainerState state) {
+		public void NotifyActiveChanged(ContainerState state) {
 			if (!invalidatedStates.Contains(state)) invalidatedStates.Add(state);
 		}
 
@@ -84,12 +72,6 @@ namespace Cryville.Crtr.Event {
 			s.Bus = this;
 		}
 
-		void EnsureActivity(EventContainer c) {
-			if (activeContainers.Contains(c)) return;
-			if (RootState.CloneType >= 2) prototype.states[c].CopyTo(RootState.CloneType, states[c]);
-			activeContainers.Add(c);
-		}
-
 		void AttachBus() {
 			foreach (var s in states.Values)
 				s.Bus = this;
@@ -100,58 +82,87 @@ namespace Cryville.Crtr.Event {
 				s.AttachSystems(skin, judge);
 		}
 
-		List<StampedEvent> tempEvents = new List<StampedEvent>();
-		public void PushTempEvent(StampedEvent ev) {
+		List<StampedEvent.Temporary> tempEvents = new List<StampedEvent.Temporary>();
+		public void PushTempEvent(StampedEvent.Temporary ev) {
 			var index = tempEvents.BinarySearch(ev);
 			if (index < 0) index = ~index;
 			tempEvents.Insert(index, ev);
 		}
 
-		public override void ForwardOnceToTime(double toTime, Action<EventBatch> callback = null) {
-			double time1 = EventId < events.Count ? events[EventId].Time : double.PositiveInfinity;
+		readonly StampedEvent.Temporary _dummyEvent = new StampedEvent.Temporary();
+		public void StripTempEvents() {
+			_dummyEvent.Time = Time;
+			var index = tempEvents.BinarySearch(_dummyEvent);
+			if (index < 0) index = ~index;
+			for (var i = index - 1; i >= 0; i--) {
+				var ev = tempEvents[i];
+				tempEvents.RemoveAt(i);
+				if (ev.CanDiscard) {
+					if (ev.Container != null) {
+						states[ev.Container].Discard(ev);
+					}
+				}
+				else {
+					ev.Time = Time;
+					PushTempEvent(ev);
+				}
+			}
+		}
+
+		public override void ForwardOnceToTime(double toTime) {
+			double time1 = EventId < Events.Count ? Events[EventId].Time : double.PositiveInfinity;
 			double time2 = tempEvents.Count > 0 ? tempEvents[0].Time : double.PositiveInfinity;
 			double time0 = Math.Min(time1, time2);
 			if (time0 <= toTime && time0 != double.PositiveInfinity) {
 				Time = time0;
-				foreach (var s in workingStates) s.Handle(null);
+				foreach (var s in activeStates) s.Handle(null);
 				ValidateStates();
 				if (time1 == time0) {
-					var batch = events[EventId];
+					var batch = Events[EventId];
 					for (var i = 0; i < batch.Count; i++) {
 						var ev = batch[i];
-						if (ev.Container != null) {
-							EnsureActivity(ev.Container);
-							states[ev.Container].Handle(ev);
+						HandleTempEvents(time0, ev.Priority);
+						if (ev is StampedEvent.ClipBehind) {
+							var cevs = ev.Origin.Coevents;
+							if (cevs != null) foreach (var cev in cevs) {
+								if (cev.Container == null) continue;
+								states[cev.Container].Handle(cev);
+							}
+							states[(EventContainer)ev.Origin.Unstamped].PhysicalActive = true;
 						}
-						if (ev.Unstamped is EventContainer) {
-							if (ev.Container != null) EnsureActivity((EventContainer)ev.Unstamped);
+						else if (ev is StampedEvent.ClipAhead) {
+							states[(EventContainer)ev.Origin.Unstamped].PhysicalActive = false;
+						}
+						else if (ev.Container != null) {
+							states[ev.Container].Handle(ev);
 						}
 					}
 					EventId++;
 				}
-				if (time2 == time0) {
-					while (tempEvents.Count > 0) {
-						var ev = tempEvents[0];
-						if (ev.Container != null) {
-							EnsureActivity(ev.Container);
-							states[ev.Container].Handle(ev);
-						}
-						tempEvents.RemoveAt(0);
-					}
-				}
-				ValidateStates();
+				HandleTempEvents(time0);
 			}
 			else {
 				Time = toTime;
-				foreach (var s in workingStates) s.Handle(null);
-				ValidateStates();
+				foreach (var s in activeStates) s.Handle(null);
+			}
+			ValidateStates();
+		}
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		void HandleTempEvents(double time, int maxPriority = int.MaxValue) {
+			while (tempEvents.Count > 0) {
+				var ev2 = tempEvents[0];
+				if (ev2.Time != time || ev2.Priority >= maxPriority) break;
+				if (ev2.Container != null) {
+					states[ev2.Container].Handle(ev2);
+				}
+				tempEvents.RemoveAt(0);
 			}
 		}
 
 		private void ValidateStates() {
 			foreach (var s in invalidatedStates)
-				if (s.Working && !workingStates.Contains(s)) workingStates.Add(s);
-				else if (!s.Working && workingStates.Contains(s)) workingStates.Remove(s);
+				if (s.Active && !activeStates.Contains(s)) activeStates.Add(s);
+				else if (!s.Active && activeStates.Contains(s)) activeStates.Remove(s);
 			invalidatedStates.Clear();
 		}
 		
@@ -162,13 +173,21 @@ namespace Cryville.Crtr.Event {
 			RootState.BroadcastPostInit();
 		}
 
-		public void BroadcastEndUpdate() {
-			RootState.BroadcastEndUpdate();
+		public void EndPreGraphicalUpdate() {
+			RootState.EndPreGraphicalUpdate();
+		}
+		public void EndGraphicalUpdate() {
+			RootState.EndGraphicalUpdate();
+			foreach (var ev in tempEvents) {
+				if (ev.Container != null) {
+					states[ev.Container].Discard(ev);
+				}
+			}
 			tempEvents.Clear();
 		}
 
 		public void Anchor() {
-			RootState.Anchor();
+			if (RootState.Handler.Alive) RootState.Anchor();
 		}
 	}
 }

Assets/Cryville/Crtr/Event/MotionCache.cs

@@ -0,0 +1,37 @@
+using Cryville.Common;
+using Cryville.Common.Buffers;
+using System.Collections.Generic;
+
+namespace Cryville.Crtr.Event {
+	internal class MotionCache {
+		public bool Valid { get; set; }
+		public Vector Value { get; set; }
+		public void CopyTo(MotionCache dest) {
+			dest.Valid = Valid;
+			Value.CopyTo(dest.Value);
+		}
+	}
+	internal class MotionCachePool : CategorizedPool<Identifier, MotionCache> {
+		private class Bucket : ObjectPool<MotionCache> {
+			readonly MotionRegistry _reg;
+			public Bucket(string name, int capacity) : base(capacity) {
+				_reg = ChartPlayer.motionRegistry[name];
+			}
+			protected override MotionCache Construct() {
+				var result = new MotionCache();
+				result.Value = (Vector)ReflectionHelper.InvokeEmptyConstructor(_reg.Type);
+				return result;
+			}
+			protected override void Reset(MotionCache obj) {
+				obj.Valid = false;
+			}
+		}
+		readonly Dictionary<Identifier, ObjectPool<MotionCache>> m_buckets;
+		protected override IReadOnlyDictionary<Identifier, ObjectPool<MotionCache>> Buckets { get { return m_buckets; } }
+		public MotionCachePool() {
+			m_buckets = new Dictionary<Identifier, ObjectPool<MotionCache>>(ChartPlayer.motionRegistry.Count);
+			foreach (var reg in ChartPlayer.motionRegistry)
+				m_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
+		}
+	}
+}

Assets/Cryville/Crtr/Event/MotionCache.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5d11b50a98974254f87273c94ed20de7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Event/RMVPool.cs

@@ -3,7 +3,7 @@ using Cryville.Common.Buffers;
 using System.Collections.Generic;
 
 namespace Cryville.Crtr.Event {
-	internal class RMVPool {
+	internal class RMVPool : CategorizedPool<Identifier, RealtimeMotionValue> {
 		private class Bucket : ObjectPool<RealtimeMotionValue> {
 			readonly MotionRegistry _reg;
 			public Bucket(string name, int capacity) : base(capacity) {
@@ -13,32 +13,12 @@ namespace Cryville.Crtr.Event {
 				return new RealtimeMotionValue().Init(_reg.InitValue);
 			}
 		}
-		static Dictionary<Identifier, Bucket> _buckets;
-		public static void Prepare() {
-			_buckets = new Dictionary<Identifier, Bucket>(ChartPlayer.motionRegistry.Count);
+		readonly Dictionary<Identifier, ObjectPool<RealtimeMotionValue>> m_buckets;
+		protected override IReadOnlyDictionary<Identifier, ObjectPool<RealtimeMotionValue>> Buckets { get { return m_buckets; } }
+		public RMVPool() {
+			m_buckets = new Dictionary<Identifier, ObjectPool<RealtimeMotionValue>>(ChartPlayer.motionRegistry.Count);
 			foreach (var reg in ChartPlayer.motionRegistry)
-				_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
-		}
-
-		static readonly SimpleObjectPool<Dictionary<RealtimeMotionValue, Identifier>> _dictPool
-			= new SimpleObjectPool<Dictionary<RealtimeMotionValue, Identifier>>(1024);
-		Dictionary<RealtimeMotionValue, Identifier> _rented;
-		public RealtimeMotionValue Rent(Identifier name) {
-			var n = name;
-			var obj = _buckets[n].Rent();
-			if (_rented == null) _rented = _dictPool.Rent();
-			_rented.Add(obj, n);
-			return obj;
-		}
-		public void Return(RealtimeMotionValue obj) {
-			_buckets[_rented[obj]].Return(obj);
-			_rented.Remove(obj);
-		}
-		public void ReturnAll() {
-			foreach (var obj in _rented)
-				_buckets[obj.Value].Return(obj.Key);
-			_rented.Clear();
-			_dictPool.Return(_rented);
+				m_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
 		}
 	}
 }

Assets/Cryville/Crtr/Extensions/Bestdori/BestdoriChartConverter.cs

@@ -73,16 +73,19 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 					};
 					for (int i = 0; i < tev.connections.Count; i++) {
 						BestdoriChartEvent.Connection c = tev.connections[i];
+						var motion = new Chart.Motion { motion = "track:" + c.lane.ToString(CultureInfo.InvariantCulture) };
 						if (i == 0) {
 							note.judges.Add(new Chart.Judge { name = "single" });
-							note.motions.Add(new Chart.Motion { motion = "track:" + c.lane.ToString(CultureInfo.InvariantCulture) });
+							note.motions.Add(motion);
 						}
 						else {
-							note.motions.Add(new Chart.Motion { time = ToBeatTime(tev.connections[i - 1].beat), endtime = ToBeatTime(c.beat), motion = "track:" + c.lane.ToString(CultureInfo.InvariantCulture) });
+							var cbeat = motion.endtime = ToBeatTime(c.beat);
+							if (i > 1) motion.time = ToBeatTime(tev.connections[i - 1].beat);
+							note.motions.Add(motion);
 							if (i == tev.connections.Count - 1)
-								note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = c.flick ? "longend_flick" : "longend" });
+								note.judges.Add(new Chart.Judge { time = cbeat, name = c.flick ? "longend_flick" : "longend" });
 							else if (!c.hidden)
-								note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = "longnode" });
+								note.judges.Add(new Chart.Judge { time = cbeat, name = "longnode" });
 						}
 					}
 					if (c1.beat > endbeat) endbeat = c1.beat;

Assets/Cryville/Crtr/Extensions/osu/osuChartConverter.cs

@@ -10,7 +10,7 @@ namespace Cryville.Crtr.Extensions.osu {
 	public class osuChartConverter : ResourceConverter {
 #pragma warning restore IDE1006
 		static readonly string[] SUPPORTED_FORMATS = { ".osu" };
-		const double OFFSET = 0.07;
+		const double OFFSET = 0.05;
 
 		public override string[] GetSupportedFormats() {
 			return SUPPORTED_FORMATS;

Assets/Cryville/Crtr/Game.cs

@@ -1,8 +1,10 @@
 using Cryville.Audio;
 using Cryville.Audio.Source;
 using Cryville.Common;
+using Cryville.Common.Font;
 using Cryville.Common.Unity;
 using Cryville.Common.Unity.Input;
+using Cryville.Common.Unity.UI;
 using FFmpeg.AutoGen;
 using Ionic.Zip;
 using Newtonsoft.Json;
@@ -127,6 +129,21 @@ namespace Cryville.Crtr {
 			Settings.Default.LastRunVersion = Application.version;
 			Settings.Default.Save();
 
+			Logger.Log("main", 1, "UI", "Initializing font manager");
+#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
+			var fontMatcher = new FallbackListFontMatcher(new FontManagerWindows());
+			fontMatcher.LoadDefaultWindowsFallbackList();
+			TMPAutoFont.FontMatcher = fontMatcher;
+			TMPAutoFont.DefaultShader = Resources.Load<Shader>("TextMesh Pro/Shaders/TMP_SDF SSD");
+#elif UNITY_ANDROID
+			var fontMatcher = new FallbackListFontMatcher(new FontManagerAndroid());
+			fontMatcher.LoadDefaultAndroidFallbackList();
+			TMPAutoFont.FontMatcher = fontMatcher;
+			TMPAutoFont.DefaultShader = Resources.Load<Shader>("TextMesh Pro/Shaders/TMP_SDF-Mobile SSD");
+#else
+#error No font manager initialization logic.
+#endif
+
 			Logger.Log("main", 1, "Game", "Initialized");
 		}
 

Assets/Cryville/Crtr/GenericResources.cs

@@ -26,11 +26,10 @@ namespace Cryville.Crtr {
 			Components.Add("sprite", typeof(SpriteBase));
 			Components.Add("text", typeof(SpriteText));
 
-			Meshes.Add("quad", Resources.Load<Mesh>("quad"));
-			Meshes.Add("quad_scale3h", Resources.Load<Mesh>("quad_scale3h"));
-			Meshes.Add("quad_scale9", Resources.Load<Mesh>("quad_scale9"));
+			Meshes.Add("quad", Resources.Load<Mesh>("Meshes/quad"));
+			Meshes.Add("quad_scale3h", Resources.Load<Mesh>("Meshes/quad_scale3h"));
 
-			Materials.Add("-SpriteMat", Resources.Load<Material>("SpriteMat"));
+			Materials.Add("-SpriteMat", Resources.Load<Material>("Materials/SpriteMat"));
 
 			loaded = true;
 		}

Assets/Cryville/Crtr/GroupHandler.cs

@@ -1,7 +1,6 @@
 using Cryville.Common.Math;
 using Cryville.Crtr.Event;
 using System;
-using System.Linq;
 using UnityEngine;
 
 namespace Cryville.Crtr {
@@ -10,33 +9,29 @@ namespace Cryville.Crtr {
 
 		SquareMatrix matFrame;
 		ContainerState[] tracks;
+		public int TrackCount { get { return tracks.Length; } }
 
 		public GroupHandler(Chart.Group tg, ChartHandler ch) : base() {
 			this.ch = ch;
 		}
 		
-		public override string TypeName {
-			get {
-				return "group";
-			}
-		}
+		public override string TypeName { get { return "group"; } }
 
 		public override void PreInit() {
 			base.PreInit();
-			tracks = (
-				from c in cs.Children
-				where c.Value.Container is Chart.Track
-				select c.Value
-			).ToArray();
+			tracks = cs.TypedChildren[typeof(Chart.Track)].ToArray();
 			matFrame = SquareMatrix.WithPolynomialCoefficients(tracks.Length);
-			frame = new ColumnVector<Vector3>(tracks.Length);
+			frame1 = new ColumnVector<Vector3>(tracks.Length);
+			frame2 = new ColumnVector<Vector3>(tracks.Length);
 		}
 
-		ColumnVector<Vector3> frame;
+		ColumnVector<Vector3> frame1;
+		ColumnVector<Vector3> frame2;
 		public ColumnVector<Vector3> GetCurrentFrame(Func<ContainerState, Vector3> func) {
 			for (int i = 0; i < tracks.Length; i++)
-				frame[i] = func(tracks[i]);
-			return matFrame.Eliminate(frame, Vector3Operator.Instance);
+				frame1[i] = func(tracks[i]);
+			matFrame.Eliminate(frame1, frame2, Vector3Operator.Instance);
+			return frame2;
 		}
 	}
 

Assets/Cryville/Crtr/InputProxy.cs

@@ -65,10 +65,6 @@ namespace Cryville.Crtr {
 			if (_use[target] > 0)
 				throw new InvalidOperationException("Input already assigned");
 			if (proxy.Source != null) {
-				if (_judge != null) {
-					proxy.Source.Value.Handler.OnInput -= OnInput; // Prevent duplicated hooks, no exception will be thrown
-					proxy.Source.Value.Handler.OnInput += OnInput;
-				}
 				_tproxies.Add(target, proxy);
 				_sproxies.Add(proxy.Source.Value, proxy);
 				IncrementUseRecursive(target);
@@ -77,7 +73,6 @@ namespace Cryville.Crtr {
 		}
 		void Remove(InputProxyEntry proxy) {
 			var target = proxy.Target;
-			if (_judge != null) _tproxies[target].Source.Value.Handler.OnInput -= OnInput;
 			_sproxies.Remove(_tproxies[target].Source.Value);
 			_tproxies.Remove(target);
 			DecrementUseRecursive(target);
@@ -142,12 +137,22 @@ namespace Cryville.Crtr {
 		public void Activate() {
 			_activeCounts.Clear();
 			_vect.Clear(); _vecs.Clear();
-			foreach (var src in _sproxies.Keys) {
-				_activeCounts.Add(src, 0);
-				src.Handler.Activate();
+			foreach (var src in _sproxies) {
+				_activeCounts.Add(src.Key, 0);
+				var isrc = src.Value.Source;
+				if (isrc != null) {
+					isrc.Value.Handler.OnInput += OnInput;
+				}
+			}
+		}
+		public void Deactivate() {
+			foreach (var src in _sproxies) {
+				var isrc = src.Value.Source;
+				if (isrc != null) {
+					isrc.Value.Handler.OnInput -= OnInput;
+				}
 			}
 		}
-		public void Deactivate() { foreach (var src in _sproxies.Keys) src.Handler.Deactivate(); }
 
 		~InputProxy() {
 			Dispose(false);
@@ -173,14 +178,15 @@ namespace Cryville.Crtr {
 		readonly Dictionary<InputHandler, double> _timeOrigins = new Dictionary<InputHandler, double>();
 		readonly Dictionary<InputSource, int> _activeCounts = new Dictionary<InputSource, int>();
 		readonly Dictionary<InputIdentifier, float> _vect = new Dictionary<InputIdentifier, float>();
-		readonly Dictionary<ProxiedInputIdentifier, PropSrc.Arbitrary> _vecs = new Dictionary<ProxiedInputIdentifier, PropSrc.Arbitrary>();
+		readonly Dictionary<ProxiedInputIdentifier, PropSrc> _vecs = new Dictionary<ProxiedInputIdentifier, PropSrc>();
 		static readonly PropSrc.Arbitrary _nullsrc = new PropSrc.Arbitrary(PdtInternalType.Null, new byte[0]);
+		double? _lockTime = null;
 		unsafe void OnInput(InputIdentifier id, InputVector vec) {
 			lock (_lock) {
 				InputProxyEntry proxy;
 				if (_sproxies.TryGetValue(id.Source, out proxy)) {
 					_etor.ContextCascadeInsert();
-					float ft, tt = (float)(vec.Time - _timeOrigins[id.Source.Handler]);
+					float ft, tt = (float)(_lockTime != null ? _lockTime.Value : (vec.Time - _timeOrigins[id.Source.Handler]));
 					if (!_vect.TryGetValue(id, out ft)) ft = tt;
 					if (vec.IsNull) {
 						_etor.ContextCascadeUpdate(_var_value, _nullsrc);
@@ -214,7 +220,7 @@ namespace Cryville.Crtr {
 			}
 			else {
 				var pid = new ProxiedInputIdentifier { Source = id, Target = target };
-				PropSrc.Arbitrary fv, tv = _etor.ContextCascadeLookup(_var_value);
+				PropSrc fv, tv = _etor.ContextCascadeLookup(_var_value);
 				if (!_vecs.TryGetValue(pid, out fv)) fv = _nullsrc;
 				if (fv.Type != PdtInternalType.Null || tv.Type != PdtInternalType.Null) {
 					if (fv.Type == PdtInternalType.Null) _activeCounts[id.Source]++;
@@ -238,7 +244,7 @@ namespace Cryville.Crtr {
 		public void ForceTick() {
 			foreach (var src in _sproxies.Keys) {
 				if (_activeCounts[src] == 0) {
-					OnInput(new InputIdentifier { Source = src, Id = 0 }, new InputVector(src.Handler.GetCurrentTimestamp()));
+					OnInput(new InputIdentifier { Source = src, Id = 0 }, new InputVector(_lockTime != null ? _lockTime.Value : src.Handler.GetCurrentTimestamp()));
 				}
 			}
 		}
@@ -249,6 +255,8 @@ namespace Cryville.Crtr {
 			}
 			return result / _sproxies.Count;
 		}
+		public void LockTime() { _lockTime = GetTimestampAverage(); }
+		public void UnlockTime() { _lockTime = null; }
 		#endregion
 	}
 

Assets/Cryville/Crtr/Judge.cs

@@ -4,24 +4,26 @@ using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Text.Formatting;
 
 namespace Cryville.Crtr {
 	public class Judge {
 		#region Data
+		readonly ChartPlayer _sys;
 		readonly PdtEvaluator _etor;
 		readonly PdtRuleset _rs;
-		readonly Dictionary<Identifier, float> ct
-			= new Dictionary<Identifier, float>();
 		readonly Dictionary<Identifier, List<JudgeEvent>> evs
 			= new Dictionary<Identifier, List<JudgeEvent>>();
 		readonly Dictionary<Identifier, List<JudgeEvent>> activeEvs
 			= new Dictionary<Identifier, List<JudgeEvent>>();
+		static readonly int _var_pause = IdentifierManager.SharedInstance.Request("pause");
+		readonly JudgeDefinition _judgePause;
 		public struct JudgeEvent {
 			public double StartTime { get; set; }
 			public double EndTime { get; set; }
 			public double StartClip { get; set; }
 			public double EndClip { get; set; }
-			public Identifier JudgeId { get; set; }
+			public Chart.Judge BaseEvent { get; set; }
 			public JudgeDefinition Definition { get; set; }
 			public NoteHandler Handler { get; set; }
 		}
@@ -31,26 +33,44 @@ namespace Cryville.Crtr {
 				return x.StartClip.CompareTo(y.StartClip);
 			}
 		}
-		public Judge(PdtRuleset rs) {
+		public Judge(ChartPlayer sys, PdtRuleset rs) {
+			_sys = sys;
 			_etor = ChartPlayer.etor;
 			_rs = rs;
+			_numsrc1 = new PropSrc.Float(() => _numbuf1);
+			_numsrc2 = new PropSrc.Float(() => _numbuf2);
+			_numsrc3 = new PropSrc.Float(() => _numbuf3);
+			_numsrc4 = new PropSrc.Float(() => _numbuf4);
+			_rs.judges.TryGetValue(new Identifier(_var_pause), out _judgePause);
+			foreach (var i in rs.inputs.Keys) {
+				var l = new List<JudgeEvent>();
+				evs.Add(i, l);
+				activeEvs.Add(i, new List<JudgeEvent>());
+				if (_judgePause != null && i.Key == _var_pause) {
+					l.Add(new JudgeEvent {
+						StartTime = double.NegativeInfinity, EndTime = double.PositiveInfinity,
+						StartClip = double.NegativeInfinity, EndClip = double.PositiveInfinity,
+						Definition = _judgePause,
+					});
+				}
+			}
 			InitJudges();
 			InitScores();
 		}
-		public void Prepare(double st, double et, Identifier input, Identifier judge, NoteHandler handler) {
-			List<JudgeEvent> list;
-			if (!evs.TryGetValue(input, out list)) {
-				ct.Add(input, 0);
-				evs.Add(input, list = new List<JudgeEvent>());
-				activeEvs.Add(input, new List<JudgeEvent>());
-			}
-			var def = _rs.judges[judge];
+		public void Prepare(StampedEvent sev, NoteHandler handler) {
+			var tev = (Chart.Judge)sev.Unstamped;
+			if (tev.Id.Key == _var_pause) throw new InvalidOperationException("Cannot assign the special judge \"pause\" to notes");
+			Identifier input = default(Identifier);
+			ChartPlayer.etor.Evaluate(new PropOp.Identifier(v => input = new Identifier(v)), _rs.judges[tev.Id].input);
+			double st = sev.Time, et = st + sev.Duration;
+			var list = evs[input];
+			var def = _rs.judges[tev.Id];
 			var ev = new JudgeEvent {
 				StartTime = st,
 				EndTime = et,
-				StartClip = st + def.clip[0],
-				EndClip = et + def.clip[1],
-				JudgeId = judge,
+				StartClip = st + def.clip.Behind,
+				EndClip = et + def.clip.Ahead,
+				BaseEvent = tev,
 				Definition = def,
 				Handler = handler,
 			};
@@ -60,12 +80,10 @@ namespace Cryville.Crtr {
 		}
 		#endregion
 		#region Judge
-		internal readonly Dictionary<int, int> jtabsMap = new Dictionary<int, int>();
-		internal readonly Dictionary<int, int> jtrelMap = new Dictionary<int, int>();
+		internal readonly Dictionary<int, int> judgeMap = new Dictionary<int, int>();
 		void InitJudges() {
 			foreach (var i in _rs.judges.Keys) {
-				jtabsMap.Add(i.Key, IdentifierManager.SharedInstance.Request("jtabs_" + i.Name));
-				jtrelMap.Add(i.Key, IdentifierManager.SharedInstance.Request("jtrel_" + i.Name));
+				judgeMap.Add(i.Key, IdentifierManager.SharedInstance.Request("judge_" + i.Name));
 			}
 		}
 		static bool _flag;
@@ -74,10 +92,8 @@ namespace Cryville.Crtr {
 		static readonly int _var_tn = IdentifierManager.SharedInstance.Request("tn");
 		static readonly int _var_ft = IdentifierManager.SharedInstance.Request("ft");
 		static readonly int _var_tt = IdentifierManager.SharedInstance.Request("tt");
-		readonly byte[] _numbuf1 = new byte[sizeof(float)];
-		readonly byte[] _numbuf2 = new byte[sizeof(float)];
-		readonly byte[] _numbuf3 = new byte[sizeof(float)];
-		readonly byte[] _numbuf4 = new byte[sizeof(float)];
+		float _numbuf1, _numbuf2, _numbuf3, _numbuf4;
+		readonly PropSrc _numsrc1, _numsrc2, _numsrc3, _numsrc4;
 		unsafe void LoadNum(byte[] buffer, float value) {
 			fixed (byte* ptr = buffer) *(float*)ptr = value;
 		}
@@ -114,20 +130,23 @@ namespace Cryville.Crtr {
 			Forward(target, tt);
 			var actlist = activeEvs[target];
 			if (actlist.Count > 0) {
-				LoadNum(_numbuf3, ft); _etor.ContextCascadeUpdate(_var_ft, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf3));
-				LoadNum(_numbuf4, tt); _etor.ContextCascadeUpdate(_var_tt, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf4));
+				_numbuf3 = ft; _numsrc3.Invalidate(); _etor.ContextCascadeUpdate(_var_ft, _numsrc3);
+				_numbuf4 = tt; _numsrc4.Invalidate(); _etor.ContextCascadeUpdate(_var_tt, _numsrc4);
 				var index = 0;
 				while (index >= 0 && index < actlist.Count) {
 					var ev = actlist[index];
-					LoadNum(_numbuf1, (float)ev.StartTime); _etor.ContextCascadeUpdate(_var_fn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf1));
-					LoadNum(_numbuf2, (float)ev.EndTime); _etor.ContextCascadeUpdate(_var_tn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf2));
+					_numbuf1 = (float)ev.StartTime; _numsrc1.Invalidate(); _etor.ContextCascadeUpdate(_var_fn, _numsrc1);
+					_numbuf2 = (float)ev.EndTime; _numsrc2.Invalidate(); _etor.ContextCascadeUpdate(_var_tn, _numsrc2);
 					var def = ev.Definition;
 					if (def.hit != null) _etor.Evaluate(_flagop, def.hit);
 					else _flag = true;
 					if (_flag) {
+						if (ev.Definition == _judgePause) _sys.TogglePause();
 						if (def.scores != null) UpdateScore(def.scores);
 						if (def.pass != null) Pass(ev, (ft + tt) / 2, def.pass);
-						actlist.RemoveAt(index);
+						if (def.persist != null) _etor.Evaluate(_flagop, def.persist);
+						else _flag = false;
+						if (!_flag) actlist.RemoveAt(index);
 						if (def.prop != 0 && actlist.Count > 0) {
 							index = BinarySearchFirst(actlist, (float)ev.StartClip, def.stack - def.prop);
 							if (index < 0) index = ~index;
@@ -198,8 +217,10 @@ namespace Cryville.Crtr {
 		readonly Dictionary<int, ScoreDefinition> scoreDefs = new Dictionary<int, ScoreDefinition>();
 		readonly Dictionary<int, float> scores = new Dictionary<int, float>();
 		readonly Dictionary<int, string> scoreStringCache = new Dictionary<int, string>();
-		readonly Dictionary<int, PropSrc> scoreStringSrcs = new Dictionary<int, PropSrc>();
 		readonly ArrayPool<byte> scoreStringPool = new ArrayPool<byte>();
+		readonly Dictionary<int, string> scoreFormatCache = new Dictionary<int, string>();
+		readonly TargetString scoreFullStr = new TargetString();
+		readonly StringBuffer scoreFullBuf = new StringBuffer();
 		void InitScores() {
 			foreach (var s in _rs.scores) {
 				var key = s.Key.Key;
@@ -211,63 +232,59 @@ namespace Cryville.Crtr {
 				scoreDefs.Add(key, s.Value);
 				scores.Add(key, s.Value.init);
 				scoreStringCache.Add(scoreStringKeys[key], null);
-				scoreStringSrcs.Add(scoreStringKeys[key], new ScoreStringSrc(scoreStringPool, () => GetScoreString(strkey)));
+				scoreSrcs.Add(scoreStringKeys[key], new ScoreStringSrc(scoreStringPool, () => scores[key], scoreDefs[key].format));
+				scoreFormatCache[key] = string.Format("{{0:{0}}}", s.Value.format);
 			}
 		}
 		void InvalidateScore(int key) {
 			scoreSrcs[key].Invalidate();
 			scoreStringCache[scoreStringKeys[key]] = null;
-			scoreStringSrcs[scoreStringKeys[key]].Invalidate();
-		}
-		string GetScoreString(int key) {
-			var result = scoreStringCache[key];
-			if (result == null) {
-				var rkey = scoreStringKeysRev[key];
-				return scoreStringCache[key] = scores[rkey].ToString(scoreDefs[rkey].format, CultureInfo.InvariantCulture);
-			}
-			else return result;
+			scoreSrcs[scoreStringKeys[key]].Invalidate();
 		}
 		public bool TryGetScoreSrc(int key, out PropSrc value) {
 			return scoreSrcs.TryGetValue(key, out value);
 		}
-		public bool TryGetScoreStringSrc(int key, out PropSrc value) {
-			return scoreStringSrcs.TryGetValue(key, out value);
-		}
-		public string GetFullFormattedScoreString() {
+		public TargetString GetFullFormattedScoreString() {
 			bool flag = false;
-			string result = "";
+			scoreFullBuf.Clear();
 			foreach (var s in scores.Keys) {
-				result += string.Format(flag ? "\n{0}: {1}" : "{0}: {1}", IdentifierManager.SharedInstance.Retrieve(s), GetScoreString(scoreStringKeys[s]));
+				scoreFullBuf.AppendFormat(flag ? "\n{0}: " : "{0}: ", (string)IdentifierManager.SharedInstance.Retrieve(s));
+				scoreFullBuf.AppendFormat(scoreFormatCache[s], scores[s]);
 				flag = true;
 			}
-			return result;
+			scoreFullStr.Length = scoreFullBuf.Count;
+			var arr = scoreFullStr.TrustedAsArray();
+			scoreFullBuf.CopyTo(0, arr, 0, scoreFullBuf.Count);
+			return scoreFullStr;
 		}
 		class ScoreStringSrc : PropSrc {
-			readonly Func<string> _cb;
+			readonly Func<float> _cb;
+			readonly string _format;
 			readonly ArrayPool<byte> _pool;
-			byte[] _buf;
-			public ScoreStringSrc(ArrayPool<byte> pool, Func<string> cb) {
+			readonly StringBuffer _buf = new StringBuffer() { Culture = CultureInfo.InvariantCulture };
+			public ScoreStringSrc(ArrayPool<byte> pool, Func<float> cb, string format)
+				: base(PdtInternalType.String) {
 				_pool = pool;
 				_cb = cb;
+				_format = string.Format("{{0:{0}}}", format);
 			}
 			public override void Invalidate() {
-				base.Invalidate();
-				if (_buf != null) {
-					_pool.Return(_buf);
-					_buf = null;
+				if (buf != null) {
+					_pool.Return(buf);
+					base.Invalidate();
 				}
 			}
-			protected override unsafe int InternalGet() {
+			protected override unsafe void InternalGet() {
 				var src = _cb();
-				int strlen = src.Length;
+				_buf.Clear();
+				_buf.AppendFormat(_format, src);
+				int strlen = _buf.Count;
 				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;
+					char* ptr = (char*)(_ptr + sizeof(int));
+					_buf.CopyTo(ptr, 0, strlen);
 				}
-				return PdtInternalType.String;
 			}
 		}
 		#endregion
@@ -279,9 +296,10 @@ namespace Cryville.Crtr {
 		public Dictionary<Identifier, PdtExpression> pass;
 	}
 	public class JudgeDefinition {
-		public float[] clip;
+		public Clip clip;
 		public PdtExpression input;
 		public PdtExpression hit;
+		public PdtExpression persist;
 		public Identifier[] pass;
 		public Identifier[] miss;
 		public Dictionary<ScoreOperation, PdtExpression> scores;

Assets/Cryville/Crtr/Master.cs

@@ -7,13 +7,8 @@ namespace Cryville.Crtr {
 		private GameObject m_menu;
 #pragma warning restore IDE0044
 
-		internal void ShowMenu() {
-			m_menu.SetActive(true);
-		}
-
-		internal void HideMenu() {
-			m_menu.SetActive(false);
-		}
+		internal void ShowMenu() { m_menu.SetActive(true); }
+		internal void HideMenu() { m_menu.SetActive(false); }
 
 		void OnApplicationQuit() {
 			Game.Shutdown();

Assets/Cryville/Crtr/Menu.cs

@@ -1,5 +1,7 @@
 using Cryville.Common.Unity.UI;
 using Cryville.Crtr.Browsing;
+using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 
 namespace Cryville.Crtr {
@@ -13,6 +15,10 @@ namespace Cryville.Crtr {
 		ProgressBar m_progressBar;
 		[SerializeField]
 		SettingsPanel m_settingsPanel;
+		[SerializeField]
+		TMP_Text m_title;
+		[SerializeField]
+		GameObject[] m_backBlockingObjects;
 #pragma warning restore IDE0044
 
 		int frameIndex = 2;
@@ -23,6 +29,7 @@ namespace Cryville.Crtr {
 			Game.Init();
 			transform.parent.Find("Canvas/Contents").gameObject.SetActive(true);
 			m_settingsPanel.Target = Settings.Default;
+			PushTitle("Chart Browser");
 		}
 		void Update() {
 			if (!initialized) {
@@ -54,9 +61,20 @@ namespace Cryville.Crtr {
 		}
 #pragma warning restore IDE0051
 
+		readonly Stack<string> _uiStack = new Stack<string>();
+		public void PushTitle(string title) {
+			_uiStack.Push(title);
+			m_title.SetText(title);
+		}
 		public void Back() {
+			foreach (var obj in m_backBlockingObjects) {
+				if (obj.activeInHierarchy) return;
+			}
 			if (m_browserMaster.Back()) return;
 			m_targetAnimator.SetTrigger("G_Back");
+			if (_uiStack.Count <= 1) return;
+			_uiStack.Pop();
+			m_title.SetText(_uiStack.Peek());
 		}
 		public void Quit() {
 			Application.Quit();

Assets/Cryville/Crtr/Menu.cs.meta

@@ -1,11 +1,10 @@
 fileFormatVersion: 2
 guid: ceefede648e4d6d40839f2dda9019066
-timeCreated: 1637222453
-licenseType: Free
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: -500
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Cryville/Crtr/Motion.cs

@@ -351,6 +351,8 @@ namespace Cryville.Crtr {
 	public abstract class Vector : IComparable<Vector> {
 		public Vector() { }
 
+		public abstract byte Dimension { get; }
+
 		public abstract int CompareTo(Vector other);
 
 		public abstract void ApplyFrom(Vector parent);
@@ -392,6 +394,8 @@ namespace Cryville.Crtr {
 			Value = i;
 		}
 
+		public override byte Dimension { get { return 1; } }
+
 		public override int CompareTo(Vector other) {
 			return CompareTo((Vec1)other);
 		}
@@ -457,6 +461,8 @@ namespace Cryville.Crtr {
 			Value = i;
 		}
 
+		public override byte Dimension { get { return 1; } }
+
 		public override int CompareTo(Vector other) {
 			throw new NotImplementedException();
 		}
@@ -517,6 +523,8 @@ namespace Cryville.Crtr {
 			Value = i;
 		}
 
+		public override byte Dimension { get { return 1; } }
+
 		public override int CompareTo(Vector other) {
 			throw new NotImplementedException();
 		}
@@ -578,6 +586,8 @@ namespace Cryville.Crtr {
 			this.h = h;
 		}
 
+		public override byte Dimension { get { return 2; } }
+
 		public static void Parse(string s, out float? w, out float? h) {
 			string[] c = s.Split('+');
 			float rw = 0, rh = 0;
@@ -697,6 +707,8 @@ namespace Cryville.Crtr {
 			this.x = x; this.y = y; this.z = z;
 		}
 
+		public override byte Dimension { get { return 3; } }
+
 		public override int CompareTo(Vector other) {
 			throw new NotImplementedException();
 		}
@@ -773,6 +785,8 @@ namespace Cryville.Crtr {
 			this.xw = xw; this.xh = xh; this.yw = yw; this.yh = yh;
 		}
 
+		public override byte Dimension { get { return 4; } }
+
 		public override int CompareTo(Vector other) {
 			throw new NotImplementedException();
 		}
@@ -852,6 +866,8 @@ namespace Cryville.Crtr {
 			this.xw = xw; this.xh = xh; this.yw = yw; this.yh = yh; this.z = z;
 		}
 
+		public override byte Dimension { get { return 5; } }
+
 		public override int CompareTo(Vector other) {
 			throw new NotImplementedException();
 		}
@@ -895,11 +911,11 @@ namespace Cryville.Crtr {
 		}
 
 		public override bool IsZero() {
-			if (!xw.Equals(0)) return false;
-			if (!xh.Equals(0)) return false;
-			if (!yw.Equals(0)) return false;
-			if (!yh.Equals(0)) return false;
-			if (!z.Equals(0)) return false;
+			if (xw == null || xw != 0) return false;
+			if (xh == null || xh != 0) return false;
+			if (yw == null || yw != 0) return false;
+			if (xh == null || xh != 0) return false;
+			if (z == null || z != 0) return false;
 			return true;
 		}
 
@@ -925,19 +941,27 @@ namespace Cryville.Crtr {
 		}
 	}
 
-	public class VectorSrc : PropSrc {
-		readonly Func<Vector> _cb;
-		public VectorSrc(Func<Vector> cb) { _cb = cb; }
-		protected override unsafe int InternalGet() {
-			var arr = _cb().ToArray();
-			if (arr.Length == 1) {
+	public abstract class VectorSrc : PropSrc {
+		protected readonly Func<Vector> _cb;
+		public VectorSrc(Func<Vector> cb, int type) : base(type) { _cb = cb; }
+		public static VectorSrc Construct(Func<Vector> cb) {
+			if (cb().Dimension == 1) return new INumber(cb);
+			else return new IVector(cb);
+		}
+		class INumber : VectorSrc {
+			public INumber(Func<Vector> cb) : base(cb, PdtInternalType.Number) { }
+			protected override unsafe void InternalGet() {
+				var arr = _cb().ToArray();
 				buf = new byte[sizeof(float)];
 				fixed (byte* ptr = buf) {
 					*(float*)ptr = arr[0];
 				}
-				return PdtInternalType.Number;
 			}
-			else {
+		}
+		class IVector : VectorSrc {
+			public IVector(Func<Vector> cb) : base(cb, PdtInternalType.Vector) { }
+			protected override unsafe void InternalGet() {
+				var arr = _cb().ToArray();
 				buf = new byte[sizeof(float) * arr.Length + sizeof(int)];
 				fixed (byte* rptr = buf) {
 					var ptr = (float*)rptr;
@@ -946,7 +970,6 @@ namespace Cryville.Crtr {
 					}
 					*(int*)ptr = PdtInternalType.Number;
 				}
-				return PdtInternalType.Vector;
 			}
 		}
 	}

Assets/Cryville/Crtr/NoteHandler.cs

@@ -10,63 +10,67 @@ namespace Cryville.Crtr {
 	public class NoteHandler : ContainerHandler {
 		readonly GroupHandler gh;
 		public readonly Chart.Note Event;
-		readonly PdtRuleset ruleset;
-		public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs) : base() {
-			this.gh = gh;
+		public NoteHandler(Chart.Note ev, GroupHandler gh) : base() {
 			Event = ev;
-			ruleset = rs;
+			this.gh = gh;
 		}
 		
-		public override string TypeName {
-			get {
-				return "note";
-			}
-		}
+		public override string TypeName { get { return "note"; } }
 
 		SectionalGameObject[] sgos;
-		readonly Dictionary<Identifier, JudgeState> judges = new Dictionary<Identifier, JudgeState>();
+		readonly Dictionary<Chart.Judge, JudgeState> judges = new Dictionary<Chart.Judge, JudgeState>();
 		class JudgeState {
-			public int AbsoluteAnchorName { get; set; }
-			public int RelativeAnchorName { get; set; }
-			public bool Judged { get; private set; }
+			static readonly int _var_judge_result = IdentifierManager.SharedInstance.Request("judge_result");
+			static readonly int _var_judge_time_absolute = IdentifierManager.SharedInstance.Request("judge_time_absolute");
+			static readonly int _var_judge_time_relative = IdentifierManager.SharedInstance.Request("judge_time_relative");
+			public Anchor StaticAnchor { get; private set; }
 			public float AbsoluteTime { get; private set; }
+			PropSrc _jtabsPropSrc;
 			public float RelativeTime { get; private set; }
+			PropSrc _jtrelPropSrc;
+			public int Result { get; private set; }
+			PropSrc _resultPropSrc;
 			public JudgeState(NoteHandler handler, int name) {
-				handler.RegisterAnchor(AbsoluteAnchorName = handler.judge.jtabsMap[name]);
-				handler.RegisterAnchor(RelativeAnchorName = handler.judge.jtrelMap[name]);
+				StaticAnchor = handler.RegisterAnchor(handler.judge.judgeMap[name], false, 3);
 			}
-			public void MarkJudged(float abs, float rel) {
-				Judged = true;
+			public void MarkJudged(float abs, float rel, int result) {
 				AbsoluteTime = abs;
 				RelativeTime = rel;
+				Result = result;
+				_jtabsPropSrc.Invalidate();
+				_jtrelPropSrc.Invalidate();
+				_resultPropSrc.Invalidate();
+			}
+			public void InitPropSrcs() {
+				StaticAnchor.PropSrcs.Add(_var_judge_result, _resultPropSrc = new PropSrc.Identifier(() => Result));
+				StaticAnchor.PropSrcs.Add(_var_judge_time_absolute, _jtabsPropSrc = new PropSrc.Float(() => AbsoluteTime));
+				StaticAnchor.PropSrcs.Add(_var_judge_time_relative, _jtrelPropSrc = new PropSrc.Float(() => RelativeTime));
 			}
 		}
 
 		public override void PreInit() {
 			base.PreInit();
+			coeffs = new ColumnVector<float>(gh.TrackCount);
 			foreach (var j in Event.judges) {
-				if (!judges.ContainsKey(j.Id)) {
-					judges.Add(j.Id, new JudgeState(this, j.Id.Key));
-				}
+				judges.Add(j, new JudgeState(this, j.Id.Key));
 			}
 		}
 		public override void Init() {
 			base.Init();
 			sgos = gogroup.GetComponentsInChildren<SectionalGameObject>();
+			foreach (var judge in judges.Values) judge.InitPropSrcs();
 		}
-		protected override void PreAwake(ContainerState s) {
-			base.PreAwake(s);
-#if UNITY_5_6_OR_NEWER
-			a_head.SetPositionAndRotation(Position = GetFramePoint(s.Parent, s.Track), Rotation = GetFrameRotation(s.Parent, s.Track));
-#else
-			a_head.position = Position = GetFramePoint(s.Parent, s.Track);
-			a_head.rotation = Rotation = GetFrameRotation(s.Parent, s.Track);
-#endif
-		}
-		protected override void Awake(ContainerState s) {
-			base.Awake(s);
+
+		public override void StartPhysicalUpdate(ContainerState s) {
+			base.StartPhysicalUpdate(s);
 			if (s.CloneType == 2) {
-				if (!gogroup) return;
+				TransformAwake(s);
+			}
+		}
+		public override void StartGraphicalUpdate(ContainerState s) {
+			base.StartGraphicalUpdate(s);
+			TransformAwake(s);
+			if (gogroup) {
 				if (Event.IsLong) {
 					foreach (var i in sgos) {
 						i.Reset();
@@ -83,17 +87,16 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
+		void TransformAwake(ContainerState s) {
+			Position = GetFramePoint(s.Parent, s.Track);
+			Rotation = GetFrameRotation(s.Parent, s.Track);
+		}
 
 		public override void Update(ContainerState s, StampedEvent ev) {
-			base.Update(s, ev);
 			if (s.CloneType <= 2) {
 				Position = GetFramePoint(s.Parent, s.Track);
 				Rotation = GetFrameRotation(s.Parent, s.Track);
-			}
-			if (s.CloneType == 2) {
-				if (!gogroup) return;
-				Chart.Note tev = Event;
-				if (tev.IsLong) {
+				if (s.CloneType == 2 && gogroup && Event.IsLong) {
 					foreach (var i in sgos)
 						i.AppendPoint(Position, Rotation);
 				}
@@ -102,42 +105,33 @@ namespace Cryville.Crtr {
 				if (ev == null) { }
 				else if (ev.Unstamped == null) { }
 				else if (ev.Unstamped is Chart.Judge) {
-					var tev = (Chart.Judge)ev.Unstamped;
-					Identifier name = default(Identifier);
-					ChartPlayer.etor.ContextEvent = tev;
+					ChartPlayer.etor.ContextEvent = ev.Unstamped;
 					ChartPlayer.etor.ContextState = s;
-					ChartPlayer.etor.Evaluate(new PropOp.Identifier(v => name = new Identifier(v)), ruleset.judges[tev.Id].input);
-					judge.Prepare(ev.Time, ev.Time + ev.Duration, name, tev.Id, this);
+					judge.Prepare(ev, this);
 					ChartPlayer.etor.ContextState = null;
 					ChartPlayer.etor.ContextEvent = null;
 				}
 			}
-		}
-
-		public override void Anchor() {
-			base.Anchor();
-			if (cs.Working) {
-				foreach (var j in judges.Values) {
-					if (!j.Judged) continue;
-					// PushAnchorEvent(j.AbsoluteAnchorName, j.AbsoluteTime);
-					// PushAnchorEvent(j.RelativeAnchorName, j.RelativeTime + cs.Time);
-				}
-			}
-		}
-
-		public override void EndUpdate(ContainerState s) {
-			if (s.CloneType == 2 && gogroup) {
-				foreach (var i in sgos) i.Seal();
+			if (s.CloneType == 2 && ev != null && ev.Unstamped is Chart.Judge) {
+				var anchor = judges[(Chart.Judge)ev.Unstamped].StaticAnchor;
 #if UNITY_5_6_OR_NEWER
-				a_tail.SetPositionAndRotation(GetFramePoint(ts.Parent, ts.Track), Quaternion.Euler(ts.Direction));
+				anchor.Transform.SetPositionAndRotation(Position, Rotation);
 #else
-				a_tail.position = GetFramePoint(ts.Parent, ts.Track);
-				a_tail.rotation = Quaternion.Euler(ts.Direction);
+				anchor.Transform.position = Position;
+				anchor.Transform.rotation = Rotation;
 #endif
+				OpenAnchor(anchor);
+				base.Update(s, ev);
+				CloseAnchor();
 			}
-			OpenAnchor(_a_tail);
-			base.EndUpdate(s);
-			CloseAnchor(_a_tail);
+			else base.Update(s, ev);
+		}
+
+		public override void EndGraphicalUpdate(ContainerState s) {
+			if (gogroup) {
+				foreach (var i in sgos) i.Seal();
+			}
+			base.EndGraphicalUpdate(s);
 		}
 		
 		Vector3 GetFramePoint(ContainerState state, float track) {
@@ -150,6 +144,7 @@ namespace Cryville.Crtr {
 		}
 
 		readonly List<Vector3> ctrl = new List<Vector3>(2);
+		ColumnVector<float> coeffs;
 		Vector3 GetFrame(ContainerState state, float track, Func<ContainerState, Vector3> func) {
 			// TODO
 			int id = Mathf.FloorToInt(track);
@@ -178,12 +173,8 @@ namespace Cryville.Crtr {
 				}
 				if (ctrl.Count == 0) {
 					var frame = gh.GetCurrentFrame(func);
-					return frame.Dot(
-						ColumnVector<float>.WithPolynomialCoefficients(
-							frame.Size, track
-						),
-						Vector3Operator.Instance
-					);
+					ColumnVector<float>.FillWithPolynomialCoefficients(coeffs, track);
+					return frame.Dot(coeffs, Vector3Operator.Instance);
 				}
 				else if (ctrl.Count == 1) {
 					return nt * (nt * p1 + t * (ctrl[0] + p1)) + t * t * p2;
@@ -197,8 +188,8 @@ namespace Cryville.Crtr {
 
 		public void ReportJudge(Judge.JudgeEvent ev, float time, Identifier result) {
 			JudgeState state;
-			if (!judges.TryGetValue(ev.JudgeId, out state)) return;
-			state.MarkJudged(time, (float)(time - cs.Time));
+			if (!judges.TryGetValue(ev.BaseEvent, out state)) return;
+			state.MarkJudged(time, (float)(ev.StartTime - time), result.Key);
 		}
 	}
 }

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -11,16 +11,20 @@ namespace Cryville.Crtr {
 		static readonly Dictionary<PdtOperatorSignature, PdtOperator> _shortops = new Dictionary<PdtOperatorSignature, PdtOperator>();
 		readonly Dictionary<int, PdtOperator> _ctxops = new Dictionary<int, PdtOperator>();
 
+		static readonly byte[] _nullbuf = new byte[0];
 		readonly byte[] _numbuf = new byte[4];
 		static readonly int _var_w = IdentifierManager.SharedInstance.Request("w");
 		static readonly int _var_h = IdentifierManager.SharedInstance.Request("h");
+		static readonly int _var_current_time = IdentifierManager.SharedInstance.Request("current_time");
 		static readonly int _var_true = IdentifierManager.SharedInstance.Request("true");
 		static readonly int _var_false = IdentifierManager.SharedInstance.Request("false");
-		protected override void GetVariable(int name, out int type, out byte[] value) {
+		static readonly int _var_null = IdentifierManager.SharedInstance.Request("null");
+		protected override void GetVariable(int name, bool forced, out int type, out byte[] value) {
 			if (name == _var_w) { LoadNum(ChartPlayer.hitRect.width); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_h) { LoadNum(ChartPlayer.hitRect.height); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_true) { LoadNum(1); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_false) { LoadNum(0); type = PdtInternalType.Number; value = _numbuf; }
+			else if (name == _var_null) { LoadIdent(0); type = PdtInternalType.Undefined; value = _numbuf; }
 			else {
 				var id = new Identifier(name);
 				PropSrc prop;
@@ -29,21 +33,25 @@ namespace Cryville.Crtr {
 				}
 				else if (ContextState != null && ChartPlayer.motionRegistry.ContainsKey(id)) {
 					var vec = ContextState.GetRawValue(id);
-					new VectorSrc(() => vec).Get(out type, out value);
+					VectorSrc.Construct(() => vec).Get(out type, out value);
+				}
+				else if (ContextState != null && ContextState.Handler.PropSrcs.TryGetValue(name, out prop)) {
+					prop.Get(out type, out value);
+					RevokePotentialConstant();
 				}
 				else if (ContextJudge != null && ContextJudge.TryGetScoreSrc(name, out prop)) {
 					prop.Get(out type, out value);
 					RevokePotentialConstant();
 				}
-				else if (ContextJudge != null && ContextJudge.TryGetScoreStringSrc(name, out prop)) {
-					prop.Get(out type, out value);
-					RevokePotentialConstant();
-				}
 				else {
-					PropSrc.Arbitrary result = ContextCascadeLookup(name);
+					PropSrc result = ContextCascadeLookup(name);
 					if (result != null) {
 						result.Get(out type, out value);
 					}
+					else if (forced) {
+						type = PdtInternalType.Error;
+						value = _nullbuf;
+					}
 					else {
 						type = PdtInternalType.Undefined;
 						LoadIdent(name);
@@ -84,6 +92,7 @@ namespace Cryville.Crtr {
 		static readonly int _colop_and = IdentifierManager.SharedInstance.Request("&");
 		static readonly int _colop_or = IdentifierManager.SharedInstance.Request("|");
 		protected override bool Collapse(int name, PdtVariableMemory param) {
+			if (param.Type == PdtInternalType.Error) throw new ArgumentException("Error");
 			if (name == _colop_and) return param.Type == PdtInternalType.Number && param.AsNumber() <= 0;
 			else if (name == _colop_or) return param.Type != PdtInternalType.Number || param.AsNumber() > 0;
 			else throw new KeyNotFoundException(string.Format("Undefined collapse operator {0}", IdentifierManager.SharedInstance.Retrieve(name)));
@@ -95,18 +104,22 @@ namespace Cryville.Crtr {
 		public Judge ContextJudge { private get; set; }
 		public PropSrc ContextSelfValue { private get; set; }
 
-		readonly Dictionary<int, PropSrc.Arbitrary>[] ContextCascade = new Dictionary<int, PropSrc.Arbitrary>[256];
+		readonly Dictionary<int, PropSrc>[] ContextCascade = new Dictionary<int, PropSrc>[256];
 		int _cascadeHeight;
 		public void ContextCascadeInsert() {
 			ContextCascade[_cascadeHeight++].Clear();
 		}
-		public void ContextCascadeUpdate(int key, PropSrc.Arbitrary value) {
+		public void ContextCascadeInsert(Dictionary<int, PropSrc> srcs) {
+			ContextCascadeInsert();
+			foreach (var src in srcs) ContextCascadeUpdate(src.Key, src.Value);
+		}
+		public void ContextCascadeUpdate(int key, PropSrc value) {
 			ContextCascade[_cascadeHeight - 1][key] = value;
 		}
-		public PropSrc.Arbitrary ContextCascadeLookup(int name) {
-			PropSrc.Arbitrary result;
+		public PropSrc ContextCascadeLookup(int name) {
+			PropSrc result;
 			for (int i = _cascadeHeight - 1; i >= 0; i--) {
-				Dictionary<int, PropSrc.Arbitrary> cas = ContextCascade[i];
+				Dictionary<int, PropSrc> cas = ContextCascade[i];
 				if (cas.TryGetValue(name, out result)) {
 					return result;
 				}
@@ -118,7 +131,7 @@ namespace Cryville.Crtr {
 		}
 
 		public PdtEvaluator() {
-			for (int i = 0; i < ContextCascade.Length; i++) ContextCascade[i] = new Dictionary<int, PropSrc.Arbitrary>();
+			for (int i = 0; i < ContextCascade.Length; i++) ContextCascade[i] = new Dictionary<int, PropSrc>();
 
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("screen_edge"), new func_screen_edge(() => ContextTransform));
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("int"), new func_int(() => ContextSelfValue));
@@ -154,6 +167,8 @@ namespace Cryville.Crtr {
 
 			_shortops.Add(new PdtOperatorSignature("frame_seq", 3), new func_frame_seq());
 			_shortops.Add(new PdtOperatorSignature("in_area", 1), new func_in_area());
+			_shortops.Add(new PdtOperatorSignature("interval", 3), new func_interval());
+			_shortops.Add(new PdtOperatorSignature("is", 2), new func_is());
 		}
 		#region Operators
 #pragma warning disable IDE1006
@@ -336,6 +351,27 @@ namespace Cryville.Crtr {
 				hit.CopyTo(ret);
 			}
 		}
+		class func_interval : PdtOperator {
+			public func_interval() : base(3) { }
+			protected override unsafe void Execute() {
+				var value = GetOperand(0).AsNumber();
+				var min = GetOperand(1).AsNumber();
+				var max = GetOperand(2).AsNumber();
+				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
+				ret.SetNumber((value - min) * (max - value));
+			}
+		}
+		class func_is : PdtOperator {
+			public func_is() : base(2) { }
+			protected override unsafe void Execute() {
+				var op0 = GetOperand(0);
+				if (op0.Type == PdtInternalType.Error) throw new ArgumentException("Error");
+				var op1 = GetOperand(1);
+				if (op1.Type == PdtInternalType.Error) throw new ArgumentException("Error");
+				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
+				ret.SetNumber(op0.Equals(op1) ? 1 : 0);
+			}
+		}
 		#endregion
 		#region Contextual Functions
 		class func_screen_edge : PdtOperator {
@@ -349,9 +385,8 @@ namespace Cryville.Crtr {
 				var ray = new Ray(ctx.position, ctx.rotation * Vector3.forward);
 				ChartPlayer.frustumPlanes[(int)GetOperand(0).AsNumber()].Raycast(ray, out dist);
 				var ret = GetReturnFrame(PdtInternalType.Vector, sizeof(Vector3) + sizeof(int));
-				var ptr = (Vector3*)ret.TrustedAsOfLength(sizeof(Vector3) + sizeof(int));
-				*ptr++ = ray.GetPoint(dist);
-				*(int*)ptr = PdtInternalType.Number;
+				ret.Set(ray.GetPoint(dist));
+				ret.SetArraySuffix(PdtInternalType.Number);
 			}
 		}
 		class func_int : PdtOperator {