Prevents dynamic anchor set twice. Implement special dynamic anchors.

This reverts commit 4185303bd2.

Assets/AssemblyInfo.cs

@@ -1,8 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyCompany("Cryville")]
-[assembly: AssemblyCopyright("Copyright © Cryville 2020-2022")]
-[assembly: AssemblyDefaultAlias("Cosmo Resona")]
-[assembly: AssemblyProduct("Cosmo Resona")]
-[assembly: AssemblyTitle("Cosmo Resona")]
-[assembly: AssemblyVersion("0.5.0")]

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/TargetString.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Cryville.Common.Buffers {
+	/// <summary>
+	/// An auto-resized <see cref="char" /> array as a variable-length string used as a target that is modified frequently.
+	/// </summary>
+	public class TargetString : IEnumerable<char> {
+		public event Action OnUpdate;
+		char[] _arr;
+		bool _invalidated;
+		/// <summary>
+		/// Creates an instance of the <see cref="TargetString" /> class with a capacity of 16.
+		/// </summary>
+		public TargetString() : this(16) { }
+		/// <summary>
+		/// 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>
+		/// Gets or sets one of the characters in the string.
+		/// </summary>
+		/// <param name="index">The zero-based index of the character.</param>
+		/// <returns>The character at the given index.</returns>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="index" /> is less than 0 or not less than <see cref="Length" />.</exception>
+		/// <remarks>
+		/// <para>Set <see cref="Length" /> to a desired value before updating the characters.</para>
+		/// <para>Call <see cref=" Validate" /> after all the characters are updated.</para>
+		/// </remarks>
+		public char this[int index] {
+			get {
+				if (index < 0 || index >= m_length)
+					throw new ArgumentOutOfRangeException("index");
+				return _arr[index];
+			}
+			set {
+				if (index < 0 || index >= m_length)
+					throw new ArgumentOutOfRangeException("index");
+				if (_arr[index] == value) return;
+				_arr[index] = value;
+				_invalidated = true;
+			}
+		}
+		int m_length;
+		/// <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 = _arr.Length;
+					while (len < value) len *= 2;
+					var arr2 = new char[len];
+					Array.Copy(_arr, arr2, m_length);
+					_arr = arr2;
+				}
+				m_length = value;
+				_invalidated = true;
+			}
+		}
+		/// <summary>
+		/// Validates the string.
+		/// </summary>
+		public void Validate() {
+			if (!_invalidated) return;
+			_invalidated = false;
+			var ev = OnUpdate;
+			if (ev != null) ev.Invoke();
+		}
+		internal char[] TrustedAsArray() { return _arr; }
+
+		/// <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);
+		}
+		IEnumerator<char> IEnumerable<char>.GetEnumerator() {
+			return new Enumerator(this);
+		}
+		IEnumerator IEnumerable.GetEnumerator() {
+			return new Enumerator(this);
+		}
+
+		public struct Enumerator : IEnumerator<char> {
+			readonly TargetString _self;
+			int _index;
+			internal Enumerator(TargetString self) {
+				_self = self;
+				_index = -1;
+			}
+
+			public char 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.Length) {
+					_index = -2;
+					return false;
+				}
+				return true;
+			}
+
+			public void Reset() {
+				_index = -1;
+			}
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d6a3a023271b82a4985d1bbcc86e6fa8
+guid: f0fc34ac257793d4883a9cfcdb6941b9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Culture.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 925f95cb7c6644a4695b2701d42e1ea2
+guid: 520554ce9a8205b4b91e0ff2b8011673
 folderAsset: yes
-timeCreated: 1606989037
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9ed0687e714ce1042921c0057f42039f
+guid: ae9dab8f520fadc4194032f523ca87c1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Font/FontFile.cs

@@ -0,0 +1,114 @@
+using Cryville.Common.IO;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+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

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 58e01e1e11af164408a19c1086709bd7
-timeCreated: 1638411495
-licenseType: Free
+guid: c9f44ccf8ddd364418b4f4965414ff9c
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

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,9 +1,8 @@
 fileFormatVersion: 2
-guid: 71d5ddaf108e0014c98c206ed5135ded
+guid: aaa0d8cecafb37b46a6abe372cfefd93
 folderAsset: yes
-timeCreated: 1605077401
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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/IdentifierManager.cs

@@ -10,10 +10,10 @@ namespace Cryville.Common {
 		/// </summary>
 		public static IdentifierManager SharedInstance = new IdentifierManager();
 
-		Dictionary<object, int> _idents = new Dictionary<object, int>();
-		List<object> _ids = new List<object>(); 
+		readonly Dictionary<object, int> _idents = new Dictionary<object, int>();
+		readonly List<object> _ids = new List<object>();
 
-		object _syncRoot = new object();
+		readonly object _syncRoot = new object();
 
 		/// <summary>
 		/// Creates an instance of the <see cref="IdentifierManager" /> class.

Assets/Cryville/Common/Logger.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 namespace Cryville.Common {
@@ -40,7 +41,7 @@ namespace Cryville.Common {
 		public static void Create(string key, Logger logger) {
 			Instances[key] = logger;
 			if (logPath != null) {
-				Files[key] = new StreamWriter(logPath + "/" + ((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds).ToString() + "-" + key + ".log") {
+				Files[key] = new StreamWriter(logPath + "/" + ((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds).ToString(CultureInfo.InvariantCulture) + "-" + key + ".log") {
 					AutoFlush = true
 				};
 			}

Assets/Cryville/Common/Math/FractionUtils.cs

@@ -0,0 +1,78 @@
+using System;
+
+namespace Cryville.Common.Math {
+	/// <summary>
+	/// Provides a set of <see langword="static" /> methods related to fractions.
+	/// </summary>
+	public static class FractionUtils {
+		/// <summary>
+		/// Converts a <see cref="double" /> decimal to a fraction.
+		/// </summary>
+		/// <param name="value">The decimal.</param>
+		/// <param name="error">The error.</param>
+		/// <param name="n">The numerator.</param>
+		/// <param name="d">The denominator.</param>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="value" /> is less than 0 or <paramref name="error" /> is not greater than 0 or not less than 1.</exception>
+		public static void ToFraction(double value, double error, out int n, out int d) {
+			if (value < 0.0)
+				throw new ArgumentOutOfRangeException("value", "Must be >= 0.");
+			if (error <= 0.0 || error >= 1.0)
+				throw new ArgumentOutOfRangeException("accuracy", "Must be > 0 and < 1.");
+
+			int num = (int)System.Math.Floor(value);
+			value -= num;
+
+			if (value < error) { n = num; d = 1; return; }
+			if (1 - error < value) { n = num + 1; d = 1; return; }
+
+			int lower_n = 0;
+			int lower_d = 1;
+			int upper_n = 1;
+			int upper_d = 1;
+			while (true) {
+				int middle_n = lower_n + upper_n;
+				int middle_d = lower_d + upper_d;
+
+				if (middle_d * (value + error) < middle_n) {
+					upper_n = middle_n;
+					upper_d = middle_d;
+				}
+				else if (middle_n < (value - error) * middle_d) {
+					lower_n = middle_n;
+					lower_d = middle_d;
+				}
+				else {
+					n = num * middle_d + middle_n;
+					d = middle_d;
+					return;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the greatest common divisor (GCD) of two integers.
+		/// </summary>
+		/// <param name="n">The first integer.</param>
+		/// <param name="d">The second integer.</param>
+		/// <returns>The greatest common divisor (GCD) of the two integers.</returns>
+		public static int GreatestCommonDivisor(int n, int d) {
+			while (d != 0) {
+				int t = d;
+				d = n % d;
+				n = t;
+			}
+			return n;
+		}
+
+		/// <summary>
+		/// Simplifies a fraction.
+		/// </summary>
+		/// <param name="n">The numerator.</param>
+		/// <param name="d">The denominator.</param>
+		public static void Simplify(ref int n, ref int d) {
+			var gcd = GreatestCommonDivisor(n, d);
+			n /= gcd;
+			d /= gcd;
+		}
+	}
+}

Assets/Cryville/Common/Math/FractionUtils.cs.meta

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

Assets/Cryville/Common/Math/SquareMatrix.cs

@@ -1,9 +1,13 @@
-namespace Cryville.Common.Math {
+using System;
+
+namespace Cryville.Common.Math {
 	/// <summary>
 	/// Represents a square matrix.
 	/// </summary>
 	public class SquareMatrix {
 		readonly float[,] content;
+		readonly float[,] buffer;
+		readonly int[] refl;
 		/// <summary>
 		/// The size of the matrix.
 		/// </summary>
@@ -17,6 +21,8 @@
 		/// <param name="size">The size of the matrix.</param>
 		public SquareMatrix(int size) {
 			content = new float[size, size];
+			buffer = new float[size, size];
+			refl = new int[size];
 			Size = size;
 		}
 		/// <summary>
@@ -38,38 +44,36 @@
 		/// <returns>The column vector eliminated.</returns>
 		public ColumnVector<T> Eliminate<T>(ColumnVector<T> v, IVectorOperator<T> o) {
 			int s = Size;
-			float[,] d = (float[,])content.Clone();
-			int[] refl = new int[s];
-			for (int i = 0; i < s; i++)
-				refl[i] = i;
+			Array.Copy(content, buffer, Size * Size);
+			for (int i = 0; i < s; i++) refl[i] = i;
 			for (int r = 0; r < s; r++) {
 				for (int r0 = r; r0 < s; r0++)
-					if (d[refl[r0], r] != 0) {
+					if (buffer[refl[r0], r] != 0) {
 						refl[r] = r0;
 						refl[r0] = r;
 						break;
 					}
 				int or = refl[r];
-				float sf0 = d[or, r];
+				float sf0 = buffer[or, r];
 				for (int c0 = r; c0 < s; c0++)
-					d[or, c0] /= sf0;
+					buffer[or, c0] /= sf0;
 				v[or] = o.ScalarMultiply(1 / sf0, v[or]);
 				for (int r1 = r + 1; r1 < s; r1++) {
 					int or1 = refl[r1];
-					float sf1 = d[or1, r];
+					float sf1 = buffer[or1, r];
 					for (int c1 = r; c1 < s; c1++)
-						d[or1, c1] -= d[or, c1] * sf1;
+						buffer[or1, c1] -= buffer[or, c1] * sf1;
 					v[or1] = o.Add(v[or1], o.ScalarMultiply(-sf1, v[or]));
 				}
 			}
-			T[] res = new T[s];
+			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(-d[refl[r2], c2], res[refl[c2]]));
+					v2 = o.Add(v2, o.ScalarMultiply(-buffer[refl[r2], c2], res[refl[c2]]));
 				res[refl[r2]] = v2;
 			}
-			return new ColumnVector<T>(res);
+			return res;
 		}
 		/// <summary>
 		/// Creates a square matrix and fills it with polynomial coefficients.

Assets/Cryville/Common/Network/HttpClient.cs

@@ -77,7 +77,7 @@ namespace Cryville.Common.Network {
 					encoding = Encoding.UTF8;
 				payload = encoding.GetBytes(body);
 				headers.Add("Content-Encoding", encoding.EncodingName);
-				headers.Add("Content-Length", payload.Length.ToString());
+				headers.Add("Content-Length", payload.Length.ToString(CultureInfo.InvariantCulture));
 			}
 			string request_line = string.Format(
 				"{0} {1} {2}\r\n", method, uri, Version

Assets/Cryville/Common/Network/HttpResponseStream.cs

@@ -19,9 +19,7 @@ namespace Cryville.Common.Network {
 			set { throw new NotSupportedException(); }
 		}
 		
-		public override void Flush() {
-			// Do nothing
-		}
+		public override void Flush() { }
 
 		public abstract byte[] ReadToEnd();
 

Assets/Cryville/Common/Network/TlsClient.cs

@@ -28,7 +28,7 @@ namespace Cryville.Common.Network {
 		}
 
 		private class InternalTlsClient : DefaultTlsClient {
-			string _host;
+			readonly string _host;
 
 			public InternalTlsClient(string host, TlsCrypto crypto) : base(crypto) {
 				_host = host;
@@ -92,9 +92,7 @@ namespace Cryville.Common.Network {
 				return null;
 			}
 
-			public void NotifyServerCertificate(TlsServerCertificate serverCertificate) {
-				// Do nothing
-			}
+			public void NotifyServerCertificate(TlsServerCertificate serverCertificate) { }
 		}
 	}
 }

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

@@ -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,7 +32,7 @@ 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,
 			0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030,
@@ -44,34 +44,35 @@ 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;
+		public string Source { get; private set; }
+		readonly Type _type;
 		readonly Binder _binder;
-		protected int Position { get; private set; }
+		public int Position { get; private set; }
 #pragma warning disable IDE1006
-		protected char cc { get { return _src[Position]; } }
+		protected char cc { get { return Source[Position]; } }
 		protected int ct { get { return cm[cc]; } }
 		protected string tokenb(int flag) { // Token Whitelist
 			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
 			int sp = Position;
 			while ((ct & flag) != 0) Position++;
-			return _src.Substring(sp, Position - sp);
+			return Source.Substring(sp, Position - sp);
 		}
 		protected void ws() {
 			while ((ct & 0x0001) != 0) Position++;
@@ -97,7 +98,7 @@ 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");
 		}
 		protected PdtExpression GetExp() {
 			var ins = new LinkedList<PdtInstruction>();
@@ -108,23 +109,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;
@@ -229,4 +237,36 @@ namespace Cryville.Common.Pdt {
 			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

@@ -19,7 +19,8 @@ namespace Cryville.Common.Pdt {
 		/// <returns>The operand at the specified index.</returns>
 		/// <exception cref="IndexOutOfRangeException"><paramref name="index" /> is not less than <see cref="LoadedOperandCount" /> or less than 0.</exception>
 		protected PdtVariableMemory GetOperand(int index) {
-			if (index >= LoadedOperandCount || index < 0) throw new IndexOutOfRangeException();
+			if (index >= LoadedOperandCount || index < 0)
+				throw new ArgumentOutOfRangeException("index");
 			int i = index + _loadindex;
 			return _operands[i];
 		}
@@ -33,11 +34,9 @@ namespace Cryville.Common.Pdt {
 			_operands = new PdtVariableMemory[pc];
 		}
 		PdtEvaluatorBase _etor;
-		bool _failure = false;
 		bool _rfreq = true;
 		internal void Begin(PdtEvaluatorBase etor) {
 			_etor = etor;
-			_failure = false;
 			_loadindex = ParamCount;
 		}
 		internal void LoadOperand(PdtVariableMemory mem) {
@@ -49,13 +48,9 @@ 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 (_failure) {
-				if (_rfreq) _etor.DiscardStack();
-				throw new InvalidOperationException("Evaluation failed");
-			}
-			if (!_rfreq && !noset) throw new InvalidOperationException("Return frame not set");
+			if (!_rfreq && !noset) throw new EvaluationFailureException("Return frame not set");
 		}
 		/// <summary>
 		/// Executes the operator.
@@ -69,10 +64,7 @@ namespace Cryville.Common.Pdt {
 		/// <returns>The return frame.</returns>
 		/// <exception cref="InvalidOperationException">The return frame has already been requested.</exception>
 		protected PdtVariableMemory GetReturnFrame(int type, int len) {
-			if (_rfreq) {
-				_failure = true;
-				throw new InvalidOperationException("Return frame already requested");
-			}
+			if (_rfreq) throw new InvalidOperationException("Return frame requested twice");
 			_rfreq = true;
 			return _etor.StackAlloc(type, _prmem, len);
 		}

Assets/Cryville/Common/Pdt/PdtVariableMemory.cs

@@ -4,7 +4,7 @@ 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.
@@ -46,6 +46,14 @@ namespace Cryville.Common.Pdt {
 			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>

Assets/Cryville/Common/Plist/PlistConvert.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Cryville.Common.Plist {
-	public class PlistConvert {
-		public static T Deserialize<T>(string file) {
-			return (T)Deserialize(typeof(T), PlistCS.Plist.readPlist(file));
-		}
-
-		public static object Deserialize(Type type, object obj, Binder binder = null) {
-			if (binder == null)
-				binder = BinderAttribute.CreateBinderOfType(type);
-			if (obj is IList) {
-				var lobj = (List<object>)obj;
-				foreach (var i in lobj) {
-					throw new NotImplementedException(); // TODO
-				}
-			}
-			else if (obj is IDictionary) {
-				var dobj = (Dictionary<string, object>)obj;
-				if (typeof(IDictionary).IsAssignableFrom(type)) {
-					var result = (IDictionary)ReflectionHelper.InvokeEmptyConstructor(type);
-					var it = type.GetGenericArguments()[1];
-					foreach (var i in dobj) {
-						var value = Deserialize(it, i.Value, binder);
-						result.Add(i.Key, value);
-					}
-					return result;
-				}
-				else {
-					var result = ReflectionHelper.InvokeEmptyConstructor(type);
-					foreach (var i in dobj) {
-						var imis = type.GetMember(i.Key);
-						if (imis.Length == 0) continue;
-						var imi = imis[0];
-						var it = ReflectionHelper.GetMemberType(imi);
-						var value = Deserialize(it, i.Value, binder);
-						ReflectionHelper.SetValue(imi, result, value, binder);
-					}
-					return result;
-				}
-			}
-			else return obj;
-			throw new Exception(); // TODO
-		}
-	}
-}

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/StringUtils.cs

@@ -40,7 +40,25 @@ namespace Cryville.Common {
 		/// <param name="name">The file name excluding the extension.</param>
 		/// <returns>The escaped file name.</returns>
 		public static string EscapeFileName(string name) {
-			return Regex.Replace(name, @"[\/\\\<\>\:\x22\|\?\*\p{Cc}\.\s]", "_");
+			var result = Regex.Replace(name, @"[\/\\\<\>\:\x22\|\?\*\p{Cc}]", "_").TrimEnd(' ', '.');
+			if (result.Length == 0) return "_";
+			return result;
+		}
+		/// <summary>
+		/// Gets the process path from a command.
+		/// </summary>
+		/// <param name="command">The command.</param>
+		/// <returns>The process path.</returns>
+		public static string GetProcessPathFromCommand(string command) {
+			command = command.Trim();
+			if (command[0] == '"') {
+				return command.Substring(1, command.IndexOf('"', 1) - 1);
+			}
+			else {
+				int e = command.IndexOf(' ');
+				if (e == -1) return command;
+				else return command.Substring(0, e);
+			}
 		}
 	}
 }

Assets/Cryville/Common/Unity/FileDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 using UnityEngine.UI;
@@ -11,13 +12,13 @@ namespace Cryville.Common.Unity {
 		Transform dirs;
 		Transform files;
 
-		public Action Callback { private get; set; }
+		public event Action OnClose;
 
 #if UNITY_ANDROID && !UNITY_EDITOR_WIN
 		string androidStorage = "";
 #endif
 
-		string fileName = "";
+		string fileName = null;
 		public string FileName {
 			get { return fileName; }
 		}
@@ -27,8 +28,16 @@ namespace Cryville.Common.Unity {
 			set { m_filter = value; }
 		}
 
-#pragma warning disable IDE0051
+		public Dictionary<string, string> m_presetPaths = new Dictionary<string, string>();
+		public Dictionary<string, string> PresetPaths {
+			get { return m_presetPaths; }
+			set { m_presetPaths = value; }
+		}
+
+		GameObject prefabButton;
+
 		void Start() {
+			prefabButton = Resources.Load<GameObject>("Common/Button");
 			panel = gameObject.transform.Find("Panel");
 			title = panel.Find("Title/Text");
 			drives = panel.Find("Drives/DrivesInner");
@@ -38,8 +47,8 @@ namespace Cryville.Common.Unity {
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
 				CurrentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
 #elif UNITY_ANDROID
-				using (AndroidJavaClass ajc=new AndroidJavaClass("android.os.Environment"))
-				using (AndroidJavaObject file=ajc.CallStatic<AndroidJavaObject>("getExternalStorageDirectory")) {
+				using (AndroidJavaClass ajc = new AndroidJavaClass("android.os.Environment"))
+				using (AndroidJavaObject file = ajc.CallStatic<AndroidJavaObject>("getExternalStorageDirectory")) {
 					androidStorage = file.Call<string>("getAbsolutePath");
 					CurrentDirectory = new DirectoryInfo(androidStorage);
 				}
@@ -47,9 +56,8 @@ namespace Cryville.Common.Unity {
 #error No default directory
 #endif
 			}
-			UpdateGUI();
+			UpdateGUI(0);
 		}
-#pragma warning restore IDE0051
 
 		public void Show() {
 			fileName = null;
@@ -57,85 +65,82 @@ namespace Cryville.Common.Unity {
 		}
 
 		public void Close() {
-			if (Callback != null) Callback.Invoke();
+			var ev = OnClose;
+			if (ev != null) ev.Invoke();
 			gameObject.SetActive(false);
 		}
 
 		public DirectoryInfo CurrentDirectory;
 
-		void OnDriveChanged(string s) {
-#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
-			CurrentDirectory = new DirectoryInfo(s);
-#elif UNITY_ANDROID
-			switch (s) {
-				case "?storage":
-					CurrentDirectory = new DirectoryInfo(androidStorage);
-					break;
-			}
-#else
-#error No change drive logic
-#endif
-			UpdateGUI();
+		void ChangeDirectory(DirectoryInfo s) {
+			CurrentDirectory = s;
+			UpdateGUI(1);
 		}
 
-		void OnDirectoryChanged(string s) {
-			CurrentDirectory = new DirectoryInfo(CurrentDirectory.FullName + "/" + s);
-			UpdateGUI();
-		}
-
-		void OnFileChanged(string s) {
+		void SelectFile(string s) {
 			fileName = s;
 			Close();
 		}
 
-		void UpdateGUI() {
+		void UpdateGUI(int depth) {
 			title.GetComponent<Text>().text = CurrentDirectory.FullName;
 
-			CallHelper.Purge(drives);
+			if (depth <= 0) {
+				CallHelper.Purge(drives);
 #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
-			var dl = Directory.GetLogicalDrives();
-			foreach (string d in dl) {
-				GameObject btn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
-				btn.GetComponentInChildren<Text>().text = d;
-				var ts = d;
-				btn.GetComponentInChildren<Button>().onClick.AddListener(() => OnDriveChanged(ts));
-				btn.transform.SetParent(drives, false);
-			}
+				var dl = Directory.GetLogicalDrives();
+				foreach (string d in dl) {
+					GameObject btn = Instantiate(prefabButton);
+					btn.GetComponentInChildren<Text>().text = d;
+					btn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(new DirectoryInfo(d)));
+					btn.transform.SetParent(drives, false);
+				}
 #elif UNITY_ANDROID
-			GameObject sbtn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
-			sbtn.GetComponentInChildren<Text>().text = "Storage";
-			sbtn.GetComponentInChildren<Button>().onClick.AddListener(() => OnDriveChanged("?storage"));
-			sbtn.transform.SetParent(drives, false);
+				GameObject sbtn = GameObject.Instantiate<GameObject>(prefabButton);
+				sbtn.GetComponentInChildren<Text>().text = "Storage";
+				sbtn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(new DirectoryInfo(androidStorage)));
+				sbtn.transform.SetParent(drives, false);
 #else
 #error No update GUI logic
 #endif
+				foreach (var p in m_presetPaths) {
+					var d = new DirectoryInfo(p.Value);
+					if (d.Exists) {
+						GameObject btn = Instantiate(prefabButton);
+						btn.GetComponentInChildren<Text>().text = p.Key;
+						btn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(d));
+						btn.transform.SetParent(drives, false);
+					}
+				}
+			}
 
 			CallHelper.Purge(dirs);
 			DirectoryInfo[] subdirs = CurrentDirectory.GetDirectories();
-			GameObject pbtn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
+			GameObject pbtn = Instantiate(prefabButton);
 			pbtn.GetComponentInChildren<Text>().text = "..";
-			pbtn.GetComponentInChildren<Button>().onClick.AddListener(() => OnDirectoryChanged(".."));
+			pbtn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(new DirectoryInfo(Path.Combine(CurrentDirectory.FullName, ".."))));
 			pbtn.transform.SetParent(dirs, false);
 			foreach (DirectoryInfo d in subdirs) {
-				GameObject btn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
+				GameObject btn = Instantiate(prefabButton);
 				btn.GetComponentInChildren<Text>().text = d.Name;
-				var ts = d.Name;
-				btn.GetComponentInChildren<Button>().onClick.AddListener(() => OnDirectoryChanged(ts));
+				var ts = d;
+				btn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(ts));
 				btn.transform.SetParent(dirs, false);
 			}
 
 			CallHelper.Purge(files);
 			FileInfo[] fl = CurrentDirectory.GetFiles();
 			foreach (FileInfo d in fl) {
-				foreach (string ext in m_filter)
-					if (d.Extension == ext) goto ext_matched;
-				continue;
-			ext_matched:
-				GameObject btn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
-				btn.GetComponentInChildren<Text>().text = d.Name + " / " + (d.Length / 1024.0).ToString("0.0 KiB");
-				var ts = d.FullName;
-				btn.GetComponentInChildren<Button>().onClick.AddListener(() => OnFileChanged(ts));
-				btn.transform.SetParent(files, false);
+				foreach (string ext in m_filter) {
+					if (d.Extension == ext) {
+						GameObject btn = Instantiate(prefabButton);
+						btn.GetComponentInChildren<Text>().text = d.Name + " / " + (d.Length / 1024.0).ToString("0.0 KiB");
+						var ts = d.FullName;
+						btn.GetComponentInChildren<Button>().onClick.AddListener(() => SelectFile(ts));
+						btn.transform.SetParent(files, false);
+						break;
+					}
+				}
 			}
 		}
 	}

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,29 +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),
 		};
-		// TODO set private
-		public 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) {
@@ -37,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,11 +44,14 @@ 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;
 		}
 		public abstract string GetKeyName(int type);
+		void Awake() {
+			useGUILayout = false;
+		}
 		void Update() {
 			double time = Time.realtimeSinceStartupAsDouble;
 			foreach (var k in Keys) {

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

@@ -12,35 +12,35 @@ 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();
 			}
 		}
 
 		public override bool IsNullable(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return false;
 		}
 
 		public override byte GetDimension(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return 2;
 		}
 
 		public override string GetTypeName(int type) {
 			switch (type) {
 				case 0: return "Mouse Position";
-				default: throw new ArgumentOutOfRangeException(nameof(type));
+				default: throw new ArgumentOutOfRangeException("type");
 			}
 		}
 

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

@@ -12,35 +12,35 @@ 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();
 			}
 		}
 
 		public override bool IsNullable(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return true;
 		}
 
 		public override byte GetDimension(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return 2;
 		}
 
 		public override string GetTypeName(int type) {
 			switch (type) {
 				case 0: return "Touch";
-				default: throw new ArgumentOutOfRangeException(nameof(type));
+				default: throw new ArgumentOutOfRangeException("type");
 			}
 		}
 

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/PropItem.cs

@@ -118,7 +118,7 @@ namespace Cryville.Common.Unity {
 				fdialog = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/FileDialog")).GetComponent<FileDialog>();
 				fdialog.Filter = filter;
 				fdialog.CurrentDirectory = ContextPath;
-				fdialog.Callback = () => OnFileDialogClosed();
+				fdialog.OnClose += OnFileDialogClosed;
 			}
 			editor.SetDescription(PropertyName, desc);
 			UpdateValue();

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

@@ -126,8 +126,8 @@ namespace Cryville.Common.Unity.UI {
 		void Update() {
 			Vector2 cprectsize = ((RectTransform)transform.parent).rect.size;
 			if (cprectsize != pprectsize) {
-				OnFrameUpdate();
 				pprectsize = cprectsize;
+				OnFrameUpdate();
 			}
 		}
 #pragma warning restore IDE0051

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 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/ChartResourceImporter.cs

@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Browsing {
+	public class ChartResourceImporter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".umgc" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			var meta = Path.Combine(file.Directory.FullName, "meta.json");
+			if (!File.Exists(meta)) throw new FileNotFoundException("Meta file for the chart not found");
+			using (StreamReader reader = new StreamReader(meta, Encoding.UTF8)) {
+				var data = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+				return new Resource[] { new ChartResource(data.name, file) };
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/ChartResourceImporter.cs.meta

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

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();
@@ -47,11 +48,11 @@ namespace Cryville.Crtr.Browsing {
 			_cover.sprite = m_coverPlaceholder;
 			if (data.Cover != null) data.Cover.Destination = DisplayCover;
 			var meta = data.Meta;
-			_title.text = string.Format("{0}\n{1}", meta.song.name, meta.chart.name);
+			_title.text = string.Format("{0}\n{1}", meta.song.name, meta.name);
 			_desc.text = string.Format(
 				"Music artist: {0}\nCharter: {1}\nLength: {2}\nNote Count: {3}",
-				meta.song.author, meta.chart.author,
-				TimeSpan.FromSeconds(meta.chart.length).ToString(3), meta.note_count
+				meta.song.author, meta.author,
+				TimeSpan.FromSeconds(meta.length).ToString(3), meta.note_count
 			);
 		}
 		private void DisplayCover(bool succeeded, Texture2D tex) {

Assets/Cryville/Crtr/Browsing/ExtensionInterface.cs

@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+
+namespace Cryville.Crtr.Browsing {
+	public abstract class ExtensionInterface {
+		public abstract IEnumerable<ResourceConverter> GetResourceConverters();
+		public abstract IEnumerable<LocalResourceFinder> GetResourceFinders();
+	}
+}

Assets/Cryville/Crtr/Browsing/ExtensionInterface.cs.meta

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

Assets/Cryville/Crtr/Browsing/IResourceManager.cs

@@ -1,4 +1,6 @@
-namespace Cryville.Crtr.Browsing {
+using System.Collections.Generic;
+
+namespace Cryville.Crtr.Browsing {
 	public interface IResourceManager<T> {
 		string[] CurrentDirectory { get; }
 		int ChangeDirectory(string[] dir);
@@ -10,5 +12,6 @@
 
 		bool ImportItemFrom(string path);
 		string[] GetSupportedFormats();
+		Dictionary<string, string> GetPresetPaths();
 	}
 }

Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs

@@ -17,6 +17,8 @@ namespace Cryville.Crtr.Browsing {
 
 		static readonly Dictionary<string, List<ResourceConverter>> converters
 			= new Dictionary<string, List<ResourceConverter>>();
+		static readonly Dictionary<string, string> localRes
+			= new Dictionary<string, string>();
 
 		public LegacyResourceManager(string rootPath) {
 			_rootPath = rootPath;
@@ -25,13 +27,35 @@ namespace Cryville.Crtr.Browsing {
 		static LegacyResourceManager() {
 			foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) {
 				foreach (var type in asm.GetTypes()) {
-					if (type.IsSubclassOf(typeof(ResourceConverter))) {
-						var converter = (ResourceConverter)Activator.CreateInstance(type);
-						foreach (var f in converter.GetSupportedFormats()) {
-							if (!converters.ContainsKey(f))
-								converters.Add(f, new List<ResourceConverter> { converter });
-							else converters[f].Add(converter);
+					if (!type.IsSubclassOf(typeof(ExtensionInterface))) continue;
+					var ext = (ExtensionInterface)Activator.CreateInstance(type);
+					try {
+						var cs = ext.GetResourceConverters();
+						if (cs != null) {
+							foreach (var c in cs) {
+								var fs = c.GetSupportedFormats();
+								if (fs == null) continue;
+								foreach (var f in fs) {
+									if (f == null) continue;
+									if (!converters.ContainsKey(f))
+										converters.Add(f, new List<ResourceConverter> { c });
+									else converters[f].Add(c);
+								}
+							}
 						}
+						var fs2 = ext.GetResourceFinders();
+						if (fs2 != null) {
+							foreach (var f in fs2) {
+								var name = f.Name;
+								var path = f.GetRootPath();
+								if (name != null && path != null)
+									localRes.Add(name, path);
+							}
+						}
+						Logger.Log("main", 1, "Resource", "Loaded extension {0}", ReflectionHelper.GetNamespaceQualifiedName(type));
+					}
+					catch (Exception ex) {
+						Logger.Log("main", 4, "Resource", "Failed to initialize extension {0}: {1}", ReflectionHelper.GetNamespaceQualifiedName(type), ex);
 					}
 				}
 			}
@@ -62,12 +86,12 @@ namespace Cryville.Crtr.Browsing {
 			var meta = new ChartMeta();
 			string name = item.Name;
 			string desc = "(Unknown)";
-			var metaFile = new FileInfo(item.FullName + "/meta.json");
+			var metaFile = new FileInfo(item.FullName + "/.umgc");
 			if (metaFile.Exists) {
 				using (var reader = new StreamReader(metaFile.FullName)) {
 					meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
 					name = meta.song.name;
-					desc = meta.chart.name;
+					desc = meta.name;
 				}
 			}
 			AsyncDelivery<Texture2D> cover = null;
@@ -91,7 +115,7 @@ namespace Cryville.Crtr.Browsing {
 		public ChartDetail GetItemDetail(int id) {
 			var item = items[id];
 			var meta = new ChartMeta();
-			var metaFile = new FileInfo(item.FullName + "/meta.json");
+			var metaFile = new FileInfo(item.FullName + "/.umgc");
 			if (metaFile.Exists) {
 				using (var reader = new StreamReader(metaFile.FullName)) {
 					meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
@@ -114,7 +138,13 @@ namespace Cryville.Crtr.Browsing {
 		}
 
 		public string GetItemPath(int id) {
-			return items[id].Name + "/.umgc";
+			var item = items[id];
+			var meta = new ChartMeta();
+			var metaFile = new FileInfo(item.FullName + "/.umgc");
+			using (var reader = new StreamReader(metaFile.FullName)) {
+				meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+			}
+			return string.Format("{0}/{1}.json", items[id].Name, meta.data);
 		}
 
 		public bool ImportItemFrom(string path) {
@@ -126,38 +156,56 @@ namespace Cryville.Crtr.Browsing {
 					resources = converter.ConvertFrom(file);
 				}
 				catch (Exception ex) {
-					Popup.Create(ex.Message);
+					LogAndPopup(4, ex.Message);
 					return false;
 				}
 				foreach (var res in resources) {
 					if (!res.Valid) {
-						Logger.Log("main", 3, "Resource", "Attempt to import invalid resource {0}", res);
+						LogAndPopup(3, "Attempt to import invalid resource: {0}", res);
 					}
-					else if (res is ChartResource) {
-						var tres = (ChartResource)res;
+					else if (res is RawChartResource) {
+						var tres = (RawChartResource)res;
 						var dir = new DirectoryInfo(_rootPath + "/charts/" + res.Name);
 						if (!dir.Exists) dir.Create();
-						using (var writer = new StreamWriter(dir.FullName + "/.umgc")) {
+						using (var writer = new StreamWriter(dir.FullName + "/.json")) {
 							writer.Write(JsonConvert.SerializeObject(tres.Main, Game.GlobalJsonSerializerSettings));
 						}
-						using (var writer = new StreamWriter(dir.FullName + "/meta.json")) {
+						using (var writer = new StreamWriter(dir.FullName + "/.umgc")) {
+							tres.Meta.data = "";
 							writer.Write(JsonConvert.SerializeObject(tres.Meta, Game.GlobalJsonSerializerSettings));
 						}
+						if (tres.Meta.cover != null) {
+							var coverFile = new FileInfo(Path.Combine(file.Directory.FullName, tres.Meta.cover));
+							if (coverFile.Exists)
+								coverFile.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true);
+						}
 					}
-					else if (res is CoverResource) {
-						var tres = (CoverResource)res;
-						var dir = new DirectoryInfo(_rootPath + "/charts/" + res.Name);
-						if (!dir.Exists) dir.Create();
-						var dest = new FileInfo(_rootPath + "/charts/" + res.Name + "/" + tres.Source.Name);
-						if (!dest.Exists) tres.Source.CopyTo(dest.FullName);
-
+					else if (res is FileResource) {
+						var tres = (FileResource)res;
+						DirectoryInfo dest;
+						if (res is ChartResource)
+							dest = new DirectoryInfo(_rootPath + "/charts/" + res.Name);
+						else if (res is RulesetResource)
+							dest = new DirectoryInfo(_rootPath + "/rulesets/" + res.Name);
+						else if (res is SkinResource)
+							dest = new DirectoryInfo(_rootPath + "/skins/" + (res as SkinResource).RulesetName + "/" + res.Name);
+						else if (res is SongResource)
+							dest = new DirectoryInfo(_rootPath + "/songs/" + res.Name);
+						else {
+							LogAndPopup(3, "Attempt to import unsupported file resource: {0}", res);
+							continue;
+						}
+						if (!dest.Exists) {
+							dest.Create();
+							tres.Master.CopyTo(Path.Combine(dest.FullName, tres.Master.Extension));
+							foreach (var attachment in tres.Attachments) {
+								attachment.CopyTo(Path.Combine(dest.FullName, attachment.Name));
+							}
+						}
+						else LogAndPopup(1, "Resource already exists: {0}", res);
 					}
-					else if (res is SongResource) {
-						var tres = (SongResource)res;
-						var dir = new DirectoryInfo(_rootPath + "/songs/" + res.Name);
-						if (!dir.Exists) dir.Create();
-						var dest = new FileInfo(_rootPath + "/songs/" + res.Name + "/.ogg");
-						if (!dest.Exists) tres.Source.CopyTo(dest.FullName);
+					else {
+						LogAndPopup(3, "Attempt to import unsupported resource: {0}", res);
 					}
 				}
 				return true;
@@ -165,8 +213,18 @@ namespace Cryville.Crtr.Browsing {
 			return false;
 		}
 
+		void LogAndPopup(int level, string format, params object[] args) {
+			var msg = string.Format(format, args);
+			Logger.Log("main", level, "Resource", msg);
+			Popup.Create(msg);
+		}
+
 		public string[] GetSupportedFormats() {
 			return converters.Keys.ToArray();
 		}
+
+		public Dictionary<string, string> GetPresetPaths() {
+			return localRes;
+		}
 	}
 }

Assets/Cryville/Crtr/Browsing/LocalResourceFinder.cs

@@ -0,0 +1,6 @@
+namespace Cryville.Crtr.Browsing {
+	public abstract class LocalResourceFinder {
+		public abstract string Name { get; }
+		public abstract string GetRootPath();
+	}
+}

Assets/Cryville/Crtr/Browsing/LocalResourceFinder.cs.meta

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

Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs

@@ -1,5 +1,6 @@
 using Cryville.Common.Unity;
 using Cryville.Common.Unity.UI;
+using System;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -19,6 +20,9 @@ namespace Cryville.Crtr.Browsing {
 
 			_dialog = GameObject.Instantiate(Resources.Load<GameObject>("Common/FileDialog")).GetComponent<FileDialog>();
 			_dialog.gameObject.SetActive(false);
+			_dialog.Filter = ResourceManager.GetSupportedFormats();
+			_dialog.PresetPaths = ResourceManager.GetPresetPaths();
+			_dialog.OnClose += OnAddDialogClosed;
 		}
 
 		private bool LoadPathPart(int id, GameObject obj) {
@@ -29,8 +33,13 @@ namespace Cryville.Crtr.Browsing {
 
 		private bool LoadItem(int id, GameObject obj) {
 			var bi = obj.GetComponent<BrowserItem>();
-			var item = ResourceManager.GetItemMeta(id);
-			bi.Load(id, item);
+			try {
+				var item = ResourceManager.GetItemMeta(id);
+				bi.Load(id, item);
+			}
+			catch (Exception) {
+				bi.Load(id, new ResourceItemMeta { Name = "<color=#ff0000>Invalid resource</color>" });
+			}
 			return true;
 		}
 
@@ -51,8 +60,6 @@ namespace Cryville.Crtr.Browsing {
 		}
 
 		public void OnAddButtonClicked() {
-			_dialog.Callback = OnAddDialogClosed;
-			_dialog.Filter = ResourceManager.GetSupportedFormats();
 			_dialog.Show();
 		}
 

Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Unity.UI;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -72,6 +73,9 @@ namespace Cryville.Crtr.Browsing {
 			Application.LoadLevelAdditive("Play");
 #endif
 			GameObject.Find("/Master").GetComponent<Master>().HideMenu();
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+			DiscordController.Instance.SetPlaying(string.Format("{0} - {1}", detail.Meta.song.name, detail.Meta.name), detail.Meta.length);
+#endif
 		}
 
 		public void OpenConfig(int id, ChartDetail detail) {
@@ -97,14 +101,19 @@ namespace Cryville.Crtr.Browsing {
 	}
 
 #pragma warning disable IDE1006
-	public struct ChartMeta {
-		public MetaInfo song { get; set; }
-		public MetaInfo chart { get; set; }
-		public struct MetaInfo {
-			public string name { get; set; }
-			public string author { get; set; }
-			public float length { get; set; }
-		}
+	public class MetaInfo {
+		public string name { get; set; }
+		public string author { get; set; }
+		[JsonRequired]
+		public string data { get; set; }
+	}
+	public class SongMetaInfo {
+		public string name { get; set; }
+		public string author { get; set; }
+	}
+	public class ChartMeta : MetaInfo {
+		public SongMetaInfo song { get; set; }
+		public float length { get; set; }
 		public string ruleset { get; set; }
 		public int note_count { get; set; }
 		public string cover { get; set; }

Assets/Cryville/Crtr/Browsing/ResourceConverter.cs

@@ -1,4 +1,5 @@
 using Cryville.Common;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.IO;
 
@@ -17,26 +18,62 @@ namespace Cryville.Crtr.Browsing {
 			return string.Format("{0} ({1})", Name, ReflectionHelper.GetSimpleName(GetType()));
 		}
 	}
-	public class ChartResource : Resource {
-		public ChartResource(string name, Chart main, ChartMeta meta) : base(name) {
+	public class RawChartResource : Resource {
+		public RawChartResource(string name, Chart main, ChartMeta meta) : base(name) {
 			Main = main; Meta = meta;
 		}
 		public Chart Main { get; private set; }
 		public ChartMeta Meta { get; private set; }
 		public override bool Valid { get { return true; } }
 	}
-	public class CoverResource : Resource {
-		public CoverResource(string name, FileInfo src) : base(name) {
-			Source = src;
+	public abstract class FileResource : Resource {
+		public FileResource(string name, FileInfo master) : base(name) {
+			Master = master;
+			Attachments = new List<FileInfo>();
+		}
+		public FileInfo Master { get; private set; }
+		public List<FileInfo> Attachments { get; private set; }
+		public override bool Valid {
+			get {
+				if (!Master.Exists) return false;
+				foreach (var file in Attachments) {
+					if (!file.Exists) return false;
+				}
+				return true;
+			}
 		}
-		public FileInfo Source { get; private set; }
-		public override bool Valid { get { return Source.Exists; } }
 	}
-	public class SongResource : Resource {
-		public SongResource(string name, FileInfo src) : base(name) {
-			Source = src;
+	public class ChartResource : FileResource {
+		public ChartResource(string name, FileInfo master) : base(name, master) {
+			using (var reader = new StreamReader(master.FullName)) {
+				var meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".json")));
+				if (meta.cover != null) Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.cover)));
+			}
+		}
+	}
+	public class SongResource : FileResource {
+		public SongResource(string name, FileInfo master) : base(name, master) { }
+	}
+	public class RulesetResource : FileResource {
+		public RulesetResource(string name, FileInfo master) : base(name, master) {
+			using (var reader = new StreamReader(master.FullName)) {
+				var meta = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd());
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
+			}
+		}
+	}
+	public class SkinResource : FileResource {
+		public string RulesetName { get; private set; }
+		public SkinResource(string name, FileInfo master) : base(name, master) {
+			using (var reader = new StreamReader(master.FullName)) {
+				var meta = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd());
+				RulesetName = meta.ruleset;
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
+				foreach (var frame in meta.frames) {
+					Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, frame)));
+				}
+			}
 		}
-		public FileInfo Source { get; private set; }
-		public override bool Valid { get { return Source.Exists; } }
 	}
 }

Assets/Cryville/Crtr/Browsing/RulesetResourceImporter.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Browsing {
+	public class RulesetResourceImporter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".umgr" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+				var data = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd());
+				return new Resource[] { new RulesetResource(data.name, file) };
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/RulesetResourceImporter.cs.meta

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

Assets/Cryville/Crtr/Browsing/SkinResourceImporter.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Browsing {
+	public class SkinResourceImporter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".umgs" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+				var data = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd());
+				return new Resource[] { new SkinResource(data.name, file) };
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/SkinResourceImporter.cs.meta

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

Assets/Cryville/Crtr/Chart.cs

@@ -3,19 +3,25 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace Cryville.Crtr {
 	[JsonConverter(typeof(BeatTimeConverter))]
-	public struct BeatTime {
+	public struct BeatTime : IComparable<BeatTime>, IEquatable<BeatTime> {
 		[JsonConstructor()]
 		public BeatTime(int _b, int _n, int _d) {
 			b = _b;
 			n = _n;
 			d = _d;
 		}
-		
+		public BeatTime(int _n, int _d) {
+			b = _n / _d;
+			n = _n % _d;
+			d = _d;
+		}
+
 		[JsonIgnore]
 		public int b;
 		
@@ -24,6 +30,36 @@ namespace Cryville.Crtr {
 		
 		[JsonIgnore]
 		public int d;
+
+		[JsonIgnore]
+		public double Decimal { get { return b + (double)n / d; } }
+
+		public int CompareTo(BeatTime other) {
+			var c = b.CompareTo(other.b);
+			if (c != 0) return c;
+			return ((double)n / d).CompareTo((double)other.n / other.d);
+		}
+
+		public override bool Equals(object obj) {
+			if (!(obj is BeatTime)) return false;
+			return Equals((BeatTime)obj);
+		}
+
+		public bool Equals(BeatTime other) {
+			return b.Equals(other.b) && ((double)n / d).Equals((double)other.n / other.d);
+		}
+
+		public override int GetHashCode() {
+			return Decimal.GetHashCode();
+		}
+
+		public static bool operator ==(BeatTime left, BeatTime right) {
+			return left.Equals(right);
+		}
+
+		public static bool operator !=(BeatTime left, BeatTime right) {
+			return !left.Equals(right);
+		}
 	}
 	
 	public class BeatTimeConverter : JsonConverter {
@@ -55,7 +91,7 @@ namespace Cryville.Crtr {
 		[JsonIgnore]
 		public float BeatPosition {
 			get {
-				return time.Value.b + time.Value.n / (float)time.Value.d + BeatOffset;
+				return (float)time.Value.Decimal + BeatOffset;
 			}
 		}
 
@@ -65,7 +101,7 @@ namespace Cryville.Crtr {
 		public float EndBeatPosition {
 			get {
 				if (endtime == null) return BeatPosition;
-				return endtime.Value.b + endtime.Value.n / (float)endtime.Value.d + BeatOffset;
+				return (float)endtime.Value.Decimal + BeatOffset;
 			}
 		}
 		
@@ -94,20 +130,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;
 			}
 		}
@@ -134,18 +161,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 {
@@ -156,6 +177,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 {
@@ -167,7 +195,7 @@ namespace Cryville.Crtr {
 		public virtual EventList GetEventsOfType(string type) {
 			switch (type) {
 				case "motions": return new EventList<Chart.Motion>(motions);
-				default: throw new ArgumentException("Unknown type");
+				default: throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type));
 			}
 		}
 	}
@@ -274,8 +302,10 @@ 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(); // TODO
+				if (!m.Success) throw new ArgumentException("Invalid motion string format");
 				name = new Identifier(m.Groups[1].Value);
 				var registry = ChartPlayer.motionRegistry[name];
 				if (m.Groups[3].Success) {
@@ -295,6 +325,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() {
@@ -303,7 +337,7 @@ namespace Cryville.Crtr {
 					var node = RelativeNode;
 					result += "#" + node.Id;
 					if (node.Time != null) result += "@" + node.Time.ToString();
-					if (node.Transition != null) result = "^" + node.Transition.ToString();
+					if (node.Transition != null) result = "^" + ((byte)node.Transition).ToString(CultureInfo.InvariantCulture);
 					if (node.Rate != null) result += "*" + node.Rate.ToString();
 					if (node.Value != null) result += ":" + node.Value.ToString();
 				}
@@ -346,10 +380,6 @@ namespace Cryville.Crtr {
 			}
 
 			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);
@@ -377,14 +407,6 @@ namespace Cryville.Crtr {
 				}
 			}
 
-			public Note() {
-				SubmitPropSrc("track", new PropSrc.Float(() => {
-					var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name == "track");
-					if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value;
-					else return ((Vec1)i.AbsoluteValue).Value;
-				}));
-			}
-
 			public override EventList GetEventsOfType(string type) {
 				switch (type) {
 					case "judges": return new EventList<Judge>(judges);
@@ -399,10 +421,12 @@ namespace Cryville.Crtr {
 		public class Judge : ChartEvent {
 			[JsonIgnore]
 			public Identifier Id;
+#pragma warning disable IDE1006
 			public string name {
 				get { return Id.ToString(); }
 				set { Id = new Identifier(value); }
 			}
+#pragma warning restore IDE1006
 
 			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) {
@@ -37,9 +27,9 @@ namespace Cryville.Crtr {
 				else if (ev.Unstamped == null) { }
 				else if (ev.Unstamped is Chart.Sound) {
 					Chart.Sound tev = (Chart.Sound)ev.Unstamped;
-					var source = new LibavFileAudioSource(
-						Game.GameDataPath + "/songs/" + tev.id + "/.ogg"
-					);
+					var dir = new DirectoryInfo(Game.GameDataPath + "/songs/" + tev.id);
+					var files = dir.GetFiles();
+					var source = new LibavFileAudioSource(files[0].FullName);
 					source.SelectStream();
 					sounds.Add(source);
 					Game.AudioSession.Sequence(
@@ -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,7 +1,7 @@
 #define BUILD
 
 using Cryville.Common;
-using Cryville.Common.Plist;
+using Cryville.Common.Buffers;
 using Cryville.Crtr.Config;
 using Cryville.Crtr.Event;
 using Newtonsoft.Json;
@@ -9,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;
@@ -20,14 +22,14 @@ using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr {
 	public class ChartPlayer : MonoBehaviour {
+		#region Fields
 		Chart chart;
 		Skin skin;
 		PdtSkin pskin;
 		Ruleset ruleset;
 		PdtRuleset pruleset;
 		Dictionary<string, Texture2D> texs;
-		public static Dictionary<string, Cocos2dFrames.Frame> frames;
-		List<Cocos2dFrames> plists;
+		public static Dictionary<string, SpriteFrame> frames;
 
 		readonly Queue<string> texLoadQueue = new Queue<string>();
 #if UNITY_5_4_OR_NEWER
@@ -46,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;
@@ -56,8 +60,8 @@ namespace Cryville.Crtr {
 		static bool disableGC = true;
 		static float clippingDist = 1f;
 		static float renderDist = 6f;
-		static float renderStep = 0.05f;
-		public static float actualRenderStep = 0f;
+		static double renderStep = 0.05;
+		public static double actualRenderStep = 0;
 		static bool autoRenderStep = false;
 		public static float soundOffset = 0;
 		static float startOffset = 0;
@@ -68,6 +72,7 @@ namespace Cryville.Crtr {
 		public static PdtEvaluator etor;
 		
 		InputProxy inputProxy;
+		#endregion
 
 		#region MonoBehaviour
 		void Start() {
@@ -81,7 +86,7 @@ namespace Cryville.Crtr {
 			}
 			OnSettingsUpdate();
 
-			status = GameObject.Find("Status").GetComponent<Text>();
+			status = GameObject.Find("Status").GetComponent<TextMeshProUGUI>();
 
 			texHandler = new DownloadHandlerTexture();
 #if BUILD
@@ -107,13 +112,12 @@ 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();
 		}
 
 		bool texloaddone;
 		diag::Stopwatch texloadtimer = new diag::Stopwatch();
-		bool firstFrame;
+		int forceSyncFrames;
 		double atime0;
 		void Update() {
 			if (started) GameUpdate();
@@ -125,10 +129,18 @@ namespace Cryville.Crtr {
 			try {
 				if (Screen.width != screenSize.x || Screen.height != screenSize.y)
 					throw new InvalidOperationException("Window resized while playing");
-				float dt = firstFrame
-						? 1f / Application.targetFrameRate
-						: Time.deltaTime;
-				firstFrame = false;
+				double dt, step;
+				if (forceSyncFrames != 0) {
+					forceSyncFrames--;
+					double target = Game.AudioClient.Position - atime0;
+					dt = target - cbus.Time;
+					step = autoRenderStep ? 1f / Application.targetFrameRate : renderStep;
+					inputProxy.SyncTime(target);
+				}
+				else {
+					dt = Time.deltaTime;
+					step = autoRenderStep ? Time.smoothDeltaTime : renderStep;
+				}
 				inputProxy.ForceTick();
 				cbus.ForwardByTime(dt);
 				bbus.ForwardByTime(dt);
@@ -137,19 +149,16 @@ namespace Cryville.Crtr {
 				bbus.CopyTo(2, tbus);
 				bbus.CopyTo(3, nbus);
 				UnityEngine.Profiling.Profiler.EndSample();
-				float step = autoRenderStep ? ( firstFrame
-						? 1f / Application.targetFrameRate
-						: Time.smoothDeltaTime
-					) : renderStep;
 				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) {
@@ -211,7 +220,6 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
-		string timetext = string.Empty;
 		void LogUpdate() {
 			string _logs = logs.text;
 			Game.MainLogger.Enumerate((level, module, msg) => {
@@ -231,34 +239,45 @@ 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) timetext = string.Format(
-				"\nSTime: {0:R}\nATime: {1:R}\nITime: {2:R}",
-				cbus.Time,
-				Game.AudioClient.Position - atime0,
-				inputProxy.GetTimestampAverage()
 			);
-			else timetext = string.Empty;
+			if (started) {
+				statusbuf.AppendFormat(
+					"\nStates: c{0} / b{1}",
+					cbus.ActiveStateCount, bbus.ActiveStateCount
+				);
+				statusbuf.AppendFormat(
+					"\nSTime: {0:G17}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 (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
 
@@ -279,6 +298,9 @@ namespace Cryville.Crtr {
 			SceneManager.UnloadSceneAsync("Play");
 #elif UNITY_5_3_OR_NEWER
 			SceneManager.UnloadScene("Play");
+#endif
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+			DiscordController.Instance.SetIdle();
 #endif
 		}
 #pragma warning restore IDE1006
@@ -286,7 +308,7 @@ namespace Cryville.Crtr {
 		bool logEnabled = true;
 		public void ToggleLogs() {
 			logs.text = "";
-			status.text = "";
+			status.SetText("");
 			logEnabled = !logEnabled;
 		}
 
@@ -309,13 +331,11 @@ namespace Cryville.Crtr {
 			autoRenderStep = renderStep == 0;
 			soundOffset = Settings.Default.SoundOffset;
 			startOffset = Settings.Default.StartOffset;
-			firstFrame = true;
+			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;
@@ -353,6 +373,13 @@ namespace Cryville.Crtr {
 				string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin)
 			);
 			if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
+			using (StreamReader reader = new StreamReader(skinFile.FullName, Encoding.UTF8)) {
+				skin = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd(), new JsonSerializerSettings() {
+					MissingMemberHandling = MissingMemberHandling.Error
+				});
+				if (skin.format != Skin.CURRENT_FORMAT) throw new FormatException("Invalid skin file version");
+			}
+
 			loadThread = new Thread(new ParameterizedThreadStart(Load));
 			loadThread.Start(new LoadInfo() {
 				chartFile = chartFile,
@@ -363,10 +390,11 @@ namespace Cryville.Crtr {
 			Logger.Log("main", 0, "Load/MainThread", "Loading textures...");
 			texloadtimer = new diag::Stopwatch();
 			texloadtimer.Start();
+			frames = new Dictionary<string, SpriteFrame>();
 			texs = new Dictionary<string, Texture2D>();
-			var flist = skinFile.Directory.GetFiles("*.png");
-			foreach (FileInfo f in flist) {
-				texLoadQueue.Enqueue(f.FullName);
+			var skinDir = skinFile.Directory.FullName;
+			foreach (var f in skin.frames) {
+				texLoadQueue.Enqueue(Path.Combine(skinDir, f));
 			}
 		}
 
@@ -374,26 +402,35 @@ namespace Cryville.Crtr {
 			try {
 				diag::Stopwatch timer = new diag::Stopwatch();
 				timer.Reset(); timer.Start();
-				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 3)");
-				foreach (var i in plists) i.Init(texs);
+				Logger.Log("main", 0, "Load/Prehandle", "Initializing textures");
 				foreach (var t in texs) {
 					if (frames.ContainsKey(t.Key)) {
 						Logger.Log("main", 3, "Load/Prehandle", "Duplicated texture name: {0}", t.Key);
 						continue;
 					}
-					var f = new Cocos2dFrames.Frame(t.Value);
+					var f = new SpriteFrame(t.Value);
 					f.Init();
 					frames.Add(t.Key, f);
 				}
-				Logger.Log("main", 0, "Load/Prehandle", "Initializing states");
-				cbus.BroadcastInit();
+				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 2)");
+				cbus.BroadcastPreInit();
+				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 3)");
+				using (var pbus = cbus.Clone(17)) {
+					pbus.Forward();
+				}
+				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 4)");
+				cbus.BroadcastPostInit();
 				inputProxy.Activate();
-				if (logEnabled) ToggleLogs();
+				if (logEnabled && Settings.Default.HideLogOnPlay) ToggleLogs();
 				Logger.Log("main", 0, "Load/Prehandle", "Cleaning up");
 				GC.Collect();
 				if (disableGC) GarbageCollector.GCMode = GarbageCollector.Mode.Disabled;
 				timer.Stop();
 				Logger.Log("main", 1, "Load/Prehandle", "Prehandling done ({0}ms)", timer.Elapsed.TotalMilliseconds);
+				if (Settings.Default.ClearLogOnPlay) {
+					logs.text = "";
+					Game.MainLogger.Enumerate((level, module, msg) => { });
+				}
 				Game.AudioSequencer.Playing = true;
 				atime0 = Game.AudioClient.BufferPosition;
 				Thread.Sleep((int)((atime0 - Game.AudioClient.Position) * 1000));
@@ -412,10 +449,10 @@ namespace Cryville.Crtr {
 				Logger.Log("main", 1, "Game", "Stopping");
 				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) {
@@ -460,6 +497,7 @@ namespace Cryville.Crtr {
 				workerTimer = new diag::Stopwatch();
 				workerTimer.Start();
 				RMVPool.Prepare();
+				MotionCachePool.Prepare();
 				LoadChart(info);
 				workerTimer.Stop();
 				Logger.Log("main", 1, "Load/WorkerThread", "Worker thread done ({0}ms)", workerTimer.Elapsed.TotalMilliseconds);
@@ -491,10 +529,10 @@ 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);
 
+				Logger.Log("main", 0, "Load/WorkerThread", "Initializing judge and input");
 				judge = new Judge(pruleset);
 				etor.ContextJudge = judge;
 
@@ -504,7 +542,6 @@ namespace Cryville.Crtr {
 					throw new ArgumentException("Input config not completed\nPlease complete the input settings");
 				}
 
-				cbus.AttachSystems(pskin, judge);
 				Logger.Log("main", 0, "Load/WorkerThread", "Attaching handlers");
 				var ch = new ChartHandler(chart, dir);
 				cbus.RootState.AttachHandler(ch);
@@ -514,24 +551,19 @@ 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, judge);
+							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);
 					}
 				}
+				cbus.AttachSystems(pskin, judge);
 				Logger.Log("main", 0, "Load/WorkerThread", "Prehandling (iteration 1)");
 				using (var pbus = cbus.Clone(16)) {
 					pbus.Forward();
 				}
-				Logger.Log("main", 0, "Load/WorkerThread", "Patching events");
-				cbus.DoPatch();
-				Logger.Log("main", 0, "Load/WorkerThread", "Prehandling (iteration 2)");
-				using (var pbus = cbus.Clone(17)) {
-					pbus.Forward();
-				}
 
 				Logger.Log("main", 0, "Load/WorkerThread", "Cloning states (type 1)");
 				bbus = cbus.Clone(1, -clippingDist);
@@ -549,7 +581,7 @@ namespace Cryville.Crtr {
 				ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
-				if (ruleset.format != 1) throw new FormatException("Invalid ruleset file version");
+				if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
 				ruleset.LoadPdt(dir);
 				pruleset = ruleset.Root;
 				pruleset.Optimize(etor);
@@ -559,23 +591,9 @@ namespace Cryville.Crtr {
 		void LoadSkin(FileInfo file) {
 			DirectoryInfo dir = file.Directory;
 			Logger.Log("main", 0, "Load/WorkerThread", "Loading skin: {0}", file);
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				skin = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd(), new JsonSerializerSettings() {
-					MissingMemberHandling = MissingMemberHandling.Error
-				});
-				if (skin.format != 1) throw new FormatException("Invalid skin file version");
-				skin.LoadPdt(dir);
-				pskin = skin.Root;
-				pskin.Optimize(etor);
-			}
-			plists = new List<Cocos2dFrames>();
-			frames = new Dictionary<string, Cocos2dFrames.Frame>();
-			foreach (FileInfo f in file.Directory.GetFiles("*.plist")) {
-				var pobj = PlistConvert.Deserialize<Cocos2dFrames>(f.FullName);
-				plists.Add(pobj);
-				foreach (var i in pobj.frames)
-					frames.Add(StringUtils.TrimExt(i.Key), i.Value);
-			}
+			skin.LoadPdt(dir);
+			pskin = skin.Root;
+			pskin.Optimize(etor);
 		}
 		#endregion
 	}

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/Cocos2dFrames.cs

@@ -1,176 +0,0 @@
-using Cryville.Common;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using UnityEngine;
-
-namespace Cryville.Crtr {
-	[BinderAttribute(typeof(Cocos2dFramesBinder))]
-	public class Cocos2dFrames {
-		public Metadata metadata;
-		public class Metadata {
-			public int format;
-			public Vector2 size;
-			public string textureFileName;
-		}
-
-		public Dictionary<string, Frame> frames;
-		public class Frame {
-#pragma warning disable IDE1006
-			Rect _frame;
-			public Rect frame {
-				get { return _frame; }
-				set { _frame = value; }
-			}
-			public Rect textureRect {
-				get { return _frame; }
-				set { _frame = value; }
-			}
-
-			bool _rotated = false;
-			public bool rotated {
-				get { return _rotated; }
-				set { _rotated = value; }
-			}
-			public bool textureRotated {
-				get { return _rotated; }
-				set { _rotated = value; }
-			}
-#pragma warning restore IDE1006
-
-			public Vector2 offset;
-
-			public Rect sourceColorRect;
-			public Vector2 sourceSize;
-			private Rect _uv;
-			private Vector2[] cuv;
-			public Rect UV {
-				get {
-					return _uv;
-				}
-				private set {
-					_uv = value;
-					float x0 = Mathf.Min(_uv.xMin, _uv.xMax);
-					float x1 = Mathf.Max(_uv.xMin, _uv.xMax);
-					float y0 = Mathf.Min(_uv.yMin, _uv.yMax);
-					float y1 = Mathf.Max(_uv.yMin, _uv.yMax);
-					if (_rotated) cuv = new Vector2[]{
-						new Vector2(x0, y1),
-						new Vector2(x1, y0),
-						new Vector2(x0, y0),
-						new Vector2(x1, y1),
-					};
-					else cuv = new Vector2[]{
-						new Vector2(x0, y0),
-						new Vector2(x1, y1),
-						new Vector2(x1, y0),
-						new Vector2(x0, y1),
-					};
-				}
-			}
-			public Vector2 GetUV(Vector2 uv) {
-				return GetUV(uv.x, uv.y);
-			}
-			public Vector2 GetUV(float u, float v) {
-				Vector2 uv00 = cuv[0], uv11 = cuv[1],
-				uv10 = cuv[2], uv01 = cuv[3];
-				return (1 - u - v) * uv00
-					+ u * uv10
-					+ v * uv01
-					+ u * v * (uv00 + uv11 - uv10 - uv01);
-			}
-			public Texture2D Texture {
-				get;
-				private set;
-			}
-			public Vector2 Size {
-				get {
-					return new Vector2(Texture.width, Texture.height);
-				}
-			}
-			
-			public void Init() {
-				if (Texture == null)
-					throw new InvalidOperationException(); // TODO
-				_frame = new Rect(Vector2.zero, Size);
-				var w = _frame.width;
-				var h = _frame.height;
-				float x = _frame.x / w;
-				float y = 1 - _frame.y / h;
-				float tw = (_rotated ? _frame.height : _frame.width) / w;
-				float th = (_rotated ? _frame.width : _frame.height) / h;
-				if (_rotated) UV = new Rect(x, y, tw, -th);
-				else UV = new Rect(x, y, tw, -th);
-			}
-
-			public void Init(int w, int h, Texture2D _base) {
-				if (Texture != null)
-					throw new InvalidOperationException(); // TODO
-				Texture = _base;
-				float x = _frame.x / w;
-				float y = 1 - _frame.y / h;
-				float tw = (_rotated ? _frame.height : _frame.width) / w;
-				float th = (_rotated ? _frame.width : _frame.height) / h;
-				if (_rotated) UV = new Rect(x, y, tw, -th);
-				else UV = new Rect(x, y, tw, -th);
-			}
-			public Frame() { }
-			public Frame(Texture2D tex) {
-				Texture = tex;
-			}
-		}
-
-		Texture2D _base;
-
-		public void Init(Dictionary<string, Texture2D> texs) {
-			_base = texs[StringUtils.TrimExt(metadata.textureFileName)];
-			var w = (int)metadata.size.x;
-			var h = (int)metadata.size.y;
-			if (w == 0 || h == 0) {
-				w = _base.width;
-				h = _base.height;
-			}
-			foreach (var f in frames) {
-				f.Value.Init(w, h, _base);
-			}
-		}
-	}
-
-	public class Cocos2dFramesBinder : EmptyBinder {
-		public override object ChangeType(object value, Type type, CultureInfo culture) {
-			if (value is string) {
-				var str = (string)value;
-				if (type == typeof(Rect)) {
-					var m = Regex.Match(str, @"^{({.*?}),({.*?})}$");
-					var p = (Vector2)ChangeType(m.Groups[1].Value, typeof(Vector2), culture);
-					var s = (Vector2)ChangeType(m.Groups[2].Value, typeof(Vector2), culture);
-					return new Rect(p, s);
-				}
-				else if (type == typeof(Vector2)) {
-					var m = Regex.Match(str, @"^{(.*?),(.*?)}$");
-					var w = float.Parse(m.Groups[1].Value);
-					var h = float.Parse(m.Groups[2].Value);
-					return new Vector2(w, h);
-				}
-			}
-			else if (typeof(IDictionary).IsAssignableFrom(value.GetType())) {
-				var dict = (IDictionary)value;
-				if (type == typeof(Rect)) {
-					var x = float.Parse((string)dict["x"]);
-					var y = float.Parse((string)dict["y"]);
-					var w = float.Parse((string)dict["w"]);
-					var h = float.Parse((string)dict["h"]);
-					return new Rect(x, y, w, h);
-				}
-				else if (type == typeof(Vector2)) {
-					var w = float.Parse((string)dict["w"]);
-					var h = float.Parse((string)dict["h"]);
-					return new Vector2(w, h);
-				}
-			}
-			return base.ChangeType(value, type, culture);
-		}
-	}
-}

Assets/Cryville/Crtr/Components/MeshBase.cs

@@ -0,0 +1,30 @@
+using System;
+
+namespace Cryville.Crtr.Components {
+	public abstract class MeshBase : SkinComponent {
+		public MeshBase() {
+			SubmitProperty("zindex", new PropOp.Integer(v => ZIndex = (short)v));
+		}
+
+		protected MeshWrapper mesh = new MeshWrapper();
+
+		short _zindex;
+		public short ZIndex {
+			get {
+				return _zindex;
+			}
+			set {
+				if (value < 0 || value > 5000)
+					throw new ArgumentOutOfRangeException("value", "Z-index must be in [0..5000]");
+				_zindex = value;
+				UpdateZIndex();
+			}
+		}
+		protected void UpdateZIndex() {
+			if (!mesh.Initialized) return;
+			foreach (var mat in mesh.Renderer.materials) {
+				mat.renderQueue = _zindex;
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Components/MeshBase.cs.meta

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

Assets/Cryville/Crtr/Components/SectionalGameObject.cs

@@ -5,11 +5,22 @@ using System.Collections.Generic;
 using UnityEngine;
 
 namespace Cryville.Crtr.Components {
-	public abstract class SectionalGameObject : SkinComponent {
+	public abstract class SectionalGameObject : MeshBase {
 		protected Vector3? prevpt;
 		protected Quaternion? prevrot;
 		protected int vertCount = 0;
-		protected MeshWrapper mesh = new MeshWrapper();
+		Part part = Part.whole;
+		enum Part {
+			whole = 0,
+			idle = 1,
+			start = 2,
+			end = 3,
+		}
+
+		public SectionalGameObject() {
+			SubmitProperty("partial", new PropOp.Boolean(v => part = Part.idle));
+			SubmitProperty("part", new PropOp.Enum<Part>(v => part = v, v => (Part)v), 2);
+		}
 
 		protected override void OnDestroy() {
 			mesh.Destroy();
@@ -24,7 +35,7 @@ namespace Cryville.Crtr.Components {
 		}
 
 		public void AppendPoint(Vector3 p, Quaternion r) {
-			if (prevpt == p && prevrot == r) return;
+			if (prevpt == p && prevrot == r || ((int)part & 1) == 1) return;
 			AppendPointInternal(p, r);
 			// if (!headGenerated) Logger.Log("main", 0, "Skin/Polysec", "{0}", r);
 			prevpt = p;
@@ -56,8 +67,7 @@ namespace Cryville.Crtr.Components {
 			SubmitProperty("head", new PropOp.String(v => head.FrameName = v));
 			SubmitProperty("body", new PropOp.String(v => body.FrameName = v));
 			SubmitProperty("tail", new PropOp.String(v => tail.FrameName = v));
-			SubmitProperty("transparent", new PropOp.Boolean(v => transparent = v));
-			SubmitProperty("shape", new op_set_shape(this));
+			SubmitProperty("shape", new op_set_shape(this), 2);
 		}
 
 #pragma warning disable IDE1006
@@ -94,31 +104,20 @@ namespace Cryville.Crtr.Components {
 		public SpriteInfo body = new SpriteInfo();
 		public SpriteInfo tail = new SpriteInfo();
 
-		public bool transparent;
 		List<Vector3> vertices;
 		List<float> lengths;
 		float sumLength = 0;
 
 		public override void Init() {
 			base.Init();
+			mesh.Init(transform);
 
-			head.Load();
-			body.Load();
-			tail.Load();
+			var mats = mesh.Renderer.materials = new Material[] { mesh.NewMaterial, mesh.NewMaterial, mesh.NewMaterial };
+			head.Bind(mats[0]);
+			body.Bind(mats[1]);
+			tail.Bind(mats[2]);
 
-			mesh.Init(transform, transparent);
-
-			List<Material> materials = new List<Material>();
-			if (head.FrameName != null) AddMat(materials, head.FrameName);
-			if (body.FrameName != null) AddMat(materials, body.FrameName);
-			if (tail.FrameName != null) AddMat(materials, tail.FrameName);
-			mesh.Renderer.materials = materials.ToArray();
-		}
-
-		void AddMat(List<Material> list, string frame) {
-			var mat = mesh.NewMaterial;
-			mat.mainTexture = ChartPlayer.frames[frame].Texture;
-			list.Add(mat);
+			UpdateZIndex();
 		}
 
 		protected override void OnDestroy() {
@@ -132,7 +131,6 @@ namespace Cryville.Crtr.Components {
 			}
 		}
 
-		// Vector3 prevp = Vector3.zero;
 		protected override void AppendPointInternal(Vector3 p, Quaternion r) {
 			if (vertices == null) {
 				vertices = _ptPool.Rent();
@@ -154,15 +152,16 @@ namespace Cryville.Crtr.Components {
 		List<Vector3> verts;
 		List<Vector2> uvs;
 		List<int> trih = null, trib = null, trit = null;
+		static List<int> _emptyTris = new List<int>();
 
 		public override void Seal() {
 			if (vertCount <= 1 || sumLength == 0) return;
 			int vcpsec = _shapeLength; // Vertex Count Per Section
 			float width = GetWidth();
 			float headLength = 0;
-			if (head.FrameName != null) headLength = width / head.Ratio;
+			if (head.Frame != null) headLength = width / head.Ratio;
 			float tailLength = 0;
-			if (tail.FrameName != null) tailLength = width / tail.Ratio;
+			if (tail.Frame != null) tailLength = width / tail.Ratio;
 			float endLength = headLength + tailLength;
 			if (sumLength <= endLength) {
 				// The total length of the two ends is longer than the whole mesh, squeeze the two ends
@@ -190,17 +189,17 @@ namespace Cryville.Crtr.Components {
 			verts = _vertPool.Rent(vc * vcpsec);
 			uvs = _uvPool.Rent(vc * vcpsec);
 			int i = 0; int t = 0; float l = 0; int m = 0;
-			if (head.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); }
-			if (body.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
-			if (tail.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
+			if (head.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); }
+			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.FrameName != null) mesh.Mesh.SetTriangles(trih, m++);
-			if (body.FrameName != null) mesh.Mesh.SetTriangles(trib, m++);
-			if (tail.FrameName != 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/SkinComponent.cs

@@ -1,4 +1,5 @@
-using Cryville.Common.Pdt;
+using Cryville.Common;
+using Cryville.Common.Pdt;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -7,25 +8,32 @@ namespace Cryville.Crtr.Components {
 		/// <summary>
 		/// The property operators of the component.
 		/// </summary>
-		public Dictionary<string, PdtOperator> PropOps { get; private set; }
+		public Dictionary<int, SkinProperty> Properties { get; private set; }
 		/// <summary>
 		/// Submits a property.
 		/// </summary>
 		/// <param name="name">The name of the property.</param>
-		/// <param name="property">The property operator.</param>
-		protected void SubmitProperty(string name, PdtOperator property) {
-			PropOps.Add(name, property);
+		/// <param name="property">The property.</param>
+		protected void SubmitProperty(string name, PdtOperator property, int uct = 1) {
+			Properties.Add(IdentifierManager.SharedInstance.Request(name), new SkinProperty(property, uct));
 		}
 
 		/// <summary>
-		/// Create a skin component
+		/// Creates a skin component.
 		/// </summary>
 		protected SkinComponent() {
-			// Properties = new Dictionary<string, Property>();
-			PropOps = new Dictionary<string, PdtOperator>();
+			Properties = new Dictionary<int, SkinProperty>();
 		}
 
 		public virtual void Init() { }
 		protected abstract void OnDestroy();
 	}
+	public struct SkinProperty {
+		public PdtOperator Operator { get; set; }
+		public int UpdateCloneType { get; set; }
+		public SkinProperty(PdtOperator op, int uct = 1) {
+			Operator = op;
+			UpdateCloneType = uct;
+		}
+	}
 }

Assets/Cryville/Crtr/Components/SpriteBase.cs

@@ -2,14 +2,12 @@
 using UnityEngine;
 
 namespace Cryville.Crtr.Components {
-	public abstract class SpriteBase : SkinComponent {
+	public abstract class SpriteBase : MeshBase {
 		public SpriteBase() {
 			SubmitProperty("bound", new op_set_bound(this));
-			SubmitProperty("transparent", new PropOp.Boolean(v => transparent = v));
 			SubmitProperty("pivot", new PropOp.Vector2(v => Pivot = v));
 			SubmitProperty("scale", new PropOp.Vector2(v => Scale = v));
 			SubmitProperty("ui", new PropOp.Boolean(v => UI = v));
-			SubmitProperty("zindex", new PropOp.Integer(v => ZIndex = (short)v));
 		}
 
 #pragma warning disable IDE1006
@@ -27,8 +25,6 @@ namespace Cryville.Crtr.Components {
 		}
 #pragma warning restore IDE1006
 
-		protected MeshWrapper mesh = new MeshWrapper();
-
 		protected override void OnDestroy() {
 			mesh.Destroy();
 		}
@@ -82,21 +78,6 @@ namespace Cryville.Crtr.Components {
 			if (da.x != 0) _scale.x = dp.x / da.x;
 			if (da.y != 0) _scale.y = dp.z / da.y;
 		}
-		
-		short _zindex;
-		public short ZIndex {
-			get {
-				return _zindex;
-			}
-			set {
-				_zindex = value;
-				UpdateZIndex();
-			}
-		}
-		protected void UpdateZIndex() {
-			if (!mesh.Initialized) return;
-			mesh.Renderer.sortingOrder = _zindex;
-		}
 
 		static readonly Quaternion uirot
 			= Quaternion.Euler(new Vector3(-90, 0, 0));
@@ -109,10 +90,8 @@ namespace Cryville.Crtr.Components {
 			}
 		}
 
-		public bool transparent = false;
-
 		protected void InternalInit(string meshName = "quad") {
-			mesh.Init(transform, transparent);
+			mesh.Init(transform);
 			mesh.Mesh = GenericResources.Meshes[meshName];
 			UpdateScale();
 			UpdateZIndex();

Assets/Cryville/Crtr/Components/SpritePlane.cs

@@ -4,13 +4,22 @@ using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr.Components {
 	public class SpriteInfo {
-		public string FrameName;
-		public Cocos2dFrames.Frame Frame {
+		string m_frameName;
+		public string FrameName {
+			get {
+				return m_frameName;
+			}
+			set {
+				m_frameName = value;
+				Reload();
+			}
+		}
+		public SpriteFrame Frame {
 			get;
 			private set;
 		}
 		public Rect Rect {
-			get { return Frame.frame; }
+			get { return Frame.Frame; }
 		}
 		/// <summary>
 		/// The ratio of width divided by height.
@@ -20,22 +29,39 @@ namespace Cryville.Crtr.Components {
 				return Rect.width / Rect.height;
 			}
 		}
+		bool _loaded;
+		Material _mat;
+		public void Bind(Material mat) {
+			_loaded = true;
+			_mat = mat;
+			Reload();
+		}
 		public void Load() {
-			if (FrameName != null) {
+			_loaded = true;
+			Reload();
+		}
+		public void Reload() {
+			if (!_loaded) return;
+			if (!string.IsNullOrEmpty(FrameName)) {
 				if (ChartPlayer.frames.ContainsKey(FrameName)) {
 					Frame = ChartPlayer.frames[FrameName];
 				}
 				else {
 					Logger.Log("main", 4, "Skin", "Texture {0} not found", FrameName);
+					Frame = null;
 				}
 			}
+			else Frame = null;
+			if (_mat != null) {
+				_mat.mainTexture = Frame == null ? null : Frame.Texture;
+			}
 		}
 	}
 
 	public class SpritePlane : SpriteBase {
 		public SpritePlane() {
 			SubmitProperty("frame", new PropOp.String(v => Frame = v));
-			SubmitProperty("fit", new PropOp.Enum<FitMode>(v => Fit = v));
+			SubmitProperty("fit", new PropOp.Enum<FitMode>(v => Fit = v, v => (FitMode)v));
 			SubmitProperty("opacity", new PropOp.Float(v => Opacity = v));
 		}
 
@@ -68,16 +94,11 @@ namespace Cryville.Crtr.Components {
 		}
 		protected void OnFrameUpdate() {
 			if (!mesh.Initialized) return;
-			if (frameInfo.FrameName == null) {
+			if (frameInfo.Frame == null) {
 				mesh.Renderer.enabled = false;
 				return;
 			}
 			mesh.Renderer.enabled = true;
-			frameInfo.Load();
-			if (frameInfo.Frame != null)
-				mesh.Renderer.material.mainTexture = frameInfo.Frame.Texture;
-			else
-				Logger.Log("main", 4, "Skin", "Unable to load texture {0}", frameInfo.FrameName);
 			UpdateUV();
 			UpdateScale();
 			UpdateZIndex();
@@ -140,8 +161,8 @@ namespace Cryville.Crtr.Components {
 		}
 
 		public override void Init() {
-			frameInfo.Load();
 			InternalInit();
+			frameInfo.Bind(mesh.Renderer.material);
 			OnFrameUpdate();
 			UpdateOpacity();
 		}

Assets/Cryville/Crtr/Components/SpriteRect.cs

@@ -4,8 +4,6 @@ namespace Cryville.Crtr.Components {
 	public class SpriteRect : SpriteBase {
 		public SpriteRect() {
 			SubmitProperty("color", new PropOp.Color(v => Color = v));
-
-			transparent = true;
 		}
 
 		Color _color;

Assets/Cryville/Crtr/Components/SpriteScale3.cs

@@ -63,13 +63,13 @@ namespace Cryville.Crtr.Components {
 					case 1: x = _border.x; bx = b.x; break;
 					case 2: x = _border.y; bx = b.y; break;
 					case 3: x = 1; bx = 1; break;
-					default: throw new Exception();
+					default: throw new NotSupportedException("Built-in resource corrupted");
 				}
 				float y;
 				switch ((int)muv[i].y) {
 					case 0: y = 0; break;
 					case 3: y = 1; break;
-					default: throw new Exception();
+					default: throw new NotSupportedException("Built-in resource corrupted");
 				}
 				uv[i] = frameInfo.Frame.GetUV(x, y);
 				bx -= 0.5f; y -= 0.5f;

Assets/Cryville/Crtr/Components/SpriteText.cs

@@ -1,4 +1,5 @@
-using Cryville.Common.Pdt;
+using Cryville.Common.Buffers;
+using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -7,7 +8,7 @@ namespace Cryville.Crtr.Components {
 	public class SpriteText : SpriteBase {
 		public SpriteText() {
 			SubmitProperty("frames", new op_set_frames(this));
-			SubmitProperty("value", new PropOp.String(v => Value = v));
+			SubmitProperty("value", new PropOp.TargetString(() => Value));
 			SubmitProperty("size", new PropOp.Float(v => Size = v));
 			SubmitProperty("spacing", new PropOp.Float(v => Spacing = v));
 			SubmitProperty("opacity", new PropOp.Float(v => Opacity = v));
@@ -41,21 +42,14 @@ namespace Cryville.Crtr.Components {
 			foreach (var m in meshes) m.Value.Destroy();
 		}
 
-		readonly Dictionary<Texture2D, MeshWrapper> meshes = new Dictionary<Texture2D, MeshWrapper>();
 		Dictionary<char, SpriteInfo> m_frames;
 		public Dictionary<char, SpriteInfo> Frames {
 			get { return m_frames; }
 			set { m_frames = value; UpdateFrames(); UpdateScale(); }
 		}
 
-		public string m_value;
-		public string Value {
-			get { return m_value; }
-			set {
-				if (m_value == value) return;
-				m_value = value; UpdateScale();
-			}
-		}
+		readonly TargetString m_value = new TargetString();
+		public TargetString Value { get { return m_value; } }
 
 		public float m_size;
 		public float Size {
@@ -80,31 +74,38 @@ namespace Cryville.Crtr.Components {
 			float frameHeight = 0;
 			foreach (var m in meshes) m.Value.Destroy();
 			meshes.Clear();
+			verts.Clear();
+			uvs.Clear();
 			foreach (var f in m_frames) {
 				f.Value.Load();
 				if (frameHeight == 0) frameHeight = f.Value.Rect.height;
-				else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height");
-				if (!meshes.ContainsKey(f.Value.Frame.Texture)) {
+				else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height for text component");
+				var tex = f.Value.Frame.Texture;
+				if (!meshes.ContainsKey(tex)) {
 					var m = new MeshWrapper();
-					m.Init(mesh.MeshTransform, transparent);
+					m.Init(mesh.MeshTransform);
 					m.Mesh = new Mesh();
-					m.Renderer.material.mainTexture = f.Value.Frame.Texture;
-					meshes.Add(f.Value.Frame.Texture, m);
+					m.Renderer.material.mainTexture = tex;
+					meshes.Add(tex, m);
+					verts.Add(tex, new List<Vector3>());
+					uvs.Add(tex, new List<Vector2>());
+					tris.Add(tex, new List<int>());
 				}
 			}
 		}
 
 		float sum_x;
+		readonly Dictionary<Texture2D, MeshWrapper> meshes = new Dictionary<Texture2D, MeshWrapper>();
+		readonly Dictionary<Texture2D, List<Vector3>> verts = new Dictionary<Texture2D, List<Vector3>>();
+		readonly Dictionary<Texture2D, List<Vector2>> uvs = new Dictionary<Texture2D, List<Vector2>>();
+		readonly Dictionary<Texture2D, List<int>> tris = new Dictionary<Texture2D, List<int>>();
 		void UpdateMeshes() {
-			// TODO optimize GC
 			if (meshes.Count == 0) return;
 			sum_x = 0;
-			int vc = m_value.Length * 4;
-			Dictionary<Texture2D, List<Vector3>> verts = new Dictionary<Texture2D, List<Vector3>>();
-			Dictionary<Texture2D, List<Vector2>> uvs = new Dictionary<Texture2D, List<Vector2>>();
 			foreach (var t in meshes.Keys) {
-				verts.Add(t, new List<Vector3>(vc));
-				uvs.Add(t, new List<Vector2>(vc));
+				verts[t].Clear();
+				uvs[t].Clear();
+				tris[t].Clear();
 			}
 			foreach (var c in m_value) {
 				var f = m_frames[c];
@@ -124,18 +125,18 @@ namespace Cryville.Crtr.Components {
 				var m = meshes[t].Mesh;
 				m.Clear();
 				int cc = verts[t].Count / 4;
-				int[] tris = new int[cc * 6];
+				var _tris = tris[t];
 				for (int i = 0; i < cc; i++) {
-					tris[i * 6    ] = i * 4    ;
-					tris[i * 6 + 1] = i * 4 + 3;
-					tris[i * 6 + 2] = i * 4 + 1;
-					tris[i * 6 + 3] = i * 4 + 1;
-					tris[i * 6 + 4] = i * 4 + 3;
-					tris[i * 6 + 5] = i * 4 + 2;
+					_tris.Add(i * 4);
+					_tris.Add(i * 4 + 3);
+					_tris.Add(i * 4 + 1);
+					_tris.Add(i * 4 + 1);
+					_tris.Add(i * 4 + 3);
+					_tris.Add(i * 4 + 2);
 				}
-				m.vertices = verts[t].ToArray();
-				m.uv = uvs[t].ToArray();
-				m.triangles = tris;
+				m.SetVertices(verts[t]);
+				m.SetUVs(0, uvs[t]);
+				m.SetTriangles(tris[t], 0);
 				m.RecalculateNormals();
 			}
 			sum_x -= m_spacing;
@@ -175,6 +176,7 @@ namespace Cryville.Crtr.Components {
 			UpdateFrames();
 			mesh.Mesh.Clear();
 			UpdateScale();
+			Value.OnUpdate += UpdateScale;
 		}
 	}
 }

Assets/Cryville/Crtr/Config/ConfigScene.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr.Config {
 	public class ConfigScene : MonoBehaviour {
@@ -19,40 +20,49 @@ namespace Cryville.Crtr.Config {
 		public Ruleset ruleset;
 		RulesetConfig _rscfg;
 
-		void Awake() {
-			ChartPlayer.etor = new PdtEvaluator();
-			FileInfo file = new FileInfo(
-				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
-			);
-			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 != 1) 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() {
+		void Start() {
+			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;
+			}
+			catch (Exception ex) {
+				Popup.CreateException(ex);
+				Logger.Log("main", 4, "Config", "An error occured while loading the config: {0}", ex);
+				ReturnToMenu();
 			}
-
-			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) {
@@ -62,8 +72,7 @@ namespace Cryville.Crtr.Config {
 			cat.SetActive(true);
 		}
 
-		public void ReturnToMenu() {
-			Game.InputManager.Deactivate();
+		public void SaveAndReturnToMenu() {
 			m_inputConfigPanel.proxy.SaveTo(_rscfg.inputs);
 			m_inputConfigPanel.proxy.Dispose();
 			FileInfo cfgfile = new FileInfo(
@@ -72,6 +81,9 @@ namespace Cryville.Crtr.Config {
 			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");

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -24,14 +24,16 @@ namespace Cryville.Crtr.Config {
 		[SerializeField]
 		GameObject m_prefabInputConfigEntry;
 
+		readonly SimpleInputConsumer _consumer = new SimpleInputConsumer(Game.InputManager);
 		public InputProxy proxy;
-		Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
+		readonly Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
 
 		string _sel;
 		public void OpenDialog(string entry) {
 			_sel = entry;
 			m_inputDialog.SetActive(true);
 			CallHelper.Purge(m_deviceList);
+			_consumer.EnumerateEvents(ev => { });
 			_recvsrcs.Clear();
 			AddSourceItem(null);
 		}
@@ -45,10 +47,11 @@ namespace Cryville.Crtr.Config {
 				Target = _sel,
 				Source = src,
 			});
-			m_inputDialog.SetActive(false);
+			CloseDialog();
 		}
 
 		void Start() {
+			_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);
@@ -58,6 +61,10 @@ namespace Cryville.Crtr.Config {
 			proxy.ProxyChanged += OnProxyChanged;
 		}
 
+		void OnDestroy() {
+			_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));
@@ -66,7 +73,7 @@ namespace Cryville.Crtr.Config {
 		readonly List<InputSource?> _recvsrcs = new List<InputSource?>();
 		void Update() {
 			if (m_inputDialog.activeSelf) {
-				Game.InputManager.EnumerateEvents(ev => {
+				_consumer.EnumerateEvents(ev => {
 					AddSourceItem(ev.Id.Source);
 				});
 			}

Assets/Cryville/Crtr/DiscordController.cs

@@ -0,0 +1,78 @@
+using Discord;
+using System;
+using UnityEngine;
+using Logger = Cryville.Common.Logger;
+
+namespace Cryville.Crtr {
+	internal class DiscordController : MonoBehaviour {
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+		public static DiscordController Instance;
+
+		const long CLIENT_ID = 1059021675578007622L;
+
+		Discord.Discord dc;
+		ActivityManager am;
+		long launchTime;
+
+		void Start() {
+			Instance = this;
+			launchTime = (long)(DateTime.UtcNow - DateTime.UnixEpoch).TotalSeconds;
+			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() {
+			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,
+				Timestamps = { Start = launchTime },
+			}, Callback);
+		}
+
+		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",
+				Details = detail,
+				Instance = true,
+				Timestamps = {
+					Start = now,
+					End = duration == null ? 0 : now + (long)duration,
+				},
+			}, Callback);
+		}
+#endif
+	}
+}

Assets/Cryville/Crtr/DiscordController.cs.meta

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

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -1,10 +1,18 @@
+using Cryville.Common;
+using Cryville.Common.Buffers;
 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>
@@ -33,105 +41,180 @@ 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<string, Anchor> Anchors = new Dictionary<string, Anchor>();
-		public Transform a_head;
-		public Transform a_tail;
-		public Vector3 Position {
-			get;
-			protected set;
+		public Vector3 Position { get; protected set; }
+		public Quaternion Rotation { get; protected set; }
+		public bool Alive { 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);
 		}
-		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 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; }
 		}
-		
-		public ContainerHandler() { }
-		public abstract string TypeName {
-			get;
+
+		SkinContainer skinContainer;
+		protected Judge judge;
+		public void AttachSystems(PdtSkin skin, Judge judge) {
+			skinContainer = new SkinContainer(skin);
+			this.judge = judge;
 		}
+
+		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;
+		protected Anchor a_cur;
+		protected Anchor a_head;
+		protected Anchor a_tail;
+		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 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(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");
+			OpenedAnchor = anchor;
+		}
+		protected void CloseAnchor() {
+			OpenedAnchor = null;
+		}
+		#endregion
+
+		#region Logic
+		#region Init methods: Called on prehandle
 		public virtual void PreInit() {
-			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString()).transform;
+			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_head = new GameObject("::head").transform;
-			a_head.SetParent(gogroup, false);
-			Anchors.Add("head", new Anchor() { Transform = a_head });
-			a_tail = new GameObject("::tail").transform;
-			a_tail.SetParent(gogroup, false);
-			Anchors.Add("tail", new Anchor() { Transform = a_tail });
+			a_cur = RegisterAnchor(_a_cur);
+			a_head = RegisterAnchor(_a_head, true);
+			a_tail = RegisterAnchor(_a_tail, true);
 		}
-		/// <summary>
-		/// Called upon initialization of <see cref="cs" />.
-		/// </summary>
 		public virtual void Init() {
-			cs.skinContainer.MatchStatic(cs);
+			skinContainer.MatchStatic(ps);
 			foreach (var i in gogroup.GetComponentsInChildren<SkinComponent>())
 				i.Init();
 		}
 		public virtual void PostInit() {
 			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 (tev.Target == a_head) {
+					SetGraphicalActive(true, s);
+				}
+				else if (tev.Target == a_tail) {
+					SetGraphicalActive(false, s);
+				}
+				if (gogroup) {
+					OpenAnchor(tev.Target);
+#if UNITY_5_6_OR_NEWER
+					tev.Target.Transform.SetPositionAndRotation(Position, Rotation);
+#else
+					tev.Target.Transform.position = GetCurrentWorldPoint();
+					tev.Target.Transform.rotation = Quaternion.Euler(s.Direction);
+#endif
+					skinContainer.MatchDynamic(s);
+					CloseAnchor();
+				}
+				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("head");
-		}
-		protected virtual void Awake(ContainerState s) {
-			CloseAnchor("head");
-		}
-		protected virtual void GetPosition(ContainerState s) { }
-		public virtual void StartUpdate(ContainerState s) {
-			if (s.CloneType >= 2 && s.CloneType < 16) {
-				PreAwake(s);
-				Awake(s);
+		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 a in DynamicAnchors.Keys) DynamicAnchorSet[a] = false;
+			skinContainer.MatchDynamic(cs);
+			if (cs.Active) PushAnchorEvent(cs.Time, a_cur);
+			if (Alive) {
+				if (!DynamicAnchorSet[_a_head]) PushAnchorEvent(cs.StampedContainer.Time, a_head, -1, true);
+				if (!DynamicAnchorSet[_a_tail]) PushAnchorEvent(cs.StampedContainer.Time + cs.StampedContainer.Duration, a_tail, 1, true);
 			}
 		}
-		public virtual void Update(ContainerState s, StampedEvent ev) {
-			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
-			if (flag) PreAwake(s);
-			if (Awoken && s.CloneType <= 2) if (gogroup) cs.skinContainer.MatchDynamic(s);
-			if (flag) Awake(s);
+		static readonly SimpleObjectPool<StampedEvent.Anchor> anchorEvPool
+			= new SimpleObjectPool<StampedEvent.Anchor>(1024);
+		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)));
+			PushAnchorEvent(time, anchor);
+			DynamicAnchorSet[name] = true;
 		}
-		public virtual void ExUpdate(ContainerState s, StampedEvent 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) cs.skinContainer.MatchDynamic(s);
+		void PushAnchorEvent(double time, Anchor anchor, int priority = 0, bool forced = false) {
+			var tev = anchorEvPool.Rent();
+			tev.Time = time;
+			tev.Container = Container;
+			tev.Target = anchor;
+			tev.CanDiscard = !forced;
+			tev.SetPriority(priority);
+			ts.Bus.PushTempEvent(tev);
+		}
+		public virtual void Discard(ContainerState s, StampedEvent ev) {
+			if (ev is StampedEvent.Anchor) {
+				anchorEvPool.Return((StampedEvent.Anchor)ev);
 			}
 		}
-		public virtual void Anchor() { }
-		protected void OpenAnchor(string name) {
-			if (Anchors.ContainsKey(name)) Anchors[name].Open();
-		}
-		protected void CloseAnchor(string name) {
-			if (Anchors.ContainsKey(name)) Anchors[name].Close();
-		}
+		#endregion
+		#endregion
 	}
 }

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -3,20 +3,21 @@
 using Cryville.Common;
 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,74 +29,61 @@ 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;
+		public ContainerState rootPrototype = null;
 		private ContainerState prototype = null;
-		public SkinContainer skinContainer;
-		public Judge judge;
 
 		public ContainerHandler Handler {
 			get;
 			private set;
 		}
 
-		public float Time {
+		public double Time {
 			get {
 				return Bus.Time;
 			}
 		}
 
-		readonly RMVPool RMVPool = new RMVPool();
-		protected Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new Dictionary<StampedEvent, RealtimeMotionValue>();
-		protected Dictionary<Identifier, RealtimeMotionValue> Values;
-		protected Dictionary<Identifier, Vector> CachedValues;
-		protected Dictionary<Identifier, bool> CachedValueStates;
-
-		/// <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) {
-			CachedValueStates[name] = 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) {
@@ -104,10 +92,11 @@ namespace Cryville.Crtr.Event {
 			}
 
 			Values = new Dictionary<Identifier, RealtimeMotionValue>(ChartPlayer.motionRegistry.Count);
-			CachedValues = new Dictionary<Identifier, Vector>(ChartPlayer.motionRegistry.Count);
-			CachedValueStates = new Dictionary<Identifier, bool>(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) {
@@ -126,18 +115,14 @@ namespace Cryville.Crtr.Event {
 			}
 			r.Values = mvs;
 
-			var cvs = new Dictionary<Identifier, Vector>(ChartPlayer.motionRegistry.Count);
+			var cvs = new Dictionary<Identifier, MotionCache>(ChartPlayer.motionRegistry.Count);
 			foreach (var cv in CachedValues) {
-				cvs.Add(cv.Key, cv.Value.Clone());
+				var dv = r.MCPool.Rent(cv.Key);
+				cv.Value.CopyTo(dv);
+				cvs.Add(cv.Key, dv);
 			}
 			r.CachedValues = cvs;
 
-			var cvss = new Dictionary<Identifier, bool>(ChartPlayer.motionRegistry.Count);
-			foreach (var cv in CachedValueStates) {
-				cvss.Add(cv.Key, cv.Value);
-			}
-			r.CachedValueStates = cvss;
-
 			r.Children = new Dictionary<EventContainer, ContainerState>();
 			foreach (var child in Children) {
 				var cc = child.Value.Clone(ct);
@@ -145,7 +130,9 @@ namespace Cryville.Crtr.Event {
 				AddChild(child.Key, cc, 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;
@@ -156,14 +143,15 @@ namespace Cryville.Crtr.Event {
 			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,25 @@ 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) {
-				Vector dv;
-				if(dest.CachedValues.TryGetValue(cv.Key, out dv)) cv.Value.CopyTo(dv);
-				else dest.CachedValues.Add(cv.Key, cv.Value.Clone());
+				MotionCache dv;
+				if (!dest.CachedValues.TryGetValue(cv.Key, out dv)) {
+					dest.CachedValues.Add(cv.Key, dv = dest.MCPool.Rent(cv.Key));
+				}
+				cv.Value.CopyTo(dv);
 			}
-			foreach (var cvs in CachedValueStates) dest.CachedValueStates[cvs.Key] = cvs.Value;
 
-			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();
+			}
 
-			RMVPool.ReturnAll();
 			dest.PlayingMotions.Clear();
 			foreach (var m in PlayingMotions) dest.PlayingMotions.Add(m.Key, m.Value);
 		}
@@ -196,41 +189,72 @@ namespace Cryville.Crtr.Event {
 		public void Dispose() {
 			if (Disposed) return;
 			Disposed = true;
-			if (CloneType < 16 && Handler != null) Handler.Dispose();
+			if (CloneType == 1) Handler.Dispose();
 			foreach (var s in Children)
 				s.Value.Dispose();
 			RMVPool.ReturnAll();
+			MCPool.ReturnAll();
+		}
+		public void DisposeAll() {
+			foreach (var s in Children)
+				s.Value.DisposeAll();
+			Handler.DisposeAll();
 		}
 
 		public void AttachHandler(ContainerHandler h) {
 			if (Handler != null)
-				throw new InvalidOperationException();
+				throw new InvalidOperationException("Handler attached twice");
 			Handler = h;
 			h.cs = this;
 		}
 
 		public void AttachSystems(PdtSkin skin, Judge judge) {
-			skinContainer = new SkinContainer(skin);
-			this.judge = judge;
+			Handler.AttachSystems(skin, judge);
+		}
+		#endregion
+
+		#region Motion
+		readonly RMVPool RMVPool = new RMVPool();
+		readonly MotionCachePool MCPool = new MotionCachePool();
+		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 = MCPool.Rent(name));
+			cache.Valid = false;
+			foreach (var c in ActiveChildren)
+				Children[c].InvalidateMotion(name);
 		}
 
 		public Vector GetRawValue(Identifier key) {
-			Vector tr;
-			if (!CachedValues.TryGetValue(key, out tr)) {
-				tr = (Vector)ReflectionHelper.InvokeEmptyConstructor(ChartPlayer.motionRegistry[key].Type);
-				CachedValues.Add(key, tr);
-				CachedValueStates[key] = false;
-			}
-			Vector r = tr;
+			MotionCache tr;
+			if (!CachedValues.TryGetValue(key, out tr))
+				CachedValues.Add(key, tr = MCPool.Rent(key));
+			Vector r = tr.Value;
 #if !DISABLE_CACHE
-			if (CachedValueStates[key]) return r;
+			if (tr.Valid) return r;
 #endif
 			float reltime = 0;
-			if (rootPrototype != null) reltime = Time - rootPrototype.Time;
+			if (rootPrototype != null) reltime = (float)(Time - rootPrototype.Time);
 			GetMotionValue(key).GetValue(reltime, ref r);
 			if (Parent != null) r.ApplyFrom(Parent.GetRawValue(key));
 #if !DISABLE_CACHE
-			CachedValueStates[key] = true;
+			tr.Valid = true;
 #endif
 			return r;
 		}
@@ -309,70 +333,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);
+					mv.CloneTypeFlag = CloneType;
 					GetMotionValue(tev.Name).CopyTo(mv);
 					PlayingMotions.Add(ev, mv);
-					Callback(ev, callback);
-					if (!ev.Unstamped.IsLong)
+					Update(ev);
+					if (!ev.Unstamped.IsLong) {
 						PlayingMotions.Remove(ev);
+						RMVPool.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);
-							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) RMVPool.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() {
@@ -390,7 +414,7 @@ namespace Cryville.Crtr.Event {
 					}
 				}
 				else {
-					var scaledTime = (Time - m.Key.Time - ChartPlayer.actualRenderStep * tev.sumfix) / m.Key.Duration;
+					var scaledTime = (float)((Time - m.Key.Time - ChartPlayer.actualRenderStep * tev.sumfix) / m.Key.Duration);
 					var lerpedTime = MotionLerper.GetEaseTime(scaledTime, tev.transition, tev.rate);
 					if (tev.RelativeNode != null) {
 						var target = value.QueryRelativeNode(tev.RelativeNode.Id);
@@ -404,23 +428,30 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 
-		public void BroadcastInit() {
+		public void BroadcastPreInit() {
 			Handler.PreInit();
-			Handler.Init();
-			foreach (var s in Children) {
-				s.Value.BroadcastInit();
+			foreach (var c in Children.Values) {
+				c.BroadcastPreInit();
 			}
+		}
+		public void BroadcastPostInit() {
 			Handler.PostInit();
+			foreach (var c in Children.Values) {
+				c.BroadcastPostInit();
+			}
 		}
 
-		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();
 			}
 		}
 
@@ -430,5 +461,6 @@ namespace Cryville.Crtr.Event {
 				if (ls.Handler.Alive) ls.Anchor();
 			}
 		}
+		#endregion
 	}
 }

Assets/Cryville/Crtr/Event/EventBatch.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Cryville.Crtr.Event {
 	public class EventBatch : IComparable<EventBatch>, IEnumerable<StampedEvent> {
-		public float Time {
+		public double Time {
 			get;
 			private set;
 		}
@@ -14,7 +14,7 @@ namespace Cryville.Crtr.Event {
 			get { return queue.Count; }
 		}
 
-		public EventBatch(float time) {
+		public EventBatch(double time) {
 			Time = time;
 		}
 
@@ -32,7 +32,7 @@ namespace Cryville.Crtr.Event {
 		}
 
 		public int CompareTo(EventBatch other) {
-			return this.Time.CompareTo(other.Time);
+			return Time.CompareTo(other.Time);
 		}
 
 		public IEnumerator<StampedEvent> GetEnumerator() {

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>();
-		
-		float beat;
+
+		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) {
+					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(float toTime, Action<ChartEvent> callback) {
-			float toBeat = (float)Math.Round(beat + (toTime - Time) * tempo / 60f, 6);
-			if (EventId >= events.Count)
+		public override void ForwardOnceToTime(double toTime) {
+			double toBeat = Math.Round(beat + (toTime - Time) * tempo / 60f, 6);
+			if (EventId >= Events.Count)
 				goto return_ahead;
-			float ebeat = events[EventId].BeatPosition;
-			float etime = (float)Math.Round((ebeat - beat) / tempo * 60f + Time, 6);
+			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

@@ -11,28 +11,25 @@ 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.Temporary>();
 			r.Time += offsetTime;
 			r.RootState = RootState.Clone(ct);
 			r.Expand();
@@ -44,26 +41,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);
 		}
 
@@ -82,12 +73,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;
@@ -98,64 +83,109 @@ namespace Cryville.Crtr.Event {
 				s.AttachSystems(skin, judge);
 		}
 
-		readonly List<StampedEvent> patch = new List<StampedEvent>();
-		public void IssuePatch(IEnumerable<StampedEvent> l) {
-			patch.AddRange(l);
-		}
-		public void DoPatch() {
-			foreach (var ev in patch) {
-				var batch = new EventBatch(ev.Time);
-				var batchIndex = events.BinarySearch(batch);
-				if (batchIndex >= 0) batch = events[batchIndex];
-				else events.Insert(~batchIndex, batch);
-				batch.Add(ev);
-			}
-			patch.Clear();
+		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(float toTime, Action<EventBatch> callback = null) {
-			if (EventId < events.Count && events[EventId].Time <= toTime) {
-				Time = events[EventId].Time;
-				var batch = events[EventId];
-				foreach (var s in workingStates) s.Handle(null);
-				ValidateStates();
-				for (var i = 0; i < batch.Count; i++) {
-					var ev = batch[i];
+		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) {
-						EnsureActivity(ev.Container);
-						states[ev.Container].Handle(ev);
-					}
-					if (ev.Unstamped is EventContainer) {
-						if (ev.Container != null) EnsureActivity((EventContainer)ev.Unstamped);
+						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 activeStates) s.Handle(null);
 				ValidateStates();
-				EventId++;
+				if (time1 == time0) {
+					var batch = Events[EventId];
+					for (var i = 0; i < batch.Count; i++) {
+						var ev = batch[i];
+						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;
+						}
+						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.Time != time0) break;
+						if (ev.Container != null) {
+							states[ev.Container].Handle(ev);
+						}
+						tempEvents.RemoveAt(0);
+					}
+				}
 			}
 			else {
 				Time = toTime;
-				foreach (var s in workingStates) s.Handle(null);
-				ValidateStates();
+				foreach (var s in activeStates) s.Handle(null);
 			}
+			ValidateStates();
 		}
 
 		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();
 		}
-
-		public void BroadcastInit() {
-			RootState.BroadcastInit();
-		}
 		
-		public void BroadcastEndUpdate() {
-			RootState.BroadcastEndUpdate();
+		public void BroadcastPreInit() {
+			RootState.BroadcastPreInit();
+		}
+		public void BroadcastPostInit() {
+			RootState.BroadcastPostInit();
+		}
+
+		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,55 @@
+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 {
+		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;
+			}
+		}
+		static Dictionary<Identifier, Bucket> _buckets;
+		public static void Prepare() {
+			_buckets = new Dictionary<Identifier, Bucket>(ChartPlayer.motionRegistry.Count);
+			foreach (var reg in ChartPlayer.motionRegistry)
+				_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
+		}
+
+		static readonly SimpleObjectPool<Dictionary<MotionCache, Identifier>> _dictPool
+			= new SimpleObjectPool<Dictionary<MotionCache, Identifier>>(1024);
+		Dictionary<MotionCache, Identifier> _rented;
+		public MotionCache Rent(Identifier name) {
+			var obj = _buckets[name].Rent();
+			obj.Valid = false;
+			if (_rented == null) _rented = _dictPool.Rent();
+			_rented.Add(obj, name);
+			return obj;
+		}
+		public void Return(MotionCache obj) {
+			_buckets[_rented[obj]].Return(obj);
+			_rented.Remove(obj);
+		}
+		public void ReturnAll() {
+			if (_rented == null) return;
+			foreach (var obj in _rented)
+				_buckets[obj.Value].Return(obj.Key);
+			_rented.Clear();
+			_dictPool.Return(_rented);
+		}
+	}
+}

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

@@ -20,11 +20,13 @@ namespace Cryville.Crtr.Event {
 				_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
 		}
 
-		readonly Dictionary<RealtimeMotionValue, string> _rented = new Dictionary<RealtimeMotionValue, string>();
+		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();
-			_rented.Add(obj, n);
+			var obj = _buckets[name].Rent();
+			if (_rented == null) _rented = _dictPool.Rent();
+			_rented.Add(obj, name);
 			return obj;
 		}
 		public void Return(RealtimeMotionValue obj) {
@@ -32,9 +34,11 @@ namespace Cryville.Crtr.Event {
 			_rented.Remove(obj);
 		}
 		public void ReturnAll() {
+			if (_rented == null) return;
 			foreach (var obj in _rented)
 				_buckets[obj.Value].Return(obj.Key);
 			_rented.Clear();
+			_dictPool.Return(_rented);
 		}
 	}
 }

Assets/Cryville/Crtr/Extensions/Bestdori.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b9bd9e24d7c553341a2a12391843542f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,189 @@
+using Cryville.Common;
+using Cryville.Common.Math;
+using Cryville.Crtr.Browsing;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+namespace Cryville.Crtr.Extensions.Bestdori {
+	public class BestdoriChartConverter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".bestdori" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			List<Resource> result = new List<Resource>();
+			List<BestdoriChartEvent> src;
+			using (var reader = new StreamReader(file.FullName)) {
+				src = JsonConvert.DeserializeObject<List<BestdoriChartEvent>>(reader.ReadToEnd());
+			}
+			var group = new Chart.Group() {
+				tracks = new List<Chart.Track>(),
+				notes = new List<Chart.Note>(),
+				motions = new List<Chart.Motion>(),
+			};
+			Chart chart = new Chart {
+				format = 2,
+				time = new BeatTime(0, 0, 1),
+				ruleset = "bang_dream_girls_band_party",
+				sigs = new List<Chart.Signature>(),
+				sounds = new List<Chart.Sound>(),
+				motions = new List<Chart.Motion>(),
+				groups = new List<Chart.Group> { group },
+			};
+			var tm = new BeatTimeTimingModel();
+			string bgm = null;
+			double endbeat = 0;
+			foreach (var ev in src) {
+				tm.ForwardTo(ev.StartBeat);
+				if (ev.StartBeat > endbeat) endbeat = ev.StartBeat;
+				if (ev is BestdoriChartEvent.System) {
+					if (bgm != null) continue;
+					var tev = (BestdoriChartEvent.System)ev;
+					bgm = StringUtils.TrimExt(tev.data);
+					var name = "bang_dream_girls_band_party__" + bgm;
+					result.Add(new SongResource(name, new FileInfo(Path.Combine(file.Directory.FullName, tev.data))));
+					chart.sounds.Add(new Chart.Sound { time = ToBeatTime(tev.beat), id = name });
+				}
+				else if (ev is BestdoriChartEvent.BPM) {
+					var tev = (BestdoriChartEvent.BPM)ev;
+					tm.BPM = tev.bpm;
+					chart.sigs.Add(new Chart.Signature { time = ToBeatTime(tev.beat), tempo = (float)tev.bpm });
+				}
+				else if (ev is BestdoriChartEvent.Single) {
+					var tev = (BestdoriChartEvent.Single)ev;
+					group.notes.Add(new Chart.Note {
+						time = ToBeatTime(tev.beat),
+						judges = new List<Chart.Judge> { new Chart.Judge { name = tev.flick ? "single_flick" : "single" } },
+						motions = new List<Chart.Motion> { new Chart.Motion { motion = "track:" + tev.lane.ToString(CultureInfo.InvariantCulture) } },
+					});
+				}
+				else if (ev is BestdoriChartEvent.Long) {
+					var tev = (BestdoriChartEvent.Long)ev;
+					var c1 = tev.connections[tev.connections.Count - 1];
+					var note = new Chart.Note {
+						time = ToBeatTime(tev.connections[0].beat),
+						endtime = ToBeatTime(c1.beat),
+						judges = new List<Chart.Judge>(),
+					};
+					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(motion);
+						}
+						else {
+							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 = cbeat, name = c.flick ? "longend_flick" : "longend" });
+							else if (!c.hidden)
+								note.judges.Add(new Chart.Judge { time = cbeat, name = "longnode" });
+						}
+					}
+					if (c1.beat > endbeat) endbeat = c1.beat;
+					group.notes.Add(note);
+				}
+				else throw new NotImplementedException("Unsupported event: " + ev.type);
+			}
+			if (bgm == null) throw new FormatException("Chart contains no song");
+			chart.endtime = ToBeatTime(endbeat + 4);
+			if (endbeat > tm.BeatTime) tm.ForwardTo(endbeat);
+			result.Add(new RawChartResource(string.Format("bang_dream_girls_band_party__{0}__{1}", bgm, StringUtils.TrimExt(file.Name)), chart, new ChartMeta {
+				name = string.Format("Bandori {0} {1}", bgm, StringUtils.TrimExt(file.Name)),
+				author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",
+				ruleset = "bang_dream_girls_band_party",
+				note_count = group.notes.Count,
+				length = (float)tm.Time,
+				song = new SongMetaInfo {
+					name = bgm,
+					author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",
+				}
+			}));
+			return result;
+		}
+
+		BeatTime ToBeatTime(double beat, double error = 1e-4) {
+			int i, n, d;
+			FractionUtils.ToFraction(beat, error, out n, out d);
+			i = n / d; n %= d;
+			return new BeatTime(i, n, d);
+		}
+
+#pragma warning disable IDE1006
+		[JsonConverter(typeof(BestdoriChartEventCreator))]
+		abstract class BestdoriChartEvent {
+			public abstract string type { get; }
+			public abstract double StartBeat { get; }
+			public abstract class InstantEvent : BestdoriChartEvent {
+				public double beat;
+				public override double StartBeat { get { return beat; } }
+			}
+			public class BPM : InstantEvent {
+				public override string type { get { return "BPM"; } }
+				public double bpm;
+			}
+			public class System : InstantEvent {
+				public override string type { get { return "System"; } }
+				public string data;
+			}
+			public abstract class SingleBase : InstantEvent {
+				public double lane;
+				public bool skill;
+				public bool flick;
+			}
+			public class Single : SingleBase {
+				public override string type { get { return "Single"; } }
+			}
+			public class Directional : SingleBase {
+				public override string type { get { return "Directional"; } }
+				public string direction;
+				public int width;
+			}
+			public class Connection : SingleBase {
+				public override string type { get { return null; } }
+				public bool hidden;
+			}
+			public class Long : BestdoriChartEvent {
+				public override string type { get { return "Long"; } }
+				public List<Connection> connections;
+				public override double StartBeat { get { return connections[0].beat; } }
+			}
+			public class Slide : Long {
+				public override string type { get { return "Slide"; } }
+			}
+		}
+#pragma warning restore IDE1006
+		class BestdoriChartEventCreator : CustomCreationConverter<BestdoriChartEvent> {
+			string _currentType;
+
+			public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) {
+				var obj = JObject.ReadFrom(reader);
+				var type = obj["type"];
+				if (type == null) _currentType = null;
+				else _currentType = obj["type"].ToObject<string>();
+				return base.ReadJson(obj.CreateReader(), objectType, existingValue, serializer);
+			}
+
+			public override BestdoriChartEvent Create(Type objectType) {
+				switch (_currentType) {
+					case "BPM": return new BestdoriChartEvent.BPM();
+					case "System": return new BestdoriChartEvent.System();
+					case "Single": return new BestdoriChartEvent.Single();
+					case "Directional": return new BestdoriChartEvent.Directional();
+					case null: return new BestdoriChartEvent.Connection();
+					case "Long": return new BestdoriChartEvent.Long();
+					case "Slide": return new BestdoriChartEvent.Slide();
+					default: throw new ArgumentException("Unknown event type: " + _currentType);
+				}
+			}
+		}
+	}
+}

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

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

Assets/Cryville/Crtr/Extensions/Extensions.cs

@@ -0,0 +1,27 @@
+using Cryville.Crtr.Browsing;
+using Cryville.Crtr.Extensions.Bestdori;
+using Cryville.Crtr.Extensions.Malody;
+using Cryville.Crtr.Extensions.osu;
+using Cryville.Crtr.Extensions.Quaver;
+using System.Collections.Generic;
+
+namespace Cryville.Crtr.Extensions {
+	public class Extensions : ExtensionInterface {
+		public override IEnumerable<ResourceConverter> GetResourceConverters() {
+			return new ResourceConverter[] {
+				new BestdoriChartConverter(),
+				new MalodyChartConverter(),
+				new osuChartConverter(),
+				new QuaverChartConverter(),
+			};
+		}
+
+		public override IEnumerable<LocalResourceFinder> GetResourceFinders() {
+			return new LocalResourceFinder[] {
+				new MalodyChartFinder(),
+				new osuChartFinder(),
+				new QuaverChartFinder(),
+			};
+		}
+	}
+}