Prevents dynamic anchor set twice. Implement special dynamic anchors.

This reverts commit 4185303bd2.

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

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

Assets/Cryville/Common/Culture.meta

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

Assets/Cryville/Common/Culture/ScriptUtils.cs

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

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

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

Assets/Cryville/Common/Font/FontFile.cs

@@ -0,0 +1,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

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

Assets/Cryville/Common/Font/FontManager.cs

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

Assets/Cryville/Common/Font/FontMatcher.cs

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

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

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

Assets/Cryville/Common/Font/FontTable.cs

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

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

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

Assets/Cryville/Common/Font/FontUtil.cs

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

Assets/Cryville/Common/Font/Typeface.cs

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

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

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

Assets/Cryville/Common/IO.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aaa0d8cecafb37b46a6abe372cfefd93
+folderAsset: yes
+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/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 bool Forced { get; private set; }
-			public PushVariable(string name) : this(IdentifierManager.SharedInstance.Request(name)) { }
+			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 {
-	public partial class PdtInterpreter<T> {
 		/// <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) {
+		public static T Interpret<T>(string src) {
-			return Interpret(src, BinderAttribute.CreateBinderOfType(typeof(T)));
+			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) {
+		public static T Interpret<T>(string src, Binder binder) {
-			return new PdtInterpreter<T>(src, binder).Interpret();
+			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) {
+		public PdtInterpreter(string src, Type type, Binder binder) {
-			_src = src;
+			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() {
+		public object Interpret() {
-			InterpretDirectives();
+			try {
-			return (T)InterpretObject(typeof(T));
+				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

@@ -48,9 +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 (!_rfreq && !noset) throw new InvalidOperationException("Return frame not set");
+			if (!_rfreq && !noset) throw new EvaluationFailureException("Return frame not set");
 		}
 		/// <summary>
 		/// Executes the operator.

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

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

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

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

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

@@ -4,28 +4,22 @@ using System.Reflection;
 
 namespace Cryville.Common.Unity.Input {
 	public class InputManager {
-		static readonly List<Type> HandlerRegistries = new List<Type> {
+		static readonly HashSet<Type> HandlerRegistries = new HashSet<Type> {
 			typeof(WindowsPointerHandler),
 			typeof(UnityKeyHandler<UnityKeyboardReceiver>),
 			typeof(UnityKeyHandler<UnityMouseButtonReceiver>),
 			typeof(UnityMouseHandler),
 			typeof(UnityTouchHandler),
 		};
-		readonly List<InputHandler> _handlers = new List<InputHandler>();
+		readonly HashSet<InputHandler> _handlers = new HashSet<InputHandler>();
 		readonly Dictionary<Type, InputHandler> _typemap = new Dictionary<Type, InputHandler>();
-		readonly Dictionary<InputHandler, double> _timeOrigins = new Dictionary<InputHandler, double>();
-		readonly object _lock = new object();
-		readonly Dictionary<InputIdentifier, InputVector> _vectors = new Dictionary<InputIdentifier, InputVector>();
-		readonly List<InputEvent> _events = new List<InputEvent>();
 		public InputManager() {
 			foreach (var t in HandlerRegistries) {
 				try {
 					if (!typeof(InputHandler).IsAssignableFrom(t)) continue;
 					var h = (InputHandler)ReflectionHelper.InvokeEmptyConstructor(t);
 					_typemap.Add(t, h);
-					h.OnInput += OnInput;
 					_handlers.Add(h);
-					_timeOrigins.Add(h, 0);
 					Logger.Log("main", 1, "Input", "Initialized {0}", ReflectionHelper.GetSimpleName(t));
 				}
 				catch (TargetInvocationException ex) {
@@ -36,49 +30,8 @@ namespace Cryville.Common.Unity.Input {
 		public InputHandler GetHandler(string name) {
 			return _typemap[Type.GetType(name)];
 		}
-		public void Activate() {
+		public void EnumerateHandlers(Action<InputHandler> cb) {
-			lock (_lock) {
+			foreach (var h in _handlers) cb(h);
-				_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();
-			}
 		}
 	}
 

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

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

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

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

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

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

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

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

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

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

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

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

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 int Name { get; private set; }
-		public bool Opened { get { return _opened; } }
+		public Transform Transform { get; private set; }
-		public Transform Transform { get; set; }
+		public SkinContext SkinContext { get; private set; }
-		public void Open() {
+		public Dictionary<int, PropSrc> PropSrcs { get; private set; }
-			_opened = true;
+		public Anchor(int name, Transform transform, int propSrcCount = 0) {
-		}
+			Name = name;
-		public void Close() {
+			Transform = transform;
-			_opened = false;
+			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 TMP_Text _title;
-		private Text _desc;
+		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>();
+			_title = transform.Find("__content__/Texts/Title/__text__").GetComponent<TMP_Text>();
-			_desc = transform.Find("__content__/Texts/Description/__text__").GetComponent<Text>();
+			_desc = transform.Find("__content__/Texts/Description/__text__").GetComponent<TMP_Text>();
 		}
 		void OnDestroy() {
 			if (meta.Icon != null) meta.Icon.Cancel();

Assets/Cryville/Crtr/Browsing/DetailPanel.cs

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

Assets/Cryville/Crtr/Chart.cs

@@ -130,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);
+				if (relev == null) relev = new ReleaseEvent(this);
-				return attev;
-			}
-		}
-
-		private InstantEvent relev = null;
-		[JsonIgnore]
-		public InstantEvent ReleaseEvent {
-			get {
-				if (relev == null) relev = new InstantEvent(this, true);
 				return relev;
 			}
 		}
@@ -170,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) {
+		public ReleaseEvent(ChartEvent orig) {
-			IsRelease = release;
+			Original = orig;
-			if (orig != null) {
+			time = orig.endtime;
-				Original = orig;
-				time = orig.time;
-				if (IsRelease)
-					BeatOffset = orig.Duration;
-			}
 		}
 		
 		public override int Priority {
@@ -192,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 {
@@ -203,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(string.Format("Unknown event type {0}", type));
+				default: throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type));
 			}
 		}
 	}
@@ -310,6 +302,8 @@ namespace Cryville.Crtr {
 #pragma warning restore IDE1006
 
 			private void LoadFromString(string s) {
+				if (RelativeNode != null || AbsoluteValue != null)
+					throw new InvalidOperationException("The motion property can only be set at initialization");
 				Match m = Regex.Match(s, @"^(.+?)(#(\d+))?(@(.+?))?(\^(.+?))?(\*(.+?))?(:(.+))?$");
 				if (!m.Success) throw new ArgumentException("Invalid motion string format");
 				name = new Identifier(m.Groups[1].Value);
@@ -331,6 +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() {
@@ -382,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);

Assets/Cryville/Crtr/ChartHandler.cs

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

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -1,6 +1,7 @@
 #define BUILD
 
 using Cryville.Common;
+using Cryville.Common.Buffers;
 using Cryville.Crtr.Config;
 using Cryville.Crtr.Event;
 using Newtonsoft.Json;
@@ -8,7 +9,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Text.Formatting;
 using System.Threading;
+using TMPro;
 using UnityEngine;
 using UnityEngine.Networking;
 using UnityEngine.SceneManagement;
@@ -19,6 +22,7 @@ using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr {
 	public class ChartPlayer : MonoBehaviour {
+		#region Fields
 		Chart chart;
 		Skin skin;
 		PdtSkin pskin;
@@ -44,7 +48,9 @@ namespace Cryville.Crtr {
 
 		static bool initialized;
 		static Text logs;
-		Text status;
+		TextMeshProUGUI status;
+		readonly TargetString statusstr = new TargetString();
+		readonly StringBuffer statusbuf = new StringBuffer();
 
 		static Vector2 screenSize;
 		public static Rect hitRect;
@@ -66,6 +72,7 @@ namespace Cryville.Crtr {
 		public static PdtEvaluator etor;
 		
 		InputProxy inputProxy;
+		#endregion
 
 		#region MonoBehaviour
 		void Start() {
@@ -79,7 +86,7 @@ namespace Cryville.Crtr {
 			}
 			OnSettingsUpdate();
 
-			status = GameObject.Find("Status").GetComponent<Text>();
+			status = GameObject.Find("Status").GetComponent<TextMeshProUGUI>();
 
 			texHandler = new DownloadHandlerTexture();
 #if BUILD
@@ -105,7 +112,6 @@ namespace Cryville.Crtr {
 			if (texLoader != null) texLoader.Dispose();
 			if (inputProxy != null) inputProxy.Dispose();
 			if (texs != null) foreach (var t in texs) Texture.Destroy(t.Value);
-			Camera.onPostRender -= OnCameraPostRender;
 			GC.Collect();
 		}
 
@@ -146,12 +152,13 @@ namespace Cryville.Crtr {
 				actualRenderStep = step;
 
 				nbus.ForwardStepByTime(clippingDist, step);
-				nbus.BroadcastEndUpdate();
+				nbus.EndPreGraphicalUpdate();
 				nbus.Anchor();
 
+				tbus.StripTempEvents();
 				tbus.ForwardStepByTime(clippingDist, step);
 				tbus.ForwardStepByTime(renderDist, step);
-				tbus.BroadcastEndUpdate();
+				tbus.EndGraphicalUpdate();
 				UnityEngine.Profiling.Profiler.EndSample();
 			}
 			catch (Exception ex) {
@@ -213,7 +220,6 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
-		string timetext = string.Empty;
 		void LogUpdate() {
 			string _logs = logs.text;
 			Game.MainLogger.Enumerate((level, module, msg) => {
@@ -233,36 +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(
+			statusbuf.Clear();
-					"FPS: i{0:0} / s{1:0}\nSMem: {2:N0} / {3:N0}\nIMem: {4:N0} / {5:N0}",
+			statusbuf.AppendFormat(
-					1 / Time.deltaTime,
+				"FPS: i{0:0} / s{1:0}\nSMem: {2:N0} / {3:N0}\nIMem: {4:N0} / {5:N0}",
-					1 / Time.smoothDeltaTime,
+				1 / Time.deltaTime,
+				1 / Time.smoothDeltaTime,
 #if UNITY_5_6_OR_NEWER
-					UnityEngine.Profiling.Profiler.GetMonoUsedSizeLong(),
+				UnityEngine.Profiling.Profiler.GetMonoUsedSizeLong(),
-					UnityEngine.Profiling.Profiler.GetMonoHeapSizeLong(),
+				UnityEngine.Profiling.Profiler.GetMonoHeapSizeLong(),
-					UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong(),
+				UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong(),
-					UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong()
+				UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong()
 #else
-					UnityEngine.Profiling.Profiler.GetMonoUsedSize(),
+				UnityEngine.Profiling.Profiler.GetMonoUsedSize(),
-					UnityEngine.Profiling.Profiler.GetMonoHeapSize(),
+				UnityEngine.Profiling.Profiler.GetMonoHeapSize(),
-					UnityEngine.Profiling.Profiler.GetTotalAllocatedMemory(),
+				UnityEngine.Profiling.Profiler.GetTotalAllocatedMemory(),
-					UnityEngine.Profiling.Profiler.GetTotalReservedMemory()
+				UnityEngine.Profiling.Profiler.GetTotalReservedMemory()
 #endif
-				);
-			sttext += timetext;
-			if (judge != null) sttext += "\n== Scores ==\n" + judge.GetFullFormattedScoreString();
-			status.text = sttext;
-		}
-		void OnCameraPostRender(Camera cam) {
-			if (!started) return;
-			if (!logEnabled) return;
-			timetext = string.Format(
-				"\nSTime: {0:R}s {3}\ndATime: {1:+0.0ms;-0.0ms;0} {3}\ndITime: {2:+0.0ms;-0.0ms;0} {3}",
-				cbus.Time,
-				(Game.AudioClient.Position - atime0 - cbus.Time) * 1e3,
-				(inputProxy.GetTimestampAverage() - cbus.Time) * 1e3,
-				forceSyncFrames != 0 ? "(force sync)" : ""
 			);
+			if (started) {
+				statusbuf.AppendFormat(
+					"\nStates: c{0} / b{1}",
+					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
 
@@ -293,7 +308,7 @@ namespace Cryville.Crtr {
 		bool logEnabled = true;
 		public void ToggleLogs() {
 			logs.text = "";
-			status.text = "";
+			status.SetText("");
 			logEnabled = !logEnabled;
 		}
 
@@ -321,8 +336,6 @@ namespace Cryville.Crtr {
 			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;
@@ -436,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) {
@@ -484,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);
@@ -515,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;
 
@@ -537,10 +551,10 @@ namespace Cryville.Crtr {
 					foreach (var ts in gs.Value.Children) {
 						ContainerHandler th;
 						if (ts.Key is Chart.Note) {
-							th = new NoteHandler(gh, (Chart.Note)ts.Key, pruleset);
+							th = new NoteHandler((Chart.Note)ts.Key, gh);
 						}
 						else {
-							th = new TrackHandler(gh, (Chart.Track)ts.Key);
+							th = new TrackHandler((Chart.Track)ts.Key, gh);
 						}
 						ts.Value.AttachHandler(th);
 					}

Assets/Cryville/Crtr/Clip.cs

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

Assets/Cryville/Crtr/Clip.cs.meta

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

Assets/Cryville/Crtr/Components/SectionalGameObject.cs

@@ -19,7 +19,7 @@ namespace Cryville.Crtr.Components {
 
 		public SectionalGameObject() {
 			SubmitProperty("partial", new PropOp.Boolean(v => part = Part.idle));
-			SubmitProperty("part", new PropOp.Enum<Part>(v => part = v, v => (Part)v));
+			SubmitProperty("part", new PropOp.Enum<Part>(v => part = v, v => (Part)v), 2);
 		}
 
 		protected override void OnDestroy() {
@@ -152,6 +152,7 @@ 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;
@@ -192,13 +193,13 @@ namespace Cryville.Crtr.Components {
 			if (body.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
 			if (tail.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
 
-			mesh.Mesh.subMeshCount = m;
+			mesh.Mesh.subMeshCount = 3;
 			m = 0;
 			mesh.Mesh.SetVertices(verts);
 			mesh.Mesh.SetUVs(0, uvs);
-			if (head.Frame != null) mesh.Mesh.SetTriangles(trih, m++);
+			mesh.Mesh.SetTriangles(head.Frame == null ? _emptyTris : trih, m++);
-			if (body.Frame != null) mesh.Mesh.SetTriangles(trib, m++);
+			mesh.Mesh.SetTriangles(body.Frame == null ? _emptyTris : trib, m++);
-			if (tail.Frame != null) mesh.Mesh.SetTriangles(trit, m++);
+			mesh.Mesh.SetTriangles(tail.Frame == null ? _emptyTris : trit, m++);
 			mesh.Mesh.RecalculateNormals();
 
 			_vertPool.Return(verts); verts = null;

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,45 +20,49 @@ namespace Cryville.Crtr.Config {
 		public Ruleset ruleset;
 		RulesetConfig _rscfg;
 
-		void Awake() {
+		void Start() {
-			ChartPlayer.etor = new PdtEvaluator();
+			try {
-			FileInfo file = new FileInfo(
+				ChartPlayer.etor = new PdtEvaluator();
-				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
+				FileInfo file = new FileInfo(
-			);
+					Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
-			if (!file.Exists) {
+				);
-				Popup.Create("Ruleset for the chart not found\nMake sure you have imported the ruleset");
+				if (!file.Exists) {
-				ReturnToMenu();
+					throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
-				return;
+				}
-			}
+				DirectoryInfo dir = file.Directory;
-			DirectoryInfo dir = file.Directory;
+				using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+					ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
-				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
 					});
+					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) {
@@ -68,7 +73,6 @@ namespace Cryville.Crtr.Config {
 		}
 
 		public void SaveAndReturnToMenu() {
-			Game.InputManager.Deactivate();
 			m_inputConfigPanel.proxy.SaveTo(_rscfg.inputs);
 			m_inputConfigPanel.proxy.Dispose();
 			FileInfo cfgfile = new FileInfo(

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -24,6 +24,7 @@ namespace Cryville.Crtr.Config {
 		[SerializeField]
 		GameObject m_prefabInputConfigEntry;
 
+		readonly SimpleInputConsumer _consumer = new SimpleInputConsumer(Game.InputManager);
 		public InputProxy proxy;
 		readonly Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
 
@@ -32,7 +33,7 @@ namespace Cryville.Crtr.Config {
 			_sel = entry;
 			m_inputDialog.SetActive(true);
 			CallHelper.Purge(m_deviceList);
-			Game.InputManager.EnumerateEvents(ev => { });
+			_consumer.EnumerateEvents(ev => { });
 			_recvsrcs.Clear();
 			AddSourceItem(null);
 		}
@@ -46,10 +47,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);
@@ -59,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));
@@ -67,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

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

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -4,10 +4,15 @@ using Cryville.Crtr.Components;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using UnityEngine;
 
 namespace Cryville.Crtr.Event {
-	public abstract class ContainerHandler : IDisposable {
+	public abstract class ContainerHandler {
+		#region Struct
+		public ContainerHandler() { }
+		public abstract string TypeName { get; }
+
 		/// <summary>
 		/// Prehandling <see cref="ContainerState"/>, prehandling the events.
 		/// </summary>
@@ -36,17 +41,26 @@ namespace Cryville.Crtr.Event {
 		/// <summary>
 		/// <see cref="GameObject"/> group, the <see cref="Transform"/> containing all the generated elements in the <see cref="ContainerHandler"/>.
 		/// </summary>
-		public Transform gogroup;
+		protected Transform gogroup;
+		public SkinContext SkinContext;
 
-		public readonly Dictionary<int, Anchor> Anchors = new Dictionary<int, Anchor>();
-		protected Transform a_cur;
-		protected Transform a_head;
-		protected Transform a_tail;
 		public Vector3 Position { get; protected set; }
 		public Quaternion Rotation { get; protected set; }
 		public bool Alive { get; private set; }
-		public bool Awoken { get; private set; }
+		bool PreGraphicalActive;
-		public bool Disposed { get; private set; }
+		public void SetPreGraphicalActive(bool value, ContainerState s) {
+			if (PreGraphicalActive == value) return;
+			PreGraphicalActive = value;
+			if (PreGraphicalActive) StartPreGraphicalUpdate(s);
+			else EndPreGraphicalUpdate(s);
+		}
+		bool GraphicalActive;
+		public void SetGraphicalActive(bool value, ContainerState s) {
+			if (GraphicalActive == value) return;
+			GraphicalActive = value;
+			if (GraphicalActive) StartGraphicalUpdate(s);
+			else EndGraphicalUpdate(s);
+		}
 
 		public EventContainer Container {
 			get { return cs.Container; }
@@ -59,32 +73,53 @@ namespace Cryville.Crtr.Event {
 			this.judge = judge;
 		}
 
-		public ContainerHandler() { }
+		public readonly Dictionary<int, List<Anchor>> Anchors = new Dictionary<int, List<Anchor>>();
-		public abstract string TypeName {
+		public readonly Dictionary<int, Anchor> DynamicAnchors = new Dictionary<int, Anchor>();
-			get;
+		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 virtual void PreInit() {
+		public Anchor RegisterAnchor(int name, bool dyn = false, int propSrcCount = 0) {
-			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString(CultureInfo.InvariantCulture)).transform;
+			var strname = IdentifierManager.SharedInstance.Retrieve(name);
-			if (cs.Parent != null)
+			var go = new GameObject("." + strname).transform;
-				gogroup.SetParent(cs.Parent.Handler.gogroup, false);
-			a_cur = RegisterAnchor(_a_cur).Transform;
-			a_head = RegisterAnchor(_a_head).Transform;
-			a_tail = RegisterAnchor(_a_tail).Transform;
-		}
-		protected Anchor RegisterAnchor(int name) {
-			var go = new GameObject("." + IdentifierManager.SharedInstance.Retrieve(name)).transform;
 			go.SetParent(gogroup, false);
-			var result = new Anchor() { Transform = go };
+			var result = new Anchor(name, go, propSrcCount);
-			Anchors.Add(name, result);
+			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
 
-		/// <summary>
+		#region Logic
-		/// Called upon StartUpdate of ps 17.
+		#region Init methods: Called on prehandle
-		/// </summary>
+		public virtual void PreInit() {
+			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString(CultureInfo.InvariantCulture)).transform;
+			SkinContext = new SkinContext(gogroup);
+			if (cs.Parent != null)
+				gogroup.SetParent(cs.Parent.Handler.gogroup, false);
+			a_cur = RegisterAnchor(_a_cur);
+			a_head = RegisterAnchor(_a_head, true);
+			a_tail = RegisterAnchor(_a_tail, true);
+		}
 		public virtual void Init() {
 			skinContainer.MatchStatic(ps);
 			foreach (var i in gogroup.GetComponentsInChildren<SkinComponent>())
@@ -93,74 +128,93 @@ namespace Cryville.Crtr.Event {
 		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) {
+		public virtual void DisposeAll() { }
-			if (gogroup) gogroup.gameObject.SetActive(true);
+		#endregion
-			Awoken = true; Alive = true;
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-			OpenAnchor(_a_head);
+		protected static bool CanDoGraphicalUpdate(ContainerState s) { return s.CloneType >= 2 && s.CloneType < 16; }
-		}
+		#region Anchor
-		protected virtual void Awake(ContainerState s) {
+		public virtual void Anchor() {
-			CloseAnchor(_a_head);
+			foreach (var a in DynamicAnchors.Keys) DynamicAnchorSet[a] = false;
-		}
+			skinContainer.MatchDynamic(cs);
-		protected virtual void GetPosition(ContainerState s) { }
+			if (cs.Active) PushAnchorEvent(cs.Time, a_cur);
-		public virtual void StartUpdate(ContainerState s) {
+			if (Alive) {
-			if (s.CloneType >= 2 && s.CloneType < 16) {
+				if (!DynamicAnchorSet[_a_head]) PushAnchorEvent(cs.StampedContainer.Time, a_head, -1, true);
-				PreAwake(s);
+				if (!DynamicAnchorSet[_a_tail]) PushAnchorEvent(cs.StampedContainer.Time + cs.StampedContainer.Duration, a_tail, 1, true);
-				Awake(s);
-			}
-			else if (s.CloneType == 17) {
-				Init();
 			}
 		}
 		static readonly SimpleObjectPool<StampedEvent.Anchor> anchorEvPool
 			= new SimpleObjectPool<StampedEvent.Anchor>(1024);
-		protected void PushAnchorEvent(int name, double time) {
+		public void PushAnchorEvent(double time, int name) {
+			Anchor anchor;
+			if (!DynamicAnchors.TryGetValue(name, out anchor))
+				throw new ArgumentException(string.Format("Specified anchor \"{0}\" not found", IdentifierManager.SharedInstance.Retrieve(name)));
+			if (DynamicAnchorSet[name])
+				throw new InvalidOperationException(string.Format("Specified anchor \"{0}\" has been set", IdentifierManager.SharedInstance.Retrieve(name)));
+			PushAnchorEvent(time, anchor);
+			DynamicAnchorSet[name] = true;
+		}
+		void PushAnchorEvent(double time, Anchor anchor, int priority = 0, bool forced = false) {
 			var tev = anchorEvPool.Rent();
 			tev.Time = time;
 			tev.Container = Container;
-			tev.Name = name;
+			tev.Target = anchor;
+			tev.CanDiscard = !forced;
+			tev.SetPriority(priority);
 			ts.Bus.PushTempEvent(tev);
 		}
-		public virtual void Update(ContainerState s, StampedEvent ev) {
+		public virtual void Discard(ContainerState s, StampedEvent ev) {
-			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
-			if (flag) PreAwake(s);
-			if (s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s);
-			if (flag) Awake(s);
-		}
-		public virtual void ExUpdate(ContainerState s, StampedEvent ev) {
 			if (ev is StampedEvent.Anchor) {
-				var tev = (StampedEvent.Anchor)ev;
+				anchorEvPool.Return((StampedEvent.Anchor)ev);
-				if (gogroup) {
-					OpenAnchor(tev.Name);
-					Anchors[tev.Name].Transform.SetPositionAndRotation(Position, Rotation);
-					skinContainer.MatchDynamic(s);
-					CloseAnchor(tev.Name);
-				}
-				anchorEvPool.Return(tev);
 			}
 		}
-		public virtual void MotionUpdate(byte ct, Chart.Motion ev) { }
+		#endregion
-		public virtual void EndUpdate(ContainerState s) {
+		#endregion
-			if (s.CloneType < 16) {
-				Awoken = false;
-				if (gogroup && s.CloneType <= 2) skinContainer.MatchDynamic(s);
-			}
-		}
-		public virtual void Anchor() {
-			if (cs.Working) PushAnchorEvent(_a_cur, cs.Time);
-		}
-		protected void OpenAnchor(int name) {
-			if (Anchors.ContainsKey(name)) Anchors[name].Open();
-		}
-		protected void CloseAnchor(int name) {
-			if (Anchors.ContainsKey(name)) Anchors[name].Close();
-		}
 	}
 }

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
+		HashSet<EventContainer> ActiveChildren
-			= new HashSet<EventContainer>();
-		readonly HashSet<EventContainer> InvalidatedChildren
 			= new HashSet<EventContainer>();
 		public Dictionary<Type, List<ContainerState>> TypedChildren
 			= new Dictionary<Type, List<ContainerState>>();
@@ -28,27 +29,47 @@ namespace Cryville.Crtr.Event {
 			return Children[ev];
 		}
 
-		void NotifyWorkingChanged(EventContainer key) {
+		private bool m_active;
-			InvalidatedChildren.Add(key);
+		public bool Active {
-		}
+			get { return m_active; }
-		void ValidateChildren() {
+			private set {
-			foreach (var cev in InvalidatedChildren)
+				if (m_active == value) return;
-				if (Children[cev].Working && !WorkingChildren.Contains(cev)) WorkingChildren.Add(cev);
+				m_active = value;
-				else if (!Children[cev].Working && WorkingChildren.Contains(cev)) WorkingChildren.Remove(cev);
+				if (!m_active && CloneType == 1) Dispose();
-			InvalidatedChildren.Clear();
+				if (Parent != null) {
-		}
+					if (m_active) Parent.ActiveChildren.Add(Container);
-
+					else Parent.ActiveChildren.Remove(Container);
-		private bool m_Working;
+				}
-		public bool Working {
+				Bus.NotifyActiveChanged(this);
-			get { return m_Working; }
-			set {
-				m_Working = value;
-				if (Parent != null) Parent.NotifyWorkingChanged(Container);
-				Bus.NotifyWorkingChanged(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 ContainerHandler Handler {
@@ -62,47 +83,7 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 
-		readonly RMVPool RMVPool = new RMVPool();
+		public ContainerState(EventContainer _ev, ContainerState parent = null) {
-		protected Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new Dictionary<StampedEvent, RealtimeMotionValue>();
-		protected Dictionary<Identifier, RealtimeMotionValue> Values;
-		protected Dictionary<Identifier, CacheEntry> CachedValues;
-		protected class CacheEntry {
-			public bool Valid { get; set; }
-			public Vector Value { get; set; }
-			public CacheEntry Clone() {
-				return new CacheEntry { Valid = Valid, Value = Value == null ? null : Value.Clone() };
-			}
-		}
-
-		/// <summary>
-		/// Gets a motion value.
-		/// </summary>
-		/// <param name="name">The motion name.</param>
-		/// <param name="clone">Returns a cloned motion value instead.</param>
-		/// <returns>A motion value.</returns>
-		RealtimeMotionValue GetMotionValue(Identifier name, bool clone = false) {
-			RealtimeMotionValue value;
-			if (!Values.TryGetValue(name, out value)) {
-				value = new RealtimeMotionValue().Init(Parent == null
-					? ChartPlayer.motionRegistry[name].GlobalInitValue
-					: ChartPlayer.motionRegistry[name].InitValue
-				);
-				Values.Add(name, value);
-			}
-			if (clone) return value.Clone();
-			return value;
-		}
-
-		void InvalidateMotion(Identifier name) {
-			CacheEntry cache;
-			if (!CachedValues.TryGetValue(name, out cache))
-				CachedValues.Add(name, cache = new CacheEntry());
-			cache.Valid = false;
-			foreach (var c in Children)
-				c.Value.InvalidateMotion(name);
-		}
-
-		public ContainerState(Chart c, EventContainer _ev, ContainerState parent = null) {
 			Container = _ev;
 
 			if (parent != null) {
@@ -111,9 +92,11 @@ namespace Cryville.Crtr.Event {
 			}
 
 			Values = new Dictionary<Identifier, RealtimeMotionValue>(ChartPlayer.motionRegistry.Count);
-			CachedValues = new Dictionary<Identifier, CacheEntry>(ChartPlayer.motionRegistry.Count);
+			CachedValues = new Dictionary<Identifier, MotionCache>(ChartPlayer.motionRegistry.Count);
 			foreach (var m in ChartPlayer.motionRegistry)
 				Values.Add(m.Key, new RealtimeMotionValue().Init(Parent == null ? m.Value.GlobalInitValue : m.Value.InitValue));
+
+			rootPrototype = this;
 		}
 
 		static void AddChild(EventContainer c, ContainerState s, ContainerState target) {
@@ -132,9 +115,11 @@ namespace Cryville.Crtr.Event {
 			}
 			r.Values = mvs;
 
-			var cvs = new Dictionary<Identifier, CacheEntry>(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;
 
@@ -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,24 @@ namespace Cryville.Crtr.Event {
 				else dest.Values.Add(mv.Key, mv.Value.Clone());
 			}
 
+			foreach (var cv in dest.CachedValues) cv.Value.Valid = false;
 			foreach (var cv in CachedValues) {
-				CacheEntry dv;
+				MotionCache dv;
-				if (dest.CachedValues.TryGetValue(cv.Key, out dv)) {
+				if (!dest.CachedValues.TryGetValue(cv.Key, out dv)) {
-					dv.Valid = cv.Value.Valid;
+					dest.CachedValues.Add(cv.Key, dv = dest.MCPool.Rent(cv.Key));
-					if (cv.Value.Value != null) cv.Value.Value.CopyTo(dv.Value);
 				}
-				else dest.CachedValues.Add(cv.Key, cv.Value.Clone());
+				cv.Value.CopyTo(dv);
 			}
 
-			if (ct != 1) foreach (var cev in WorkingChildren)
+			foreach (var cev in dest.ActiveChildren) {
+				if (!ActiveChildren.Contains(cev))
+					Children[cev].CopyTo(ct, dest.Children[cev]);
+			}
+			dest.ActiveChildren.Clear();
+			foreach (var cev in ActiveChildren) {
+				dest.ActiveChildren.Add(cev);
 				Children[cev].CopyTo(ct, dest.Children[cev]);
-			else foreach (var child in Children)
+			}
-				child.Value.CopyTo(ct, dest.Children[child.Key]);
-			ValidateChildren();
 
 			dest.PlayingMotions.Clear();
 			foreach (var m in PlayingMotions) dest.PlayingMotions.Add(m.Key, m.Value);
@@ -197,10 +189,16 @@ 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) {
@@ -213,13 +211,40 @@ namespace Cryville.Crtr.Event {
 		public void AttachSystems(PdtSkin skin, 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) {
-			CacheEntry tr;
+			MotionCache tr;
 			if (!CachedValues.TryGetValue(key, out tr))
-				CachedValues.Add(key, tr = new CacheEntry { Valid = false });
+				CachedValues.Add(key, tr = MCPool.Rent(key));
-			if (tr.Value == null)
-				tr.Value = RMVPool.Rent(key).AbsoluteValue;
 			Vector r = tr.Value;
 #if !DISABLE_CACHE
 			if (tr.Valid) return r;
@@ -308,16 +333,22 @@ 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) {
@@ -326,7 +357,7 @@ namespace Cryville.Crtr.Event {
 					mv.CloneTypeFlag = CloneType;
 					GetMotionValue(tev.Name).CopyTo(mv);
 					PlayingMotions.Add(ev, mv);
-					Callback(ev, callback);
+					Update(ev);
 					if (!ev.Unstamped.IsLong) {
 						PlayingMotions.Remove(ev);
 						RMVPool.Return(mv);
@@ -335,48 +366,37 @@ namespace Cryville.Crtr.Event {
 				else if (ev.Unstamped is EventContainer) {
 					var cev = (EventContainer)ev.Unstamped;
 					var ccs = GetChild(cev);
-					ccs.Working = true;
+					ccs.LogicalActive = true;
-					ccs.StartUpdate();
 					UpdateMotions();
-					if (!ev.Unstamped.IsLong) {
+					if (!cev.IsLong) {
-						ccs.Working = false;
+						ccs.LogicalActive = false;
-						ccs.BroadcastEndUpdate();
-						if (CloneType == 1) ccs.Dispose();
 					}
 				}
-				else if (ev.Unstamped is InstantEvent) {
+				else if (ev.Unstamped is ReleaseEvent) {
-					var tev = (InstantEvent)ev.Unstamped;
+					var tev = (ReleaseEvent)ev.Unstamped;
-					if (tev.IsRelease) {
+					var nev = tev.Original;
-						var nev = tev.Original;
+					if (nev is Chart.Motion) {
-						if (nev is Chart.Motion) {
+						Update(ev);
-							Callback(ev, callback);
+						var mv = PlayingMotions[ev.Origin];
-							var mv = PlayingMotions[ev.Origin];
+						if (mv.CloneTypeFlag == CloneType) RMVPool.Return(mv);
-							if (mv.CloneTypeFlag == CloneType) RMVPool.Return(mv);
+						PlayingMotions.Remove(ev.Origin);
-							PlayingMotions.Remove(ev.Origin);
+					}
-						}
+					else if (nev is EventContainer) {
-						else if (nev is EventContainer) {
+						var cev = (EventContainer)ev.Origin.Unstamped;
-							var cev = (EventContainer)ev.Origin.Unstamped;
+						var ccs = GetChild(cev);
-							var ccs = GetChild(cev);
+						UpdateMotions();
-							UpdateMotions();
+						ccs.LogicalActive = false;
-							ccs.Working = false;
-							ccs.BroadcastEndUpdate();
-							if (CloneType == 1) ccs.Dispose();
-						}
 					}
 				}
-				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)
+			Handler.Update(this, ev);
-				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);
 		}
 
 		private void UpdateMotions() {
@@ -421,14 +441,17 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 
-		public void StartUpdate() {
+		public void EndPreGraphicalUpdate() {
-			Handler.StartUpdate(this);
+			Handler.SetPreGraphicalActive(false, this);
+			foreach (var ls in ActiveChildren) {
+				Children[ls].EndPreGraphicalUpdate();
+			}
 		}
 
-		public void BroadcastEndUpdate() {
+		public void EndGraphicalUpdate() {
-			Handler.EndUpdate(this);
+			Handler.SetGraphicalActive(false, this);
-			foreach (var ls in Children.Values) {
+			foreach (var ls in ActiveChildren) {
-				if (ls.Working) ls.BroadcastEndUpdate();
+				Children[ls].EndGraphicalUpdate();
 			}
 		}
 
@@ -438,5 +461,6 @@ namespace Cryville.Crtr.Event {
 				if (ls.Handler.Alive) ls.Anchor();
 			}
 		}
+		#endregion
 	}
 }

Assets/Cryville/Crtr/Event/EventBatcher.cs

@@ -9,124 +9,148 @@ namespace Cryville.Crtr.Event {
 			get;
 			private set;
 		}
-		ContainerState RootState;
+		readonly Chart chart;
-		/// <summary>
+		ContainerState rootState;
-		/// event => the container state that handles the event
+		readonly Dictionary<ChartEvent, ContainerState> containerMap
-		/// </summary>
-		readonly Dictionary<ChartEvent, ContainerState> table
 			= new Dictionary<ChartEvent, ContainerState>();
-		public List<StampedEvent> stampedEvents = new List<StampedEvent>();
+		readonly Dictionary<EventContainer, ContainerState> stateMap
+			= new Dictionary<EventContainer, ContainerState>();
+		readonly Dictionary<ChartEvent, StampedEvent> map
+			= new Dictionary<ChartEvent, StampedEvent>();
+		readonly Dictionary<EventContainer, List<StampedEvent>> coeventMap
+			= new Dictionary<EventContainer, List<StampedEvent>>();
+		readonly HashSet<ChartEvent> coevents = new HashSet<ChartEvent>();
+		readonly List<StampedEvent> stampedEvents = new List<StampedEvent>();
 		readonly List<EventBatch> batches = new List<EventBatch>();
 
 		double beat;
 		float tempo;
 		
-		public EventBatcher(Chart c) : base(c, new List<ChartEvent>()) {
+		public EventBatcher(Chart c) : base(new List<ChartEvent>()) {
+			chart = c;
 			beat = chart.BeatPosition;
 			tempo = (float)c.sigs[0].tempo;
-			events.Add(c);
+			Events.Add(c);
-			events.Add(c.ReleaseEvent);
+			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);
+					Events.Add(ev.ReleaseEvent);
-					table.Add(ev.ReleaseEvent, cs);
+					containerMap.Add(ev.ReleaseEvent, cs);
 				}
-				events.Add(ev);
+				Events.Add(ev);
-				table.Add(ev, cs);
+				containerMap.Add(ev, cs);
 				if (ev is EventContainer)
 					AddEventContainer((EventContainer)ev, cs);
 			}
 		}
 		
-		public override void ForwardOnceToTime(double toTime, Action<ChartEvent> callback) {
+		public override void ForwardOnceToTime(double toTime) {
 			double toBeat = Math.Round(beat + (toTime - Time) * tempo / 60f, 6);
-			if (EventId >= events.Count)
+			if (EventId >= Events.Count)
 				goto return_ahead;
-			double ebeat = events[EventId].BeatPosition;
+			double ebeat = Events[EventId].BeatPosition;
 			double etime = Math.Round((ebeat - beat) / tempo * 60f + Time, 6);
 			if (etime > toTime)
 				goto return_ahead;
 			var batch = GetEventBatch();
 			Time = etime;
 			beat = ebeat;
-			bool flag = false;
 			foreach (var ev in batch) {
 				EventContainer con = null;
-				if (table.ContainsKey(ev)) con = table[ev].Container;
+				if (containerMap.ContainsKey(ev)) con = containerMap[ev].Container;
 				var sev = new StampedEvent() {
 					Time = etime,
 					Unstamped = ev,
 					Container = con
 				};
-				if (ev is InstantEvent) {
+				if (ev is EventContainer) {
-					var tev = (InstantEvent)ev;
+					var tev = (EventContainer)ev;
-					var pev = stampedEvents.First(tpev => tpev.Unstamped == tev.Original);
+					stateMap[tev].StampedContainer = sev;
-					pev.Subevents.Add(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 (con != null && coevents.Contains(ev)) {
-				if (ev.Priority >= 0) {
+					List<StampedEvent> cevs;
-					if (callback != null) callback(ev);
+					if (!coeventMap.TryGetValue(con, out cevs)) {
-					flag = true;
+						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) => {
+			stampedEvents.Sort(CompareStampedEvents);
-				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());
-			});
 			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,32 +11,27 @@ namespace Cryville.Crtr.Event {
 
 		Dictionary<EventContainer, ContainerState> states
 			= new Dictionary<EventContainer, ContainerState>();
-		List<EventContainer> activeContainers
+		HashSet<ContainerState> activeStates
-			= new List<EventContainer>();
-		HashSet<ContainerState> workingStates
 			= 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)
+		public EventBus(ContainerState root, List<EventBatch> b) : base(b) {
-			: base(c, 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.activeStates = new HashSet<ContainerState>();
-			r.workingStates = new HashSet<ContainerState>();
 			r.invalidatedStates = new HashSet<ContainerState>();
-			r.tempEvents = new List<StampedEvent>();
+			r.tempEvents = new List<StampedEvent.Temporary>();
 			r.Time += offsetTime;
 			r.RootState = RootState.Clone(ct);
-			r.RootState.StartUpdate();
 			r.Expand();
 			r.AttachBus();
 			foreach (var s in r.states) r.invalidatedStates.Add(s.Value);
@@ -46,26 +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);
 		}
 
@@ -84,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;
@@ -100,31 +83,58 @@ namespace Cryville.Crtr.Event {
 				s.AttachSystems(skin, judge);
 		}
 
-		List<StampedEvent> tempEvents = new List<StampedEvent>();
+		List<StampedEvent.Temporary> tempEvents = new List<StampedEvent.Temporary>();
-		public void PushTempEvent(StampedEvent ev) {
+		public void PushTempEvent(StampedEvent.Temporary ev) {
 			var index = tempEvents.BinarySearch(ev);
 			if (index < 0) index = ~index;
 			tempEvents.Insert(index, ev);
 		}
 
-		public override void ForwardOnceToTime(double toTime, Action<EventBatch> callback = null) {
+		readonly StampedEvent.Temporary _dummyEvent = new StampedEvent.Temporary();
-			double time1 = EventId < events.Count ? events[EventId].Time : double.PositiveInfinity;
+		public void StripTempEvents() {
+			_dummyEvent.Time = Time;
+			var index = tempEvents.BinarySearch(_dummyEvent);
+			if (index < 0) index = ~index;
+			for (var i = index - 1; i >= 0; i--) {
+				var ev = tempEvents[i];
+				tempEvents.RemoveAt(i);
+				if (ev.CanDiscard) {
+					if (ev.Container != null) {
+						states[ev.Container].Discard(ev);
+					}
+				}
+				else {
+					ev.Time = Time;
+					PushTempEvent(ev);
+				}
+			}
+		}
+
+		public override void ForwardOnceToTime(double toTime) {
+			double time1 = EventId < Events.Count ? Events[EventId].Time : double.PositiveInfinity;
 			double time2 = tempEvents.Count > 0 ? tempEvents[0].Time : double.PositiveInfinity;
 			double time0 = Math.Min(time1, time2);
 			if (time0 <= toTime && time0 != double.PositiveInfinity) {
 				Time = time0;
-				foreach (var s in workingStates) s.Handle(null);
+				foreach (var s in activeStates) s.Handle(null);
 				ValidateStates();
 				if (time1 == time0) {
-					var batch = events[EventId];
+					var batch = Events[EventId];
 					for (var i = 0; i < batch.Count; i++) {
 						var ev = batch[i];
-						if (ev.Container != null) {
+						if (ev is StampedEvent.ClipBehind) {
-							EnsureActivity(ev.Container);
+							var cevs = ev.Origin.Coevents;
-							states[ev.Container].Handle(ev);
+							if (cevs != null) foreach (var cev in cevs) {
+								if (cev.Container == null) continue;
+								states[cev.Container].Handle(cev);
+							}
+							states[(EventContainer)ev.Origin.Unstamped].PhysicalActive = true;
 						}
-						if (ev.Unstamped is EventContainer) {
+						else if (ev is StampedEvent.ClipAhead) {
-							if (ev.Container != null) EnsureActivity((EventContainer)ev.Unstamped);
+							states[(EventContainer)ev.Origin.Unstamped].PhysicalActive = false;
+						}
+						else if (ev.Container != null) {
+							states[ev.Container].Handle(ev);
 						}
 					}
 					EventId++;
@@ -132,26 +142,25 @@ namespace Cryville.Crtr.Event {
 				if (time2 == time0) {
 					while (tempEvents.Count > 0) {
 						var ev = tempEvents[0];
+						if (ev.Time != time0) break;
 						if (ev.Container != null) {
-							EnsureActivity(ev.Container);
 							states[ev.Container].Handle(ev);
 						}
 						tempEvents.RemoveAt(0);
 					}
 				}
-				ValidateStates();
 			}
 			else {
 				Time = toTime;
-				foreach (var s in workingStates) s.Handle(null);
+				foreach (var s in activeStates) s.Handle(null);
-				ValidateStates();
 			}
+			ValidateStates();
 		}
 
 		private void ValidateStates() {
 			foreach (var s in invalidatedStates)
-				if (s.Working && !workingStates.Contains(s)) workingStates.Add(s);
+				if (s.Active && !activeStates.Contains(s)) activeStates.Add(s);
-				else if (!s.Working && workingStates.Contains(s)) workingStates.Remove(s);
+				else if (!s.Active && activeStates.Contains(s)) activeStates.Remove(s);
 			invalidatedStates.Clear();
 		}
 		
@@ -162,13 +171,21 @@ namespace Cryville.Crtr.Event {
 			RootState.BroadcastPostInit();
 		}
 
-		public void BroadcastEndUpdate() {
+		public void EndPreGraphicalUpdate() {
-			RootState.BroadcastEndUpdate();
+			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

@@ -24,10 +24,9 @@ namespace Cryville.Crtr.Event {
 			= new SimpleObjectPool<Dictionary<RealtimeMotionValue, Identifier>>(1024);
 		Dictionary<RealtimeMotionValue, Identifier> _rented;
 		public RealtimeMotionValue Rent(Identifier name) {
-			var n = name;
+			var obj = _buckets[name].Rent();
-			var obj = _buckets[n].Rent();
 			if (_rented == null) _rented = _dictPool.Rent();
-			_rented.Add(obj, n);
+			_rented.Add(obj, name);
 			return obj;
 		}
 		public void Return(RealtimeMotionValue obj) {
@@ -35,6 +34,7 @@ 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();

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

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

Assets/Cryville/Crtr/Game.cs

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

Assets/Cryville/Crtr/GroupHandler.cs

@@ -15,11 +15,7 @@ namespace Cryville.Crtr {
 			this.ch = ch;
 		}
 		
-		public override string TypeName {
+		public override string TypeName { get { return "group"; } }
-			get {
-				return "group";
-			}
-		}
 
 		public override void PreInit() {
 			base.PreInit();

Assets/Cryville/Crtr/InputProxy.cs

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

Assets/Cryville/Crtr/Judge.cs

@@ -4,6 +4,7 @@ using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Text.Formatting;
 
 namespace Cryville.Crtr {
 	public class Judge {
@@ -21,7 +22,7 @@ namespace Cryville.Crtr {
 			public double EndTime { get; set; }
 			public double StartClip { get; set; }
 			public double EndClip { get; set; }
-			public Identifier JudgeId { get; set; }
+			public Chart.Judge BaseEvent { get; set; }
 			public JudgeDefinition Definition { get; set; }
 			public NoteHandler Handler { get; set; }
 		}
@@ -34,23 +35,31 @@ namespace Cryville.Crtr {
 		public Judge(PdtRuleset rs) {
 			_etor = ChartPlayer.etor;
 			_rs = rs;
+			_numsrc1 = new PropSrc.Float(() => _numbuf1);
+			_numsrc2 = new PropSrc.Float(() => _numbuf2);
+			_numsrc3 = new PropSrc.Float(() => _numbuf3);
+			_numsrc4 = new PropSrc.Float(() => _numbuf4);
 			InitJudges();
 			InitScores();
 		}
-		public void Prepare(double st, double et, Identifier input, Identifier judge, NoteHandler handler) {
+		public void Prepare(StampedEvent sev, NoteHandler handler) {
+			var tev = (Chart.Judge)sev.Unstamped;
+			Identifier input = default(Identifier);
+			ChartPlayer.etor.Evaluate(new PropOp.Identifier(v => input = new Identifier(v)), _rs.judges[tev.Id].input);
+			double st = sev.Time, et = st + sev.Duration;
 			List<JudgeEvent> list;
 			if (!evs.TryGetValue(input, out list)) {
 				ct.Add(input, 0);
 				evs.Add(input, list = new List<JudgeEvent>());
 				activeEvs.Add(input, new List<JudgeEvent>());
 			}
-			var def = _rs.judges[judge];
+			var def = _rs.judges[tev.Id];
 			var ev = new JudgeEvent {
 				StartTime = st,
 				EndTime = et,
-				StartClip = st + def.clip[0],
+				StartClip = st + def.clip.Behind,
-				EndClip = et + def.clip[1],
+				EndClip = et + def.clip.Ahead,
-				JudgeId = judge,
+				BaseEvent = tev,
 				Definition = def,
 				Handler = handler,
 			};
@@ -60,12 +69,10 @@ namespace Cryville.Crtr {
 		}
 		#endregion
 		#region Judge
-		internal readonly Dictionary<int, int> jtabsMap = new Dictionary<int, int>();
+		internal readonly Dictionary<int, int> judgeMap = new Dictionary<int, int>();
-		internal readonly Dictionary<int, int> jtrelMap = new Dictionary<int, int>();
 		void InitJudges() {
 			foreach (var i in _rs.judges.Keys) {
-				jtabsMap.Add(i.Key, IdentifierManager.SharedInstance.Request("jtabs_" + i.Name));
+				judgeMap.Add(i.Key, IdentifierManager.SharedInstance.Request("judge_" + i.Name));
-				jtrelMap.Add(i.Key, IdentifierManager.SharedInstance.Request("jtrel_" + i.Name));
 			}
 		}
 		static bool _flag;
@@ -74,10 +81,8 @@ namespace Cryville.Crtr {
 		static readonly int _var_tn = IdentifierManager.SharedInstance.Request("tn");
 		static readonly int _var_ft = IdentifierManager.SharedInstance.Request("ft");
 		static readonly int _var_tt = IdentifierManager.SharedInstance.Request("tt");
-		readonly byte[] _numbuf1 = new byte[sizeof(float)];
+		float _numbuf1, _numbuf2, _numbuf3, _numbuf4;
-		readonly byte[] _numbuf2 = new byte[sizeof(float)];
+		readonly PropSrc _numsrc1, _numsrc2, _numsrc3, _numsrc4;
-		readonly byte[] _numbuf3 = new byte[sizeof(float)];
-		readonly byte[] _numbuf4 = new byte[sizeof(float)];
 		unsafe void LoadNum(byte[] buffer, float value) {
 			fixed (byte* ptr = buffer) *(float*)ptr = value;
 		}
@@ -114,13 +119,13 @@ namespace Cryville.Crtr {
 			Forward(target, tt);
 			var actlist = activeEvs[target];
 			if (actlist.Count > 0) {
-				LoadNum(_numbuf3, ft); _etor.ContextCascadeUpdate(_var_ft, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf3));
+				_numbuf3 = ft; _numsrc3.Invalidate(); _etor.ContextCascadeUpdate(_var_ft, _numsrc3);
-				LoadNum(_numbuf4, tt); _etor.ContextCascadeUpdate(_var_tt, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf4));
+				_numbuf4 = tt; _numsrc4.Invalidate(); _etor.ContextCascadeUpdate(_var_tt, _numsrc4);
 				var index = 0;
 				while (index >= 0 && index < actlist.Count) {
 					var ev = actlist[index];
-					LoadNum(_numbuf1, (float)ev.StartTime); _etor.ContextCascadeUpdate(_var_fn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf1));
+					_numbuf1 = (float)ev.StartTime; _numsrc1.Invalidate(); _etor.ContextCascadeUpdate(_var_fn, _numsrc1);
-					LoadNum(_numbuf2, (float)ev.EndTime); _etor.ContextCascadeUpdate(_var_tn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf2));
+					_numbuf2 = (float)ev.EndTime; _numsrc2.Invalidate(); _etor.ContextCascadeUpdate(_var_tn, _numsrc2);
 					var def = ev.Definition;
 					if (def.hit != null) _etor.Evaluate(_flagop, def.hit);
 					else _flag = true;
@@ -200,6 +205,9 @@ namespace Cryville.Crtr {
 		readonly Dictionary<int, string> scoreStringCache = new Dictionary<int, string>();
 		readonly Dictionary<int, PropSrc> scoreStringSrcs = new Dictionary<int, PropSrc>();
 		readonly ArrayPool<byte> scoreStringPool = new ArrayPool<byte>();
+		readonly Dictionary<int, string> scoreFormatCache = new Dictionary<int, string>();
+		readonly TargetString scoreFullStr = new TargetString();
+		readonly StringBuffer scoreFullBuf = new StringBuffer();
 		void InitScores() {
 			foreach (var s in _rs.scores) {
 				var key = s.Key.Key;
@@ -211,7 +219,8 @@ namespace Cryville.Crtr {
 				scoreDefs.Add(key, s.Value);
 				scores.Add(key, s.Value.init);
 				scoreStringCache.Add(scoreStringKeys[key], null);
-				scoreStringSrcs.Add(scoreStringKeys[key], new ScoreStringSrc(scoreStringPool, () => GetScoreString(strkey)));
+				scoreStringSrcs.Add(scoreStringKeys[key], new ScoreStringSrc(scoreStringPool, () => scores[key], scoreDefs[key].format));
+				scoreFormatCache[key] = string.Format("{{0:{0}}}", s.Value.format);
 			}
 		}
 		void InvalidateScore(int key) {
@@ -219,55 +228,53 @@ namespace Cryville.Crtr {
 			scoreStringCache[scoreStringKeys[key]] = null;
 			scoreStringSrcs[scoreStringKeys[key]].Invalidate();
 		}
-		string GetScoreString(int key) {
-			var result = scoreStringCache[key];
-			if (result == null) {
-				var rkey = scoreStringKeysRev[key];
-				return scoreStringCache[key] = scores[rkey].ToString(scoreDefs[rkey].format, CultureInfo.InvariantCulture);
-			}
-			else return result;
-		}
 		public bool TryGetScoreSrc(int key, out PropSrc value) {
 			return scoreSrcs.TryGetValue(key, out value);
 		}
 		public bool TryGetScoreStringSrc(int key, out PropSrc value) {
 			return scoreStringSrcs.TryGetValue(key, out value);
 		}
-		public string GetFullFormattedScoreString() {
+		public TargetString GetFullFormattedScoreString() {
 			bool flag = false;
-			string result = "";
+			scoreFullBuf.Clear();
 			foreach (var s in scores.Keys) {
-				result += string.Format(flag ? "\n{0}: {1}" : "{0}: {1}", IdentifierManager.SharedInstance.Retrieve(s), GetScoreString(scoreStringKeys[s]));
+				scoreFullBuf.AppendFormat(flag ? "\n{0}: " : "{0}: ", (string)IdentifierManager.SharedInstance.Retrieve(s));
+				scoreFullBuf.AppendFormat(scoreFormatCache[s], scores[s]);
 				flag = true;
 			}
-			return result;
+			scoreFullStr.Length = scoreFullBuf.Count;
+			var arr = scoreFullStr.TrustedAsArray();
+			scoreFullBuf.CopyTo(0, arr, 0, scoreFullBuf.Count);
+			return scoreFullStr;
 		}
 		class ScoreStringSrc : PropSrc {
-			readonly Func<string> _cb;
+			readonly Func<float> _cb;
+			readonly string _format;
 			readonly ArrayPool<byte> _pool;
-			byte[] _buf;
+			readonly StringBuffer _buf = new StringBuffer() { Culture = CultureInfo.InvariantCulture };
-			public ScoreStringSrc(ArrayPool<byte> pool, Func<string> cb) {
+			public ScoreStringSrc(ArrayPool<byte> pool, Func<float> cb, string format)
+				: base(PdtInternalType.String) {
 				_pool = pool;
 				_cb = cb;
+				_format = string.Format("{{0:{0}}}", format);
 			}
 			public override void Invalidate() {
-				base.Invalidate();
+				if (buf != null) {
-				if (_buf != null) {
+					_pool.Return(buf);
-					_pool.Return(_buf);
+					base.Invalidate();
-					_buf = null;
 				}
 			}
-			protected override unsafe int InternalGet() {
+			protected override unsafe void InternalGet() {
 				var src = _cb();
-				int strlen = src.Length;
+				_buf.Clear();
+				_buf.AppendFormat(_format, src);
+				int strlen = _buf.Count;
 				buf = _pool.Rent(sizeof(int) + strlen * sizeof(char));
 				fixed (byte* _ptr = buf) {
-					char* ptr = (char*)(_ptr + sizeof(int));
 					*(int*)_ptr = strlen;
-					int i = 0;
+					char* ptr = (char*)(_ptr + sizeof(int));
-					foreach (var c in src) ptr[i++] = c;
+					_buf.CopyTo(ptr, 0, strlen);
 				}
-				return PdtInternalType.String;
 			}
 		}
 		#endregion
@@ -279,7 +286,7 @@ namespace Cryville.Crtr {
 		public Dictionary<Identifier, PdtExpression> pass;
 	}
 	public class JudgeDefinition {
-		public float[] clip;
+		public Clip clip;
 		public PdtExpression input;
 		public PdtExpression hit;
 		public Identifier[] pass;

Assets/Cryville/Crtr/Menu.cs.meta

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

Assets/Cryville/Crtr/Motion.cs

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

Assets/Cryville/Crtr/NoteHandler.cs

@@ -10,63 +10,66 @@ namespace Cryville.Crtr {
 	public class NoteHandler : ContainerHandler {
 		readonly GroupHandler gh;
 		public readonly Chart.Note Event;
-		readonly PdtRuleset ruleset;
+		public NoteHandler(Chart.Note ev, GroupHandler gh) : base() {
-		public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs) : base() {
-			this.gh = gh;
 			Event = ev;
-			ruleset = rs;
+			this.gh = gh;
 		}
 		
-		public override string TypeName {
+		public override string TypeName { get { return "note"; } }
-			get {
-				return "note";
-			}
-		}
 
 		SectionalGameObject[] sgos;
-		readonly Dictionary<Identifier, JudgeState> judges = new Dictionary<Identifier, JudgeState>();
+		readonly Dictionary<Chart.Judge, JudgeState> judges = new Dictionary<Chart.Judge, JudgeState>();
 		class JudgeState {
-			public int AbsoluteAnchorName { get; set; }
+			static readonly int _var_judge_result = IdentifierManager.SharedInstance.Request("judge_result");
-			public int RelativeAnchorName { get; set; }
+			static readonly int _var_judge_time_absolute = IdentifierManager.SharedInstance.Request("judge_time_absolute");
-			public bool Judged { get; private set; }
+			static readonly int _var_judge_time_relative = IdentifierManager.SharedInstance.Request("judge_time_relative");
+			public Anchor StaticAnchor { get; private set; }
 			public float AbsoluteTime { get; private set; }
+			PropSrc _jtabsPropSrc;
 			public float RelativeTime { get; private set; }
+			PropSrc _jtrelPropSrc;
+			public int Result { get; private set; }
+			PropSrc _resultPropSrc;
 			public JudgeState(NoteHandler handler, int name) {
-				handler.RegisterAnchor(AbsoluteAnchorName = handler.judge.jtabsMap[name]);
+				StaticAnchor = handler.RegisterAnchor(handler.judge.judgeMap[name], false, 3);
-				handler.RegisterAnchor(RelativeAnchorName = handler.judge.jtrelMap[name]);
 			}
-			public void MarkJudged(float abs, float rel) {
+			public void MarkJudged(float abs, float rel, int result) {
-				Judged = true;
 				AbsoluteTime = abs;
 				RelativeTime = rel;
+				Result = result;
+				_jtabsPropSrc.Invalidate();
+				_jtrelPropSrc.Invalidate();
+				_resultPropSrc.Invalidate();
+			}
+			public void InitPropSrcs() {
+				StaticAnchor.PropSrcs.Add(_var_judge_result, _resultPropSrc = new PropSrc.Identifier(() => Result));
+				StaticAnchor.PropSrcs.Add(_var_judge_time_absolute, _jtabsPropSrc = new PropSrc.Float(() => AbsoluteTime));
+				StaticAnchor.PropSrcs.Add(_var_judge_time_relative, _jtrelPropSrc = new PropSrc.Float(() => RelativeTime));
 			}
 		}
 
 		public override void PreInit() {
 			base.PreInit();
 			foreach (var j in Event.judges) {
-				if (!judges.ContainsKey(j.Id)) {
+				judges.Add(j, new JudgeState(this, j.Id.Key));
-					judges.Add(j.Id, new JudgeState(this, j.Id.Key));
-				}
 			}
 		}
 		public override void Init() {
 			base.Init();
 			sgos = gogroup.GetComponentsInChildren<SectionalGameObject>();
+			foreach (var judge in judges.Values) judge.InitPropSrcs();
 		}
-		protected override void PreAwake(ContainerState s) {
+
-			base.PreAwake(s);
+		public override void StartPhysicalUpdate(ContainerState s) {
-#if UNITY_5_6_OR_NEWER
+			base.StartPhysicalUpdate(s);
-			a_head.SetPositionAndRotation(Position = GetFramePoint(s.Parent, s.Track), Rotation = GetFrameRotation(s.Parent, s.Track));
-#else
-			a_head.position = Position = GetFramePoint(s.Parent, s.Track);
-			a_head.rotation = Rotation = GetFrameRotation(s.Parent, s.Track);
-#endif
-		}
-		protected override void Awake(ContainerState s) {
-			base.Awake(s);
 			if (s.CloneType == 2) {
-				if (!gogroup) return;
+				TransformAwake(s);
+			}
+		}
+		public override void StartGraphicalUpdate(ContainerState s) {
+			base.StartGraphicalUpdate(s);
+			TransformAwake(s);
+			if (gogroup) {
 				if (Event.IsLong) {
 					foreach (var i in sgos) {
 						i.Reset();
@@ -83,17 +86,18 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
+		void TransformAwake(ContainerState s) {
+			Position = GetFramePoint(s.Parent, s.Track);
+			Rotation = GetFrameRotation(s.Parent, s.Track);
+		}
 
 		public override void Update(ContainerState s, StampedEvent ev) {
 			base.Update(s, ev);
 			if (s.CloneType <= 2) {
 				Position = GetFramePoint(s.Parent, s.Track);
 				Rotation = GetFrameRotation(s.Parent, s.Track);
-			}
+				if (s.CloneType == 2) {
-			if (s.CloneType == 2) {
+					if (!gogroup || !Event.IsLong) return;
-				if (!gogroup) return;
-				Chart.Note tev = Event;
-				if (tev.IsLong) {
 					foreach (var i in sgos)
 						i.AppendPoint(Position, Rotation);
 				}
@@ -102,42 +106,20 @@ namespace Cryville.Crtr {
 				if (ev == null) { }
 				else if (ev.Unstamped == null) { }
 				else if (ev.Unstamped is Chart.Judge) {
-					var tev = (Chart.Judge)ev.Unstamped;
+					ChartPlayer.etor.ContextEvent = ev.Unstamped;
-					Identifier name = default(Identifier);
-					ChartPlayer.etor.ContextEvent = tev;
 					ChartPlayer.etor.ContextState = s;
-					ChartPlayer.etor.Evaluate(new PropOp.Identifier(v => name = new Identifier(v)), ruleset.judges[tev.Id].input);
+					judge.Prepare(ev, this);
-					judge.Prepare(ev.Time, ev.Time + ev.Duration, name, tev.Id, this);
 					ChartPlayer.etor.ContextState = null;
 					ChartPlayer.etor.ContextEvent = null;
 				}
 			}
 		}
 
-		public override void Anchor() {
+		public override void EndGraphicalUpdate(ContainerState s) {
-			base.Anchor();
+			if (gogroup) {
-			if (cs.Working) {
-				foreach (var j in judges.Values) {
-					if (!j.Judged) continue;
-					// PushAnchorEvent(j.AbsoluteAnchorName, j.AbsoluteTime);
-					// PushAnchorEvent(j.RelativeAnchorName, j.RelativeTime + cs.Time);
-				}
-			}
-		}
-
-		public override void EndUpdate(ContainerState s) {
-			if (s.CloneType == 2 && gogroup) {
 				foreach (var i in sgos) i.Seal();
-#if UNITY_5_6_OR_NEWER
-				a_tail.SetPositionAndRotation(GetFramePoint(ts.Parent, ts.Track), Quaternion.Euler(ts.Direction));
-#else
-				a_tail.position = GetFramePoint(ts.Parent, ts.Track);
-				a_tail.rotation = Quaternion.Euler(ts.Direction);
-#endif
 			}
-			OpenAnchor(_a_tail);
+			base.EndGraphicalUpdate(s);
-			base.EndUpdate(s);
-			CloseAnchor(_a_tail);
 		}
 		
 		Vector3 GetFramePoint(ContainerState state, float track) {
@@ -197,8 +179,8 @@ namespace Cryville.Crtr {
 
 		public void ReportJudge(Judge.JudgeEvent ev, float time, Identifier result) {
 			JudgeState state;
-			if (!judges.TryGetValue(ev.JudgeId, out state)) return;
+			if (!judges.TryGetValue(ev.BaseEvent, out state)) return;
-			state.MarkJudged(time, (float)(time - cs.Time));
+			state.MarkJudged(time, (float)(ev.StartTime - time), result.Key);
 		}
 	}
 }

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -11,16 +11,20 @@ namespace Cryville.Crtr {
 		static readonly Dictionary<PdtOperatorSignature, PdtOperator> _shortops = new Dictionary<PdtOperatorSignature, PdtOperator>();
 		readonly Dictionary<int, PdtOperator> _ctxops = new Dictionary<int, PdtOperator>();
 
+		static readonly byte[] _nullbuf = new byte[0];
 		readonly byte[] _numbuf = new byte[4];
 		static readonly int _var_w = IdentifierManager.SharedInstance.Request("w");
 		static readonly int _var_h = IdentifierManager.SharedInstance.Request("h");
+		static readonly int _var_current_time = IdentifierManager.SharedInstance.Request("current_time");
 		static readonly int _var_true = IdentifierManager.SharedInstance.Request("true");
 		static readonly int _var_false = IdentifierManager.SharedInstance.Request("false");
-		protected override void GetVariable(int name, out int type, out byte[] value) {
+		static readonly int _var_null = IdentifierManager.SharedInstance.Request("null");
+		protected override void GetVariable(int name, bool forced, out int type, out byte[] value) {
 			if (name == _var_w) { LoadNum(ChartPlayer.hitRect.width); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_h) { LoadNum(ChartPlayer.hitRect.height); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_true) { LoadNum(1); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_false) { LoadNum(0); type = PdtInternalType.Number; value = _numbuf; }
+			else if (name == _var_null) { LoadIdent(0); type = PdtInternalType.Undefined; value = _numbuf; }
 			else {
 				var id = new Identifier(name);
 				PropSrc prop;
@@ -29,7 +33,12 @@ namespace Cryville.Crtr {
 				}
 				else if (ContextState != null && ChartPlayer.motionRegistry.ContainsKey(id)) {
 					var vec = ContextState.GetRawValue(id);
-					new VectorSrc(() => vec).Get(out type, out value);
+					VectorSrc.Construct(() => vec).Get(out type, out value);
+				}
+				else if (ContextState != null && name == _var_current_time) {
+					LoadNum((float)ContextState.rootPrototype.Time);
+					type = PdtInternalType.Number;
+					value = _numbuf;
 				}
 				else if (ContextJudge != null && ContextJudge.TryGetScoreSrc(name, out prop)) {
 					prop.Get(out type, out value);
@@ -40,10 +49,14 @@ namespace Cryville.Crtr {
 					RevokePotentialConstant();
 				}
 				else {
-					PropSrc.Arbitrary result = ContextCascadeLookup(name);
+					PropSrc result = ContextCascadeLookup(name);
 					if (result != null) {
 						result.Get(out type, out value);
 					}
+					else if (forced) {
+						type = PdtInternalType.Error;
+						value = _nullbuf;
+					}
 					else {
 						type = PdtInternalType.Undefined;
 						LoadIdent(name);
@@ -84,6 +97,7 @@ namespace Cryville.Crtr {
 		static readonly int _colop_and = IdentifierManager.SharedInstance.Request("&");
 		static readonly int _colop_or = IdentifierManager.SharedInstance.Request("|");
 		protected override bool Collapse(int name, PdtVariableMemory param) {
+			if (param.Type == PdtInternalType.Error) throw new ArgumentException("Error");
 			if (name == _colop_and) return param.Type == PdtInternalType.Number && param.AsNumber() <= 0;
 			else if (name == _colop_or) return param.Type != PdtInternalType.Number || param.AsNumber() > 0;
 			else throw new KeyNotFoundException(string.Format("Undefined collapse operator {0}", IdentifierManager.SharedInstance.Retrieve(name)));
@@ -95,18 +109,22 @@ namespace Cryville.Crtr {
 		public Judge ContextJudge { private get; set; }
 		public PropSrc ContextSelfValue { private get; set; }
 
-		readonly Dictionary<int, PropSrc.Arbitrary>[] ContextCascade = new Dictionary<int, PropSrc.Arbitrary>[256];
+		readonly Dictionary<int, PropSrc>[] ContextCascade = new Dictionary<int, PropSrc>[256];
 		int _cascadeHeight;
 		public void ContextCascadeInsert() {
 			ContextCascade[_cascadeHeight++].Clear();
 		}
-		public void ContextCascadeUpdate(int key, PropSrc.Arbitrary value) {
+		public void ContextCascadeInsert(Dictionary<int, PropSrc> srcs) {
+			ContextCascadeInsert();
+			foreach (var src in srcs) ContextCascadeUpdate(src.Key, src.Value);
+		}
+		public void ContextCascadeUpdate(int key, PropSrc value) {
 			ContextCascade[_cascadeHeight - 1][key] = value;
 		}
-		public PropSrc.Arbitrary ContextCascadeLookup(int name) {
+		public PropSrc ContextCascadeLookup(int name) {
-			PropSrc.Arbitrary result;
+			PropSrc result;
 			for (int i = _cascadeHeight - 1; i >= 0; i--) {
-				Dictionary<int, PropSrc.Arbitrary> cas = ContextCascade[i];
+				Dictionary<int, PropSrc> cas = ContextCascade[i];
 				if (cas.TryGetValue(name, out result)) {
 					return result;
 				}
@@ -118,7 +136,7 @@ namespace Cryville.Crtr {
 		}
 
 		public PdtEvaluator() {
-			for (int i = 0; i < ContextCascade.Length; i++) ContextCascade[i] = new Dictionary<int, PropSrc.Arbitrary>();
+			for (int i = 0; i < ContextCascade.Length; i++) ContextCascade[i] = new Dictionary<int, PropSrc>();
 
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("screen_edge"), new func_screen_edge(() => ContextTransform));
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("int"), new func_int(() => ContextSelfValue));
@@ -154,6 +172,7 @@ namespace Cryville.Crtr {
 
 			_shortops.Add(new PdtOperatorSignature("frame_seq", 3), new func_frame_seq());
 			_shortops.Add(new PdtOperatorSignature("in_area", 1), new func_in_area());
+			_shortops.Add(new PdtOperatorSignature("is", 2), new func_is());
 		}
 		#region Operators
 #pragma warning disable IDE1006
@@ -336,6 +355,17 @@ namespace Cryville.Crtr {
 				hit.CopyTo(ret);
 			}
 		}
+		class func_is : PdtOperator {
+			public func_is() : base(2) { }
+			protected override unsafe void Execute() {
+				var op0 = GetOperand(0);
+				if (op0.Type == PdtInternalType.Error) throw new ArgumentException("Error");
+				var op1 = GetOperand(1);
+				if (op1.Type == PdtInternalType.Error) throw new ArgumentException("Error");
+				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
+				ret.SetNumber(op0.Equals(op1) ? 1 : 0);
+			}
+		}
 		#endregion
 		#region Contextual Functions
 		class func_screen_edge : PdtOperator {

Assets/Cryville/Crtr/PropOp.cs

@@ -4,11 +4,13 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using RBeatTime = Cryville.Crtr.BeatTime;
+using RClip = Cryville.Crtr.Clip;
 using RTargetString = Cryville.Common.Buffers.TargetString;
 
 namespace Cryville.Crtr {
 	public abstract class PropOp : PdtOperator {
-		internal PropOp() : base(1) { }
+		protected PropOp() : base(1) { }
+		protected PropOp(int pc) : base(pc) { }
 		public class Arbitrary : PropOp {
 			public int Name { get; set; }
 			protected override void Execute() {
@@ -25,6 +27,15 @@ namespace Cryville.Crtr {
 				_cb(GetOperand(0).AsNumber() > 0);
 			}
 		}
+		public class Clip : PropOp {
+			readonly Action<RClip> _cb;
+			public Clip(Action<RClip> cb) : base(2) { _cb = cb; }
+			protected override void Execute() {
+				if (LoadedOperandCount < 2)
+					throw new ArgumentException("Invalid clip syntax");
+				_cb(new RClip(GetOperand(0).AsNumber(), GetOperand(1).AsNumber()));
+			}
+		}
 		public class Integer : PropOp {
 			readonly Action<int> _cb;
 			public Integer(Action<int> cb) { _cb = cb; }

Assets/Cryville/Crtr/PropSrc.cs

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

Assets/Cryville/Crtr/Ruleset.cs

@@ -25,7 +25,7 @@ namespace Cryville.Crtr {
 		public void LoadPdt(DirectoryInfo dir) {
 			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) {
 				var src = pdtreader.ReadToEnd();
-				Root = new RulesetInterpreter(src, null).Interpret();
+				Root = (PdtRuleset)new RulesetInterpreter(src, null).Interpret();
 			}
 		}
 	}
@@ -150,9 +150,9 @@ namespace Cryville.Crtr {
 					ChartPlayer.etor.Evaluate(new PropOp.String(r => result = r), exp);
 					return result;
 				}
-				else if (type.Equals(typeof(float[]))) {
+				else if (type.Equals(typeof(Clip))) {
-					float[] result = null;
+					Clip result = default(Clip);
-					ChartPlayer.etor.Evaluate(new pop_numarr(r => result = r), exp);
+					ChartPlayer.etor.Evaluate(new PropOp.Clip(r => result = r), exp);
 					return result;
 				}
 				else if (type.Equals(typeof(Identifier))) {
@@ -182,17 +182,6 @@ namespace Cryville.Crtr {
 			return base.ChangeType(value, type, culture);
 		}
 #pragma warning disable IDE1006
-		class pop_numarr : PdtOperator {
-			readonly Action<float[]> _cb;
-			public pop_numarr(Action<float[]> cb) : base(16) { _cb = cb; }
-			protected override void Execute() {
-				var result = new float[LoadedOperandCount];
-				for (int i = 0; i < LoadedOperandCount; i++) {
-					result[i] = GetOperand(i).AsNumber();
-				}
-				_cb(result);
-			}
-		}
 		class pop_identstr : PropOp {
 			readonly Action<SIdentifier> _cb;
 			public pop_identstr(Action<SIdentifier> cb) { _cb = cb; }

Assets/Cryville/Crtr/RulesetInterpreter.cs

@@ -4,8 +4,8 @@ using System.Collections.Generic;
 using System.Reflection;
 
 namespace Cryville.Crtr {
-	internal class RulesetInterpreter : PdtInterpreter<PdtRuleset> {
+	internal class RulesetInterpreter : PdtInterpreter {
-		public RulesetInterpreter(string src, Binder binder) : base(src, binder) { }
+		public RulesetInterpreter(string src, Binder binder) : base(src, typeof(PdtRuleset), binder) { }
 
 		readonly List<RulesetSelector> s = new List<RulesetSelector>();
 		readonly List<string> a = new List<string>();

Assets/Cryville/Crtr/Skin.cs

@@ -1,13 +1,8 @@
-using Cryville.Common;
 using Cryville.Common.Pdt;
 using Cryville.Crtr.Browsing;
-using Cryville.Crtr.Components;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Reflection;
 using System.Text;
 
 namespace Cryville.Crtr {
@@ -30,14 +25,13 @@ namespace Cryville.Crtr {
 		public void LoadPdt(DirectoryInfo dir) {
 			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) {
 				var src = pdtreader.ReadToEnd();
-				Root = new SkinInterpreter(src, null).Interpret();
+				Root = (PdtSkin)new SkinInterpreter(src, null).Interpret();
 			}
 		}
 	}
 
 	public class PdtSkin : SkinElement { }
 
-	[Binder(typeof(SkinElementBinder))]
 	public class SkinElement {
 		[ElementList]
 		public Dictionary<SkinSelectors, SkinElement> elements
@@ -67,36 +61,4 @@ namespace Cryville.Crtr {
 			}
 		}
 	}
-	public struct SkinPropertyKey {
-		public Type Component;
-		public int Name;
-	}
-	public class SkinElementBinder : EmptyBinder {
-		public override object ChangeType(object value, Type type, CultureInfo culture) {
-			if (value is string && type == typeof(SkinPropertyKey)) {
-				var cp = ((string)value).Split('.');
-				switch (cp.Length) {
-					case 1:
-						var key = cp[0];
-						if (key[0] == '*')
-							return new SkinPropertyKey { Component = GetComponentByName(key.Substring(1)) };
-						else
-							return new SkinPropertyKey { Component = typeof(TransformInterface), Name = IdentifierManager.SharedInstance.Request(key) };
-					case 2:
-						return new SkinPropertyKey { Component = GetComponentByName(cp[0]), Name = IdentifierManager.SharedInstance.Request(cp[1]) };
-				}
-			}
-			return base.ChangeType(value, type, culture);
-		}
-
-		static readonly char[] nssep = new char[]{':'};
-		Type GetComponentByName(string name) {
-			var nstuple = name.Split(nssep, 2);
-			var ns = nssep.Length == 2 ? nstuple[0] : "generic";
-			name = nssep.Length == 2 ? nstuple[1] : nstuple[0];
-			if (ns == "generic")
-				return GenericResources.Components[name];
-			throw new ArgumentException(string.Format("Component type {0} not found", name));
-		}
-	}
 }

Assets/Cryville/Crtr/SkinContainer.cs

@@ -1,8 +1,5 @@
-using Cryville.Common;
 using Cryville.Common.Pdt;
-using Cryville.Crtr.Components;
 using Cryville.Crtr.Event;
-using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Profiling;
@@ -10,108 +7,159 @@ using UnityEngine.Profiling;
 namespace Cryville.Crtr {
 	public class SkinContainer {
 		readonly PdtSkin skin;
-		readonly List<DynamicProperty> dynprops = new List<DynamicProperty>();
+		readonly DynamicStack[] _stacks = new DynamicStack[2];
+		class DynamicStack {
+			public readonly List<DynamicProperty> Properties = new List<DynamicProperty>();
+			public readonly List<DynamicElement> Elements = new List<DynamicElement>();
+			public void Clear() {
+				Properties.Clear();
+				Elements.Clear();
+			}
+		}
 		struct DynamicProperty {
-			public Transform Anchor { get; set; }
+			public RuntimeSkinContext Context { get; set; }
 			public SkinPropertyKey Key { get; set; }
 			public PdtExpression Value { get; set; }
 		}
-		readonly List<DynamicElement> dynelems = new List<DynamicElement>();
 		struct DynamicElement {
-			public Transform Anchor { get; set; }
+			public RuntimeSkinContext Context { get; set; }
 			public SkinSelectors Selectors { get; set; }
 			public SkinElement Element { get; set; }
 		}
 		public SkinContainer(PdtSkin _skin) {
 			skin = _skin;
+			for (int i = 0; i < _stacks.Length; i++) _stacks[i] = new DynamicStack();
 		}
-		public void MatchStatic(ContainerState context) {
+		public void MatchStatic(ContainerState state) {
-			dynprops.Clear(); dynelems.Clear();
+			var stack = _stacks[0];
-			ChartPlayer.etor.ContextState = context;
+			stack.Clear();
-			ChartPlayer.etor.ContextEvent = context.Container;
+			ChartPlayer.etor.ContextState = state;
-			MatchStatic(skin, context, context.Handler.gogroup);
+			ChartPlayer.etor.ContextEvent = state.Container;
+			MatchStatic(skin, state, stack, new RuntimeSkinContext(state.Handler.SkinContext));
 			ChartPlayer.etor.ContextEvent = null;
 			ChartPlayer.etor.ContextState = null;
 		}
-		void MatchStatic(SkinElement rel, ContainerState context, Transform anchor = null) {
+		void MatchStatic(SkinElement rel, ContainerState state, DynamicStack stack, RuntimeSkinContext ctx) {
-			ChartPlayer.etor.ContextTransform = anchor;
+			var rc = ctx.ReadContext;
+			ChartPlayer.etor.ContextTransform = rc.Transform;
+			if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs);
 			foreach (var p in rel.properties) {
-				if (p.Key.Name == 0)
+				p.Key.ExecuteStatic(state, ctx, p.Value);
-					anchor.gameObject.AddComponent(p.Key.Component);
+				if (p.Key.IsValueRequired && !p.Value.IsConstant) stack.Properties.Add(
-				else {
+					new DynamicProperty { Context = ctx, Key = p.Key, Value = p.Value }
-					ChartPlayer.etor.Evaluate(GetPropOp(anchor, p.Key).Operator, p.Value);
+				);
-					if (!p.Value.IsConstant) dynprops.Add(
-						new DynamicProperty { Anchor = anchor, Key = p.Key, Value = p.Value }
-					);
-				}
 			}
 			ChartPlayer.etor.ContextTransform = null;
-			foreach (var r in rel.elements) {
+			foreach (var e in rel.elements) {
 				try {
-					var new_anchor = r.Key.MatchStatic(context, anchor);
+					var nctxs = e.Key.MatchStatic(state, rc);
-					if (new_anchor != null) {
+					if (nctxs != null) {
-						MatchStatic(r.Value, context, new_anchor);
+						var roflag = e.Key.annotations.Contains("if");
+						var woflag = e.Key.annotations.Contains("then");
+						foreach (var nctx in nctxs) {
+							var nrctx = new RuntimeSkinContext(nctx, ctx, roflag, woflag);
+							MatchStatic(e.Value, state, stack, nrctx);
+						}
 					}
 				}
-				catch (SelectorNotStaticException) {
+				catch (SelectorNotAvailableException) {
-					dynelems.Add(
+					stack.Elements.Add(
-						new DynamicElement { Anchor = anchor, Selectors = r.Key, Element = r.Value }
+						new DynamicElement { Context = ctx, Selectors = e.Key, Element = e.Value }
 					);
 				}
 			}
+			if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
 		}
-		public void MatchDynamic(ContainerState context) {
+		public void MatchDynamic(ContainerState state) {
-			if (dynprops.Count == 0 && dynelems.Count == 0) return;
+			var stack = _stacks[state.CloneType >> 1];
+			var nstack = (state.CloneType >> 1) + 1 < _stacks.Length ? _stacks[(state.CloneType >> 1) + 1] : null;
+			if (nstack != null) nstack.Clear();
+			if (stack.Properties.Count == 0 && stack.Elements.Count == 0) return;
 			Profiler.BeginSample("SkinContainer.MatchDynamic");
-			ChartPlayer.etor.ContextState = context;
+			ChartPlayer.etor.ContextState = state;
-			ChartPlayer.etor.ContextEvent = context.Container;
+			ChartPlayer.etor.ContextEvent = state.Container;
-			for (int i = 0; i < dynprops.Count; i++) {
+			for (int i = 0; i < stack.Properties.Count; i++) {
-				DynamicProperty p = dynprops[i];
+				DynamicProperty p = stack.Properties[i];
-				var prop = GetPropOp(p.Anchor, p.Key);
+				p.Key.ExecuteDynamic(state, p.Context, p.Value);
-				if (context.CloneType > prop.UpdateCloneType) continue;
-				ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
 			}
-			for (int i = 0; i < dynelems.Count; i++) {
+			for (int i = 0; i < stack.Elements.Count; i++) {
-				DynamicElement e = dynelems[i];
+				DynamicElement e = stack.Elements[i];
-				var anchor = e.Selectors.MatchDynamic(context, e.Anchor);
+				var psrcs = e.Context.ReadContext.PropSrcs;
-				if (anchor != null) MatchDynamic(e.Element, context, anchor);
+				if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs);
+				SkinContext nctx = null;
+				try {
+					nctx = e.Selectors.MatchDynamic(state, e.Context.ReadContext);
+				}
+				catch (SelectorNotAvailableException) {
+					if (nstack == null) throw;
+					nstack.Elements.Add(e);
+				}
+				if (nctx != null) MatchDynamic(e.Element, state, nstack, new RuntimeSkinContext(
+					nctx, e.Context, e.Selectors.annotations.Contains("if"), e.Selectors.annotations.Contains("then")
+				));
+				if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
 			}
 			ChartPlayer.etor.ContextEvent = null;
 			ChartPlayer.etor.ContextState = null;
 			Profiler.EndSample();
 		}
-		void MatchDynamic(SkinElement rel, ContainerState context, Transform anchor = null) {
+		void MatchDynamic(SkinElement rel, ContainerState state, DynamicStack stack, RuntimeSkinContext ctx) {
-			ChartPlayer.etor.ContextTransform = anchor;
+			var rc = ctx.ReadContext;
+			ChartPlayer.etor.ContextTransform = rc.Transform;
+			if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs);
 			foreach (var p in rel.properties) {
-				if (p.Key.Name == 0)
+				p.Key.ExecuteDynamic(state, ctx, p.Value);
-					throw new InvalidOperationException("Component creation in dynamic context is not allowed");
-				var prop = GetPropOp(anchor, p.Key);
-				if (context.CloneType > prop.UpdateCloneType) continue;
-				ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
 			}
 			ChartPlayer.etor.ContextTransform = null;
-			foreach (var r in rel.elements) {
+			foreach (var e in rel.elements) {
-				if (!r.Key.IsUpdatable(context)) continue;
+				if (e.Key.IsUpdatable(state)) {
-				var new_anchor = r.Key.MatchDynamic(context, anchor);
+					SkinContext nctx = e.Key.MatchDynamic(state, rc);
-				if (new_anchor != null) {
+					if (nctx != null) MatchDynamic(e.Value, state, stack, new RuntimeSkinContext(
-					MatchDynamic(r.Value, context, new_anchor);
+						nctx, ctx, e.Key.annotations.Contains("if"), e.Key.annotations.Contains("then")
+					));
+				}
+				else {
+					if (stack == null) throw new SelectorNotAvailableException();
+					stack.Elements.Add(
+						new DynamicElement { Context = ctx, Selectors = e.Key, Element = e.Value }
+					);
 				}
 			}
+			if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
 		}
-		SkinProperty GetPropOp(Transform obj, SkinPropertyKey key) {
+	}
-			var ctype = key.Component;
+	public class SkinContext {
-			var comp = (SkinComponent)obj.GetComponent(ctype);
+		public Transform Transform { get; private set; }
-			if (comp == null) throw new InvalidOperationException(string.Format(
+		public Dictionary<int, PropSrc> PropSrcs { get; private set; }
-				"Trying to set property {0} but the component is not found",
+		public SkinContext(Transform transform, Dictionary<int, PropSrc> propSrcs = null) {
-				IdentifierManager.SharedInstance.Retrieve(key.Name)
+			Transform = transform;
-			));
+			PropSrcs = propSrcs;
-			SkinProperty result;
+		}
-			if (!comp.Properties.TryGetValue(key.Name, out result))
+	}
-				throw new ArgumentException(string.Format(
+	public struct RuntimeSkinContext {
-					"Property {0} not found on component",
+		public SkinContext ReadContext { get; private set; }
-					IdentifierManager.SharedInstance.Retrieve(key.Name)
+		public Transform WriteTransform { get; private set; }
-				));
+		public RuntimeSkinContext(SkinContext rw) {
-			return result;
+			ReadContext = rw;
+			WriteTransform = rw.Transform;
+		}
+		public RuntimeSkinContext(SkinContext r, Transform w) {
+			ReadContext = r;
+			WriteTransform = w;
+		}
+		public RuntimeSkinContext(SkinContext newctx, RuntimeSkinContext oldctx, bool roflag, bool woflag) {
+			if (roflag) {
+				ReadContext = newctx;
+				WriteTransform = oldctx.WriteTransform;
+			}
+			else if (woflag) {
+				ReadContext = oldctx.ReadContext;
+				WriteTransform = newctx.Transform;
+			}
+			else {
+				ReadContext = newctx;
+				WriteTransform = newctx.Transform;
+			}
 		}
 	}
 }

Assets/Cryville/Crtr/SkinInterpreter.cs

@@ -1,17 +1,20 @@
-using Cryville.Common.Pdt;
+using Cryville.Common;
+using Cryville.Common.Pdt;
+using Cryville.Crtr.Components;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 
 namespace Cryville.Crtr {
-	public class SkinInterpreter : PdtInterpreter<PdtSkin> {
+	public class SkinInterpreter : PdtInterpreter {
-		public SkinInterpreter(string src, Binder binder) : base(src, binder) { }
+		public SkinInterpreter(string src, Binder binder) : base(src, typeof(PdtSkin), binder) { }
 
 		readonly List<SkinSelector> s = new List<SkinSelector>();
-		readonly List<string> a = new List<string>();
+		readonly HashSet<string> a = new HashSet<string>();
+		readonly List<string> k = new List<string>(2);
 		protected override object InterpretKey(Type type) {
-			s.Clear(); a.Clear();
+			s.Clear(); a.Clear(); k.Clear();
-			string key = "";
+			bool invalidKeyFlag = false, compKeyFlag = false;
 			while (true) {
 				int pp = Position;
 				switch (cc) {
@@ -22,19 +25,22 @@ namespace Cryville.Crtr {
 					case '$':
 						GetChar();
 						s.Add(new SkinSelector.CreateObject());
-						key = null;
+						invalidKeyFlag = true;
 						break;
 					case '.':
 						GetChar();
 						if (cc == '.') {
 							GetChar();
 							s.Add(new SkinSelector.AtAnchor(GetIdentifier()));
-							key = null;
+							invalidKeyFlag = true;
 						}
 						else {
 							var p3 = GetIdentifier();
 							s.Add(new SkinSelector.Anchor(p3));
-							if (key != null) key += "." + p3;
+							if (!invalidKeyFlag) {
+								if (k.Count != 1) invalidKeyFlag = true;
+								else k.Add(p3);
+							}
 						}
 						break;
 					case '>':
@@ -43,24 +49,61 @@ namespace Cryville.Crtr {
 						break;
 					case ';':
 					case ':':
-						return key;
+						if (invalidKeyFlag) throw new FormatException("Invalid key format");
+						if (a.Contains("has")) {
+							if (k.Count != 1) throw new FormatException("Invalid anchor name");
+							return new SkinPropertyKey.CreateAnchor {
+								Name = IdentifierManager.SharedInstance.Request(k[0])
+							};
+						}
+						else if (a.Contains("at")) {
+							if (k.Count != 1) throw new FormatException("Invalid anchor name");
+							return new SkinPropertyKey.SetAnchor {
+								Name = IdentifierManager.SharedInstance.Request(k[0])
+							};
+						}
+						switch (k.Count) {
+							case 1:
+								if (compKeyFlag) return new SkinPropertyKey.CreateComponent {
+									Component = GetComponentByName(k[0])
+								};
+								else return new SkinPropertyKey.SetProperty {
+									Component = typeof(TransformInterface),
+									Name = IdentifierManager.SharedInstance.Request(k[0])
+								};
+							case 2:
+								return new SkinPropertyKey.SetProperty {
+									Component = GetComponentByName(k[0]),
+									Name = IdentifierManager.SharedInstance.Request(k[1])
+								};
+							default:
+								throw new FormatException("Unknown error"); // Unreachable
+						}
 					case '{':
 						return new SkinSelectors(s, a);
 					case '}':
 						return null;
 					case '*':
 						GetChar();
-						key += "*";
+						compKeyFlag = true;
 						break;
 					default:
 						var p4 = GetIdentifier();
 						s.Add(new SkinSelector.ElementType(p4));
-						if (key != null) key += p4;
+						if (!invalidKeyFlag) {
+							if (k.Count != 0) invalidKeyFlag = true;
+							else k.Add(p4);
+						}
 						break;
 				}
 				ws();
 				if (Position == pp) throw new FormatException("Invalid selector or key format");
 			}
 		}
+		static Type GetComponentByName(string name) {
+			Type result;
+			if (GenericResources.Components.TryGetValue(name, out result)) return result;
+			throw new ArgumentException(string.Format("Component type \"{0}\" not found", name));
+		}
 	}
 }

Assets/Cryville/Crtr/SkinPropertyKey.cs

@@ -0,0 +1,101 @@
+using Cryville.Common;
+using Cryville.Common.Pdt;
+using Cryville.Crtr.Components;
+using Cryville.Crtr.Event;
+using System;
+using UnityEngine;
+
+namespace Cryville.Crtr {
+	public abstract class SkinPropertyKey {
+		public abstract override string ToString();
+		public abstract bool IsValueRequired { get; }
+		public abstract void ExecuteStatic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp);
+		public abstract void ExecuteDynamic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp);
+		public class CreateComponent : SkinPropertyKey {
+			public Type Component { get; set; }
+			public override string ToString() {
+				return string.Format("*{0}", Component.Name);
+			}
+			public override bool IsValueRequired { get { return false; } }
+			public override void ExecuteStatic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				ctx.ReadContext.Transform.gameObject.AddComponent(Component);
+			}
+			public override void ExecuteDynamic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				throw new InvalidOperationException("Component creation in dynamic context is not allowed");
+			}
+		}
+		public class SetProperty : SkinPropertyKey {
+			public Type Component { get; set; }
+			public int Name { get; set; }
+			public override string ToString() {
+				return string.Format("{0}.{1}", Component.Name, IdentifierManager.SharedInstance.Retrieve(Name));
+			}
+			public override bool IsValueRequired { get { return true; } }
+			public override void ExecuteStatic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				Execute(ctx, GetPropOp(ctx.WriteTransform).Operator, exp);
+			}
+			public override void ExecuteDynamic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				var prop = GetPropOp(ctx.WriteTransform);
+				if (state.CloneType > prop.UpdateCloneType) return;
+				Execute(ctx, prop.Operator, exp);
+			}
+			void Execute(RuntimeSkinContext ctx, PdtOperator op, PdtExpression exp) {
+				var psrcs = ctx.ReadContext.PropSrcs;
+				if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs);
+				ChartPlayer.etor.Evaluate(op, exp);
+				if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
+			}
+			SkinProperty GetPropOp(Transform obj) {
+				var ctype = Component;
+				var comp = (SkinComponent)obj.GetComponent(ctype);
+				if (comp == null) throw new InvalidOperationException(string.Format(
+					"Trying to set property \"{0}\" but the component is not found",
+					IdentifierManager.SharedInstance.Retrieve(Name)
+				));
+				SkinProperty result;
+				if (!comp.Properties.TryGetValue(Name, out result))
+					throw new InvalidOperationException(string.Format(
+						"Property \"{0}\" not found on component",
+						IdentifierManager.SharedInstance.Retrieve(Name)
+					));
+				return result;
+			}
+		}
+		public class CreateAnchor : SkinPropertyKey {
+			public int Name { get; set; }
+			public override string ToString() {
+				return string.Format("@has {0}", IdentifierManager.SharedInstance.Retrieve(Name));
+			}
+			public override bool IsValueRequired { get { return false; } }
+			public override void ExecuteStatic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				state.Handler.RegisterAnchor(Name, true);
+			}
+			public override void ExecuteDynamic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				throw new InvalidOperationException("Anchor creation in dynamic context is not allowed");
+			}
+		}
+		public class SetAnchor : SkinPropertyKey {
+			public int Name { get; set; }
+			public SetAnchor() {
+				_timeOp = new PropOp.Float(v => _time = v);
+			}
+			public override string ToString() {
+				return string.Format("@at {0}", IdentifierManager.SharedInstance.Retrieve(Name));
+			}
+			public override bool IsValueRequired { get { return true; } }
+			public override void ExecuteStatic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				throw new InvalidOperationException("Setting anchor in static context is not allowed");
+			}
+			float _time;
+			readonly PropOp _timeOp;
+			public override void ExecuteDynamic(ContainerState state, RuntimeSkinContext ctx, PdtExpression exp) {
+				if (state.CloneType > 1) return;
+				var psrcs = ctx.ReadContext.PropSrcs;
+				if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs);
+				ChartPlayer.etor.Evaluate(_timeOp, exp);
+				if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
+				state.Handler.PushAnchorEvent(_time, Name);
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/SkinPropertyKey.cs.meta

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

Assets/Cryville/Crtr/SkinSelectors.cs

@@ -7,23 +7,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
 using UnityEngine;
+using CAnchor = Cryville.Crtr.Anchor;
 
 namespace Cryville.Crtr {
 	public class SkinSelectors {
 		readonly SkinSelector[] selectors;
-		readonly string[] annotations;
+		public readonly HashSet<string> annotations;
 
 		public SkinSelectors(IEnumerable<SkinSelector> s, IEnumerable<string> a) {
 			selectors = s.ToArray();
-			annotations = a.ToArray();
+			annotations = a.ToHashSet();
 		}
 		public override string ToString() {
 			if (selectors.Length == 0) return "";
 			bool flag = false;
 			string r = "";
 			foreach (var a in annotations) {
-				if (flag) r += " " + a;
+				if (flag) r += " @" + a;
-				else { r += a; flag = true; }
+				else { r += "@" + a; flag = true; }
 			}
 			foreach (var s in selectors) {
 				if (flag) r += " " + s.ToString();
@@ -36,56 +37,46 @@ namespace Cryville.Crtr {
 				selectors[i].Optimize(etor);
 			}
 		}
-		public bool IsStatic {
+		public IEnumerable<SkinContext> MatchStatic(ContainerState h, SkinContext ctx) {
-			get {
+			IEnumerable<SkinContext> result = new SkinContext[] { ctx };
-				foreach (var s in selectors) {
-					if (!s.IsStatic) return false;
-				}
-				return true;
-			}
-		}
-		public Transform MatchStatic(ContainerState h, Transform anchor) {
 			foreach (var s in selectors) {
-				anchor = s.Match(h, anchor);
+				result = result.SelectMany(l => s.MatchStatic(h, l));
-				if (anchor == null) return null;
 			}
-			return anchor;
+			return result;
 		}
 		public bool IsUpdatable(ContainerState h) {
 			foreach (var s in selectors)
 				if (!s.IsUpdatable(h)) return false;
 			return true;
 		}
-		public Transform MatchDynamic(ContainerState h, Transform anchor) {
+		public SkinContext MatchDynamic(ContainerState h, SkinContext ctx) {
 			foreach (var s in selectors) {
-				anchor = s.Match(h, anchor, true);
+				ctx = s.MatchDynamic(h, ctx);
-				if (anchor == null) return null;
+				if (ctx == null) return null;
 			}
-			return anchor;
+			return ctx;
 		}
 	}
 
 	public abstract class SkinSelector {
 		protected SkinSelector() { }
-		public abstract bool IsStatic {
+		public abstract override string ToString();
-			get;
+
-		}
 		public virtual void Optimize(PdtEvaluatorBase etor) { }
-		public abstract Transform Match(ContainerState h, Transform a, bool dyn = false);
+		public virtual IEnumerable<SkinContext> MatchStatic(ContainerState h, SkinContext c) { throw new SelectorNotAvailableException(); }
+		public virtual SkinContext MatchDynamic(ContainerState h, SkinContext c) { throw new SelectorNotAvailableException(); }
 		public virtual bool IsUpdatable(ContainerState h) {
 			return true;
 		}
 		public class CreateObject : SkinSelector {
 			public CreateObject() { }
-			public override bool IsStatic {
+			public override string ToString() { return "$"; }
-				get { return true; }
+
-			}
+			public override IEnumerable<SkinContext> MatchStatic(ContainerState h, SkinContext c) {
-			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
-				if (dyn) throw new InvalidOperationException("Object creation in dynamic context is not allowed");
 				var obj = new GameObject("__obj__");
-				obj.transform.SetParent(a, false);
+				obj.transform.SetParent(c.Transform, false);
 				obj.AddComponent<TransformInterface>();
-				return obj.transform;
+				return new SkinContext[] { new SkinContext(obj.transform) };
 			}
 		}
 		public class Anchor : SkinSelector {
@@ -93,15 +84,14 @@ namespace Cryville.Crtr {
 			public Anchor(string name) {
 				Name = IdentifierManager.SharedInstance.Request(name);
 			}
-			public override bool IsStatic {
+			public override string ToString() { return string.Format(".{0}", IdentifierManager.SharedInstance.Retrieve(Name)); }
-				get { return true; }
-			}
 
-			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
+			public override IEnumerable<SkinContext> MatchStatic(ContainerState h, SkinContext c) {
-				return h.Handler.Anchors[Name].Transform;
+				List<CAnchor> anchors;
-			}
+				if (h.Handler.Anchors.TryGetValue(Name, out anchors)) {
-			public override bool IsUpdatable(ContainerState h) {
+					return anchors.Select(a => a.SkinContext);
-				return h.Handler.Anchors[Name].Opened;
+				}
+				else return Enumerable.Empty<SkinContext>();
 			}
 		}
 		public class AtAnchor : SkinSelector {
@@ -109,16 +99,13 @@ namespace Cryville.Crtr {
 			public AtAnchor(string name) {
 				Name = IdentifierManager.SharedInstance.Request(name);
 			}
-			public override bool IsStatic {
+			public override string ToString() { return string.Format("..{0}", IdentifierManager.SharedInstance.Retrieve(Name)); }
-				get { return false; }
-			}
 
-			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
+			public override SkinContext MatchDynamic(ContainerState h, SkinContext c) {
-				if (!dyn) throw new SelectorNotStaticException();
+				return h.Handler.OpenedAnchor != null && h.Handler.OpenedAnchor.Name == Name ? c : null;
-				return IsUpdatable(h) ? a : null;
 			}
 			public override bool IsUpdatable(ContainerState h) {
-				return h.Handler.Anchors[Name].Opened;
+				return h.CloneType >= 2;
 			}
 		}
 		public class Property : SkinSelector {
@@ -129,51 +116,47 @@ namespace Cryville.Crtr {
 				_exp = exp;
 				_op = new PropOp.Boolean(v => _flag = v);
 			}
+			public override string ToString() { return string.Format("> {{{0}}}", _exp); }
+
 			public override void Optimize(PdtEvaluatorBase etor) {
 				etor.Optimize(_exp);
 			}
-			public override bool IsStatic {
+			public override IEnumerable<SkinContext> MatchStatic(ContainerState h, SkinContext c) {
-				get { return _exp.IsConstant; }
+				var result = Match(c);
+				if (result != null) return new SkinContext[] { result };
+				else return Enumerable.Empty<SkinContext>();
 			}
-			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
+			public override SkinContext MatchDynamic(ContainerState h, SkinContext c) {
-				ChartPlayer.etor.ContextTransform = a;
+				return Match(c);
+			}
+			public SkinContext Match(SkinContext a) {
+				ChartPlayer.etor.ContextTransform = a.Transform;
 				try {
 					ChartPlayer.etor.Evaluate(_op, _exp);
 					return _flag ? a : null;
 				}
-				catch (Exception) {
+				catch (Exception ex) {
-					throw new SelectorNotStaticException();
+					throw new SelectorNotAvailableException("The expression is not evaluatable under the current context", ex);
 				}
 				finally {
 					ChartPlayer.etor.ContextTransform = null;
 				}
 			}
 		}
-		public class State : SkinSelector {
-			public State(string state) { }
-			public override bool IsStatic {
-				get { return false; }
-			}
-			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
-				if (!dyn) throw new SelectorNotStaticException();
-				return null;
-			}
-		}
 		public class ElementType : SkinSelector {
 			readonly string _type;
 			public ElementType(string type) { _type = type; }
-			public override bool IsStatic {
+			public override string ToString() { return _type; }
-				get { return true; }
+
-			}
+			public override IEnumerable<SkinContext> MatchStatic(ContainerState h, SkinContext c) {
-			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
+				return h.Handler.TypeName == _type ? new SkinContext[] { c } : Enumerable.Empty<SkinContext>();
-				return h.Handler.TypeName == _type ? a : null;
 			}
 		}
 	}
-	public class SelectorNotStaticException : Exception {
+	public class SelectorNotAvailableException : Exception {
-		public SelectorNotStaticException() : base("The selector is not static") { }
+		public SelectorNotAvailableException() : base("The selector is not available under the current context") { }
-		public SelectorNotStaticException(string message) : base(message) { }
+		public SelectorNotAvailableException(string message) : base(message) { }
-		public SelectorNotStaticException(string message, Exception innerException) : base(message, innerException) { }
+		public SelectorNotAvailableException(string message, Exception innerException) : base(message, innerException) { }
-		protected SelectorNotStaticException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+		protected SelectorNotAvailableException(SerializationInfo info, StreamingContext context) : base(info, context) { }
 	}
 }

Assets/Cryville/Crtr/StampedEvent.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using CAnchor = Cryville.Crtr.Anchor;
 
 namespace Cryville.Crtr {
 	public class StampedEvent : IComparable<StampedEvent> {
@@ -8,9 +8,7 @@ namespace Cryville.Crtr {
 		public ChartEvent Unstamped;
 		public EventContainer Container;
 		public StampedEvent Origin;
-		public List<StampedEvent> Subevents = new List<StampedEvent>();
+		public List<StampedEvent> Coevents;
-		private StampedEvent attev = null;
-		private StampedEvent relev = null;
 
 		public double Duration {
 			get {
@@ -28,24 +26,38 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		public class Anchor : StampedEvent {
+		public class Temporary : StampedEvent, IComparable<Temporary> {
-			public int Name;
+			public bool CanDiscard;
+			public int CompareTo(Temporary other) {
+				return base.CompareTo(other);
+			}
+		}
+
+		public class Anchor : Temporary {
+			public CAnchor Target;
+			int m_priority;
+			public override int Priority { get { return m_priority; } }
+			public void SetPriority(int value) { m_priority = value; }
+		}
+
+		public class ClipBehind : StampedEvent {
 			public override int Priority {
-				get { return 0; }
+				get { return Origin.Priority - 0x8000; }
 			}
 		}
 
-		public StampedEvent AttackEvent {
+		public class ClipAhead : StampedEvent {
-			get {
+			public override int Priority {
-				if (attev == null) attev = Subevents.FirstOrDefault(ev => ev.Time == this.Time);
+				get { return 0x7fff - Origin.Priority; }
-				return attev;
 			}
 		}
 
+		StampedEvent relev = null;
 		public StampedEvent ReleaseEvent {
-			get {
+			get { return relev; }
-				if (relev == null) relev = Subevents.FirstOrDefault(ev => ((InstantEvent)ev.Unstamped).IsRelease);
+			set {
-				return relev;
+				if (relev != null) throw new InvalidOperationException("Release event already set");
+				relev = value;
 			}
 		}
 		

Assets/Cryville/Crtr/StateBase.cs

@@ -1,71 +1,128 @@
-using System;
 using System.Collections.Generic;
 
 namespace Cryville.Crtr {
+	/// <summary>
+	/// A time-forward handler of a sequence of events.
+	/// </summary>
+	/// <typeparam name="T">The event type.</typeparam>
 	public abstract class StateBase<T> {
-		public int EventId;
+		/// <summary>
-		public double Time;
+		/// The current time of the state in seconds.
-		public Chart chart;
+		/// </summary>
-		public List<T> events;
+		public double Time { get; protected set; }
+		/// <summary>
+		/// The index of the event to be handled next.
+		/// </summary>
+		protected int EventId;
+		/// <summary>
+		/// The event list.
+		/// </summary>
+		protected readonly List<T> Events;
 
 		bool breakflag = false;
 		
-		public StateBase(Chart c, List<T> evs) {
+		/// <summary>
-			chart = c;
+		/// Creates an instance of the <see cref="StateBase{T}" /> class.
-			events = evs;
+		/// </summary>
+		/// <param name="evs">The event list.</param>
+		public StateBase(List<T> evs) {
+			Events = evs;
 			EventId = 0;
 			Time = 0;
 		}
 
+		/// <summary>
+		/// Creates a copy of the current state.
+		/// </summary>
+		/// <returns>A copy of the current state.</returns>
+		/// <remarks>
+		/// <para><see cref="Events" /> is shared across copies.</para>
+		/// </remarks>
 		public virtual StateBase<T> Clone() {
 			return (StateBase<T>)MemberwiseClone();
 		}
 
+		/// <summary>
+		/// Copies the state to another existing state.
+		/// </summary>
+		/// <param name="dest">The state to be overridden.</param>
 		public virtual void CopyTo(StateBase<T> dest) {
-			dest.EventId = EventId;
 			dest.Time = Time;
+			dest.EventId = EventId;
 			dest.breakflag = breakflag;
 		}
 
+		/// <summary>
+		/// Interrupts the forward process.
+		/// </summary>
 		public virtual void Break() {
 			breakflag = true;
 		}
 
-		public void Forward(Action<T> callback = null) {
+		/// <summary>
-			ForwardToTime(double.PositiveInfinity, callback);
+		/// Walks through all the remaining events.
+		/// </summary>
+		public void Forward() {
+			ForwardToTime(double.PositiveInfinity);
 		}
 
-		public void ForwardByTime(double time, Action<T> callback = null) {
+		/// <summary>
-			ForwardToTime(Time + time, callback);
+		/// Forwards the time by the specified span and walks through all the encountered events.
+		/// </summary>
+		/// <param name="time">The span in seconds.</param>
+		public void ForwardByTime(double time) {
+			ForwardToTime(Time + time);
 		}
 
-		public void ForwardOnceByTime(double time, Action<T> callback = null) {
+		/// <summary>
-			ForwardOnceToTime(Time + time, callback);
+		/// Forwards the time by the specified span but walks through at most one event.
+		/// </summary>
+		/// <param name="time">The span in seconds.</param>
+		public void ForwardOnceByTime(double time) {
+			ForwardOnceToTime(Time + time);
 		}
 
-		public void ForwardToTime(double toTime, Action<T> callback = null) {
+		/// <summary>
+		/// Forwards the time to the specified time and walks through all the encountered events.
+		/// </summary>
+		/// <param name="toTime">The time in seconds.</param>
+		public void ForwardToTime(double toTime) {
 			breakflag = false;
-			ForwardOnceToTime(Time, callback);
+			ForwardOnceToTime(Time);
 			while (Time < toTime) {
-				ForwardOnceToTime(toTime, callback);
+				ForwardOnceToTime(toTime);
 				if (breakflag) break;
 			}
 		}
 
-		public void ForwardStepByTime(double time, double step, Action<T> callback = null) {
+		/// <summary>
-			ForwardStepToTime(Time + time, step, callback);
+		/// Forwards the time by the specified span and walks through all the encountered events, with a specified step.
+		/// </summary>
+		/// <param name="time">The span in seconds.</param>
+		/// <param name="step">The step in seconds.</param>
+		public void ForwardStepByTime(double time, double step) {
+			ForwardStepToTime(Time + time, step);
 		}
 
-		public void ForwardStepToTime(double toTime, double step, Action<T> callback = null) {
+		/// <summary>
+		/// Forwards the time to the specified time and walks through all the encountered events, with a specified step.
+		/// </summary>
+		/// <param name="toTime">The time in seconds.</param>
+		/// <param name="step">The step in seconds.</param>
+		public void ForwardStepToTime(double toTime, double step) {
 			breakflag = false;
-			ForwardOnceToTime(Time, callback);
+			ForwardOnceToTime(Time);
 			while (Time < toTime) {
 				double next = Time + step;
-				ForwardOnceToTime(next < toTime ? next : toTime, callback);
+				ForwardOnceToTime(next < toTime ? next : toTime);
 				if (breakflag) break;
 			}
 		}
-		
+
-		public abstract void ForwardOnceToTime(double toTime, Action<T> callback = null);
+		/// <summary>
+		/// Forwards the time to the specified time but walks through at most one event.
+		/// </summary>
+		/// <param name="toTime">The time in seconds.</param>
+		public abstract void ForwardOnceToTime(double toTime);
 	}
 }

Assets/Cryville/Crtr/TrackHandler.cs

@@ -7,16 +7,12 @@ namespace Cryville.Crtr {
 		readonly GroupHandler gh;
 		readonly Chart.Track track;
 
-		public TrackHandler(GroupHandler gh, Chart.Track _track) : base() {
+		public TrackHandler(Chart.Track ev, GroupHandler gh) : base() {
-			track = _track;
+			track = ev;
 			this.gh = gh;
 		}
 		
-		public override string TypeName {
+		public override string TypeName { get { return "track"; } }
-			get {
-				return "track";
-			}
-		}
 
 		public override void Init() {
 			base.Init();
@@ -25,34 +21,37 @@ namespace Cryville.Crtr {
 		SectionalGameObject[] sgos;
 		Vector3 bpos; Quaternion brot;
 		Vector3 spos;
-		protected override void PreAwake(ContainerState s) {
+		public override void StartPhysicalUpdate(ContainerState s) {
-			base.PreAwake(s);
+			base.StartPhysicalUpdate(s);
+			if (CanDoGraphicalUpdate(s)) {
+				TransformAwake(s);
+			}
+		}
+		public override void StartPreGraphicalUpdate(ContainerState s) {
+			base.StartPreGraphicalUpdate(s);
+			TransformAwake(s);
+		}
+		public override void StartGraphicalUpdate(ContainerState s) {
+			base.StartGraphicalUpdate(s);
+			if (gogroup) {
+				TransformAwake(s);
+				var p = GetCurrentWorldPoint();
+				foreach (var i in sgos) {
+					i.Reset();
+					i.AppendPoint(p, s.QuatDir);
+				}
+			}
+		}
+		void TransformAwake(ContainerState s) {
 			pwp = Vector3.zero;
 			cpt = s.ScreenPoint;
 			ptime = s.Time;
-			if (s.CloneType == 2) {
+			if (s.CloneType == 3) {
-#if UNITY_5_6_OR_NEWER
-				a_head.SetPositionAndRotation(GetCurrentWorldPoint(), Quaternion.Euler(s.Direction));
-#else
-				a_head.position = GetCurrentWorldPoint();
-				a_head.rotation = Quaternion.Euler(s.Direction);
-#endif
-			}
-			else if (s.CloneType == 3) {
 				spos = Vector3.zero;
 				bpos = cpt;
 				brot = Quaternion.Euler(s.Direction);
 			}
 		}
-		protected override void Awake(ContainerState s) {
-			base.Awake(s);
-			if (!gogroup) return;
-			var p = GetCurrentWorldPoint();
-			foreach (var i in sgos) {
-				i.Reset();
-				i.AppendPoint(p, s.QuatDir);
-			}
-		}
 
 		Vector3 cpt; // Current point
 		Vector3 ppt = Vector3.zero; // Previous point
@@ -62,7 +61,7 @@ namespace Cryville.Crtr {
 
 		public override void Update(ContainerState s, StampedEvent ev) {
 			base.Update(s, ev);
-			if (s.CloneType == 2 || s.CloneType == 3) {
+			if (CanDoGraphicalUpdate(s)) {
 				var tpt = s.ScreenPoint;
 				var tsv = s.ScrollVelocity;
 
@@ -106,26 +105,14 @@ namespace Cryville.Crtr {
 			spos = bpos - GetCurrentWorldPoint();
 		}
 
-		public override void EndUpdate(ContainerState s) {
+		public override void EndGraphicalUpdate(ContainerState s) {
-			OpenAnchor(_a_tail);
+			base.EndGraphicalUpdate(s);
-			base.EndUpdate(s);
+			EndUpdatePosition(s);
-			CloseAnchor(_a_tail);
+			var p = GetCurrentWorldPoint();
-			if (s.CloneType == 0 || s.CloneType == 2) {
+			foreach (var i in sgos) {
-				EndUpdatePosition(ts);
+				i.AppendPoint(p, s.QuatDir);
-				var p = GetCurrentWorldPoint();
+				i.Seal();
-				foreach (var i in sgos) {
-					i.AppendPoint(p, s.QuatDir);
-					i.Seal();
-				}
-#if UNITY_5_6_OR_NEWER
-				a_tail.SetPositionAndRotation(GetCurrentWorldPoint(), Quaternion.Euler(ts.Direction));
-#else
-				a_tail.position = GetCurrentWorldPoint();
-				a_tail.rotation = Quaternion.Euler(ts.Direction);
-#endif
 			}
-			else if (s.CloneType == 3) EndUpdatePosition(ns);
-			else if (s.CloneType >= 16) EndUpdatePosition(ps);
 		}
 
 		void EndUpdatePosition(ContainerState s) {

Assets/Cryville/Cryville.Crtr.asmdef

@@ -3,7 +3,9 @@
     "rootNamespace": "",
     "references": [
         "GUID:d8ea0e0da3ad53a45b65c912ffcacab0",
-        "GUID:5686e5ee69d0e084c843d61c240d7fdb"
+        "GUID:5686e5ee69d0e084c843d61c240d7fdb",
+        "GUID:2922aa74af3b2854e81b8a8b286d8206",
+        "GUID:da293eebbcb9a4947a212534c52d1a32"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Cryville/GlobalSuppressions.cs

@@ -27,6 +27,7 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Style", "IDE0034")]
 
 // Simplified new not supported
+[assembly: SuppressMessage("Style", "IDE0017")]
 [assembly: SuppressMessage("Style", "IDE0090")]
 
 // Pattern matching not supported

Assets/Plugins/StringFormatter.meta

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

Assets/Plugins/StringFormatter/CustomNumeric.cs

@@ -0,0 +1,337 @@
+// Copyright (c) 2023 Cryville
+//
+// This file contains an implementation of the stub for custom format string
+// originally written by Michael Popoloski. Below is the original license.
+//
+// Copyright (c) 2015-2017 Michael Popoloski
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace System.Text.Formatting {
+	// this file contains the custom numeric formatting routines split out from the Numeric.cs file
+	unsafe partial class Numeric {
+		static void NumberToCustomFormatString(StringBuffer formatter, ref Number number, StringView specifier, CachedCulture culture) {
+			// Special: Handle special values
+			switch (number.Scale) {
+				case ScaleInf: formatter.Append(number.Sign == 0 ? culture.PositiveInfinity : culture.NegativeInfinity); return;
+				case ScaleNaN: formatter.Append(culture.NaN); return;
+			}
+			// Iteration 1: Split by semicolon
+			int specifierPositiveEnd = IndexOfSectionSeparator(specifier);
+			int specifierNegativeStart = 0, specifierNegativeEnd, specifierZeroStart = 0;
+			if (specifierPositiveEnd == -1) {
+				specifierPositiveEnd = specifierNegativeEnd = specifier.Length;
+			}
+			else {
+				specifierNegativeStart = specifierPositiveEnd + 1;
+				specifierNegativeEnd = IndexOfSectionSeparator(specifier, specifierNegativeStart);
+				if (specifierNegativeEnd == -1) {
+					specifierNegativeEnd = specifier.Length;
+				}
+				else {
+					specifierZeroStart = specifierNegativeEnd + 1;
+				}
+			}
+			// Special: Handle zero
+			if (IsZero(ref number)) {
+				FormatCustomFormatString(formatter, ref number, null, specifier, specifierZeroStart, specifier.Length, culture);
+				return;
+			}
+			// Iteration 2: Divide and round number
+			int originalScale = number.Scale;
+			if (number.Sign == 0) ApplyDivisionAndPrecision(ref number, specifier, 0, specifierPositiveEnd);
+			else ApplyDivisionAndPrecision(ref number, specifier, specifierNegativeStart, specifierNegativeEnd);
+			// Iteration 3: Count; Iteration 4: Format
+			if (IsZero(ref number)) FormatCustomFormatString(formatter, ref number, null, specifier, specifierZeroStart, specifier.Length, culture);
+			else if (number.Sign == 0) FormatCustomFormatString(formatter, ref number, originalScale, specifier, 0, specifierPositiveEnd, culture);
+			else {
+				if (specifierNegativeStart == 0) formatter.Append(culture.NegativeSign);
+				FormatCustomFormatString(formatter, ref number, originalScale, specifier, specifierNegativeStart, specifierNegativeEnd, culture);
+			}
+		}
+		static int IndexOfSectionSeparator(StringView specifier) {
+			return IndexOfSectionSeparator(specifier, 0);
+		}
+		static int IndexOfSectionSeparator(StringView specifier, int index) {
+			if (index < 0 || index > specifier.Length) throw new ArgumentOutOfRangeException("index");
+			char* ptr = specifier.Data;
+			for (; index < specifier.Length; index++) {
+				switch (ptr[index]) {
+					case ';': return index;
+					case '\\':
+						index++;
+						if (index >= specifier.Length) throw new FormatException();
+						break;
+					case '\'':
+						SkipLiteral(specifier, ref index, '\'');
+						break;
+					case '"':
+						SkipLiteral(specifier, ref index, '"');
+						break;
+				}
+			}
+			return -1;
+		}
+		static bool IsZero(ref Number number) {
+			char* ptr = number.Digits;
+			while (*ptr != '\0') if (*ptr++ != '0') return false;
+			return true;
+		}
+		static void ApplyDivisionAndPrecision(ref Number number, StringView specifier, int index, int end) {
+			int deltaScale = 0, scalingSpecifiers = 0;
+			int integralDigits = 0, decimalDigits = 0;
+			bool decimalFlag = false, exponentialFlag = false;
+			char* ptr = specifier.Data;
+			for (; index < end; index++) {
+				switch (ptr[index]) {
+					case '\\':
+						if (++index >= end) throw new FormatException();
+						break;
+					case '\'':
+						SkipLiteral(specifier, ref index, '\'');
+						break;
+					case '"':
+						SkipLiteral(specifier, ref index, '"');
+						break;
+					case '0':
+					case '#':
+						if (decimalFlag) decimalDigits++;
+						else integralDigits++;
+						scalingSpecifiers = 0;
+						break;
+					case '.': decimalFlag = true; deltaScale -= scalingSpecifiers * 3; break;
+					case ',': scalingSpecifiers++; break;
+					case '%': deltaScale += 2; break;
+					case '‰': deltaScale += 3; break;
+					case 'E':
+					case 'e':
+						if (++index >= end) goto exit;
+						char tc0 = ptr[index];
+						if (tc0 == '+' || tc0 == '-') {
+							if (++index >= end) goto exit;
+						}
+						if (ptr[index] != '0') break;
+						exponentialFlag = true;
+						for (index++; index < end && ptr[index] == '0'; index++) ;
+						index--;
+						break;
+				}
+			}
+		exit:
+			if (exponentialFlag) {
+				number.Scale = integralDigits;
+				RoundNumber(ref number, integralDigits + decimalDigits);
+			}
+			else {
+				number.Scale += deltaScale;
+				RoundNumber(ref number, number.Scale + decimalDigits);
+			}
+		}
+		static void FormatCustomFormatString(StringBuffer formatter, ref Number number, int? originalScale, StringView specifier, int index, int end, CachedCulture culture) {
+			int start = index;
+			int integralDigits = 0, integralZeros = 0,
+				decimalDigits  = 0, decimalZeros  = 0;
+			bool integralHasZeroFlag = false;
+			int exponentialZeros = 0;
+			bool decimalFlag = false;
+			bool commaFlag = false, groupFlag = false;
+			char* ptr = specifier.Data;
+			for (; index < end; index++) {
+				switch (ptr[index]) {
+					case '\\':
+						if (++index >= end) throw new FormatException();
+						break;
+					case '\'':
+						SkipLiteral(specifier, ref index, '\'');
+						break;
+					case '"':
+						SkipLiteral(specifier, ref index, '"');
+						break;
+					case '0':
+						if (decimalFlag) {
+							if (decimalZeros < decimalDigits)
+								decimalZeros = decimalDigits;
+							decimalDigits++;
+							decimalZeros++;
+						}
+						else {
+							integralDigits++;
+							integralZeros++;
+							integralHasZeroFlag = true;
+							if (commaFlag) groupFlag = true;
+						}
+						break;
+					case '#':
+						if (decimalFlag) {
+							decimalDigits++;
+						}
+						else {
+							integralDigits++;
+							if (integralHasZeroFlag) integralZeros++;
+							if (commaFlag) groupFlag = true;
+						}
+						break;
+					case '.': decimalFlag = true; commaFlag = false; break;
+					case ',': commaFlag = true; break;
+					case 'E':
+					case 'e':
+						if (++index >= end) goto exit;
+						char tc0 = ptr[index];
+						if (tc0 == '+' || tc0 == '-') {
+							if (++index >= end) goto exit;
+						}
+						if (ptr[index] != '0') break;
+						for (; index < end && ptr[index] == '0'; index++) exponentialZeros++;
+						index--;
+						break;
+				}
+			}
+		exit:
+			int currentDigitIndex = 0;
+			int groupIndex = 0, remainingDigitsInGroup = Math.Max(number.Scale, decimalZeros);
+			if (groupFlag) while (true) {
+				int groupSize = culture.NumberData.GroupSizes.ElementAtOrLast(groupIndex);
+				if (remainingDigitsInGroup <= groupSize) break;
+				remainingDigitsInGroup -= groupSize;
+				groupIndex++;
+			}
+			bool appendingDigitFlag = false;
+			decimalFlag = false;
+			for (index = start; index < end; index++) {
+				switch (ptr[index]) {
+					case '\\':
+						if (++index >= end) throw new FormatException();
+						formatter.Append(ptr[index]);
+						break;
+					case '\'':
+						formatter.AppendLiteral(specifier, ref index, '\'');
+						break;
+					case '"':
+						formatter.AppendLiteral(specifier, ref index, '"');
+						break;
+					case '0':
+					case '#':
+						if (!appendingDigitFlag) {
+							if (number.Scale > integralDigits) while (currentDigitIndex < number.Scale - integralDigits)
+								formatter.AppendIntegralDigit(ref number, ref currentDigitIndex, culture, groupFlag, ref groupIndex, ref remainingDigitsInGroup);
+							appendingDigitFlag = true;
+						}
+						if (decimalFlag) {
+							if (currentDigitIndex < number.Precision) {
+								char digit = number.Digits[currentDigitIndex++];
+								if (digit == '\0') digit = '0';
+								formatter.Append(digit);
+							}
+							else if (decimalZeros > 0)
+								formatter.Append('0');
+							--decimalDigits;
+							--decimalZeros;
+						}
+						else {
+							if (integralDigits <= number.Scale)
+								formatter.AppendIntegralDigit(ref number, ref currentDigitIndex, culture, groupFlag, ref groupIndex, ref remainingDigitsInGroup);
+							else if (integralDigits <= integralZeros)
+								formatter.AppendIntegralDigit('0', culture, groupFlag, ref groupIndex, ref remainingDigitsInGroup);
+							--integralDigits;
+						}
+						break;
+					case '.': formatter.Append(culture.NumberData.DecimalSeparator); decimalFlag = true; break;
+					case ',': break;
+					case '%': formatter.Append(culture.PercentSymbol); break;
+					case '‰': formatter.Append(culture.PerMilleSymbol); break;
+					case 'E':
+					case 'e':
+						char exponentialSymbol = ptr[index];
+						if (++index >= end) {
+							index--;
+							goto default;
+						}
+						char tc0 = ptr[index];
+						bool hasPlusFlag = false;
+						if (tc0 == '+' || tc0 == '-') {
+							if (++index >= end) {
+								index -= 2;
+								goto default;
+							}
+							if (tc0 == '+') hasPlusFlag = true;
+						}
+						if (ptr[index] != '0') {
+							index -= 2;
+							goto default;
+						}
+						for (index++; index < end && ptr[index] == '0'; index++) ;
+						index--;
+
+						int exp = originalScale == null ? 0 : originalScale.Value - number.Scale;
+						formatter.Append(exponentialSymbol);
+						if (exp < 0) {
+							formatter.Append(culture.NegativeSign);
+							exp = -exp;
+						}
+						else if (hasPlusFlag) {
+							formatter.Append(culture.PositiveSign);
+						}
+						Int32ToDecStr(formatter, exp, exponentialZeros, "");
+						break;
+					default:
+						formatter.Append(ptr[index]);
+						break;
+				}
+			}
+		}
+		static void AppendIntegralDigit(this StringBuffer self, ref Number number, ref int index, CachedCulture culture, bool groupFlag, ref int groupIndex, ref int remainingDigitsInGroup) {
+			char digit;
+			if (index >= number.Precision) digit = '0';
+			else digit = number.Digits[index];
+			if (digit == '\0') digit = '0';
+			self.AppendIntegralDigit(digit, culture, groupFlag, ref groupIndex, ref remainingDigitsInGroup);
+			index++;
+		}
+		static void AppendIntegralDigit(this StringBuffer self, char digit, CachedCulture culture, bool groupFlag, ref int groupIndex, ref int remainingDigitsInGroup) {
+			self.Append(digit);
+			if (!groupFlag) return;
+			if (--remainingDigitsInGroup == 0) {
+				if (--groupIndex >= 0) {
+					remainingDigitsInGroup = culture.NumberData.GroupSizes.ElementAtOrLast(groupIndex);
+					self.Append(culture.NumberData.GroupSeparator);
+				}
+			}
+		}
+		static T ElementAtOrLast<T>(this T[] arr, int index) {
+			if (index >= arr.Length) index = arr.Length - 1;
+			return arr[index];
+		}
+		static void SkipLiteral(StringView specifier, ref int index, char delimiter) {
+			while (++index < specifier.Length) {
+				if (specifier.Data[index] == delimiter) return;
+			}
+			throw new FormatException();
+		}
+		static void AppendLiteral(this StringBuffer self, StringView specifier, ref int index, char delimiter) {
+			int start = index + 1;
+			while (++index < specifier.Length) {
+				if (specifier.Data[index] == delimiter) {
+					self.Append(specifier.Data + start, index - start);
+					return;
+				}
+			}
+			throw new FormatException();
+		}
+	}
+}

Assets/Plugins/StringFormatter/CustomNumeric.cs.meta

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

Assets/Plugins/StringFormatter/StringFormatter.asmdef

@@ -0,0 +1,14 @@
+{
+    "name": "StringFormatter",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": true
+}

Assets/Plugins/StringFormatter/StringFormatter.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2922aa74af3b2854e81b8a8b286d8206
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/StringFormatter/StringFormatter.cs.meta

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

Assets/Plugins/UnsafeIL.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: d927992f95b82f740a0a95bb6d617d73
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/LineBreaking Following Characters.txt

@@ -0,0 +1 @@
+)]｝〕〉》」』】〙〗〟’”｠»ヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻‐゠–〜?!‼⁇⁈⁉・、%,.:;。！？］）：；＝}¢°"†‡℃〆％，．

Assets/Resources/LineBreaking Following Characters.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fade42e8bc714b018fac513c043d323b
+timeCreated: 1425440388
+licenseType: Store
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/LineBreaking Leading Characters.txt

@@ -0,0 +1 @@
+([｛〔〈《「『【〘〖〝‘“｟«$—…‥〳〴〵\［（{£¥"々〇＄￥￦ #

Assets/Resources/LineBreaking Leading Characters.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d82c1b31c7e74239bff1220585707d2b
+timeCreated: 1425440388
+licenseType: Store
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/TMP Settings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f5b5dff67a942289a9defa416b206f3
+timeCreated: 1436653997
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/TextMesh Pro.meta

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

Assets/Resources/TextMesh Pro/Shaders.meta

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

Assets/Resources/TextMesh Pro/Shaders/SDFFunctions.hlsl

@@ -0,0 +1,178 @@
+float2 UnpackUV(float uv)
+{
+	float2 output;
+	output.x = floor(uv / 4096.0);
+	output.y = uv - 4096.0 * output.x;
+
+	return output * 0.001953125;
+}
+
+float4 BlendARGB(float4 overlying, float4 underlying)
+{
+	overlying.rgb *= overlying.a;
+	underlying.rgb *= underlying.a;
+	float3 blended = overlying.rgb + ((1 - overlying.a) * underlying.rgb);
+	float alpha = underlying.a + (1 - underlying.a) * overlying.a;
+	return float4(blended / alpha, alpha);
+}
+
+float3 GetSpecular(float3 n, float3 l)
+{
+	float spec = pow(max(0.0, dot(n, l)), _Reflectivity);
+	return _SpecularColor.rgb * spec * _SpecularPower;
+}
+
+void GetSurfaceNormal_float(texture2D atlas, float textureWidth, float textureHeight, float2 uv, bool isFront, out float3 nornmal)
+{
+	float3 delta = float3(1.0 / textureWidth, 1.0 / textureHeight, 0.0);
+
+	// Read "height field"
+	float4 h = float4(
+		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv - delta.xz).a,
+		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv + delta.xz).a,
+		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv - delta.zy).a,
+		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv + delta.zy).a);
+
+	bool raisedBevel = _BevelType;
+
+	h += _BevelOffset;
+
+	float bevelWidth = max(.01, _BevelWidth);
+
+	// Track outline
+	h -= .5;
+	h /= bevelWidth;
+	h = saturate(h + .5);
+
+	if (raisedBevel) h = 1 - abs(h * 2.0 - 1.0);
+	h = lerp(h, sin(h * 3.141592 / 2.0), float4(_BevelRoundness, _BevelRoundness, _BevelRoundness, _BevelRoundness));
+	h = min(h, 1.0 - float4(_BevelClamp, _BevelClamp, _BevelClamp, _BevelClamp));
+	h *= _BevelAmount * bevelWidth * _GradientScale * -2.0;
+
+	float3 va = normalize(float3(-1.0, 0.0, h.y - h.x));
+	float3 vb = normalize(float3(0.0, 1.0, h.w - h.z));
+
+	float3 f = float3(1, 1, 1);
+	if (isFront) f = float3(1, 1, -1);
+	nornmal = cross(va, vb) * f;
+}
+
+void EvaluateLight_float(float4 faceColor, float3 n, out float4 color)
+{
+	n.z = abs(n.z);
+	float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), 1.0));
+
+	float3 col = max(faceColor.rgb, 0) + GetSpecular(n, light)* faceColor.a;
+	//faceColor.rgb += col * faceColor.a;
+	col *= 1 - (dot(n, light) * _Diffuse);
+	col *= lerp(_Ambient, 1, n.z * n.z);
+
+	//fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
+	//faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
+
+	color = float4(col, faceColor.a);
+}
+
+// Add custom function to handle time in HDRP
+
+
+//
+void GenerateUV_float(float2 inUV, float4 transform, float2 animSpeed, out float2 outUV)
+{
+	outUV = inUV * transform.xy + transform.zw + (animSpeed * _Time.y);
+}
+
+void ComputeUVOffset_float(float texWidth, float texHeight, float2 offset, float SDR, out float2 uvOffset)
+{
+	uvOffset = float2(-offset.x * SDR / texWidth, -offset.y * SDR / texHeight);
+}
+
+void ScreenSpaceRatio2_float(float4x4 projection, float4 position, float2 objectScale, float screenWidth, float screenHeight, float fontScale, out float SSR)
+{
+	float2 pixelSize = position.w;
+	pixelSize /= (objectScale * mul((float2x2)projection, float2(screenWidth, screenHeight)));
+	SSR = rsqrt(dot(pixelSize, pixelSize)*2) * fontScale;
+}
+
+// UV			: Texture coordinate of the source distance field texture
+// TextureSize	: Size of the source distance field texture
+// Filter		: Enable perspective filter (soften)
+void ScreenSpaceRatio_float(float2 UV, float TextureSize, bool Filter, out float SSR)
+{
+	if(Filter)
+	{
+		float2 a = float2(ddx(UV.x), ddy(UV.x));
+		float2 b = float2(ddx(UV.y), ddy(UV.y));
+		float s = lerp(dot(a,a), dot(b,b), 0.5);
+		SSR = rsqrt(s) / TextureSize;
+	}
+	else
+	{
+		float s = rsqrt(abs(ddx(UV.x) * ddy(UV.y) - ddy(UV.x) * ddx(UV.y)));
+		SSR = s / TextureSize;
+	}
+}
+
+// SSR : Screen Space Ratio
+// SD  : Signed Distance (encoded : Distance / SDR + .5)
+// SDR : Signed Distance Ratio
+//
+// IsoPerimeter : Dilate / Contract the shape
+void ComputeSDF_float(float SSR, float SD, float SDR, float isoPerimeter, float softness, out float outAlpha)
+{
+	softness *= SSR * SDR;
+	float d = (SD - 0.5) * SDR;																				// Signed distance to edge, in Texture space
+	outAlpha = saturate((d * 2.0 * SSR + 0.5 + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));	// Screen pixel coverage (alpha)
+}
+
+void ComputeSDF2_float(float SSR, float SD, float SDR, float2 isoPerimeter, float2 softness, out float2 outAlpha)
+{
+	softness *= SSR * SDR;
+	float d = (SD - 0.5f) * SDR;
+	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
+}
+
+void ComputeSDF4_float(float SSR, float SD, float SDR, float4 isoPerimeter, float4 softness, out float4 outAlpha)
+{
+	softness *= SSR * SDR;
+	float d = (SD - 0.5f) * SDR;
+	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
+}
+
+void ComputeSDF44_float(float SSR, float4 SD, float SDR, float4 isoPerimeter, float4 softness, bool outline, out float4 outAlpha)
+{
+	softness *= SSR * SDR;
+	float4 d = (SD - 0.5f) * SDR;
+	if(outline) d.w = max(max(d.x, d.y), d.z);
+	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
+}
+
+void Composite_float(float4 overlying, float4 underlying, out float4 outColor)
+{
+	outColor = BlendARGB(overlying, underlying);
+}
+
+// Face only
+void Layer1_float(float alpha, float4 color0, out float4 outColor)
+{
+	color0.a *= alpha;
+	outColor = color0;
+}
+
+// Face + 1 Outline
+void Layer2_float(float2 alpha, float4 color0, float4 color1, out float4 outColor)
+{
+	color1.a *= alpha.y;
+	color0.rgb *= color0.a; color1.rgb *= color1.a;
+	outColor = lerp(color1, color0, alpha.x);
+	outColor.rgb /= outColor.a;
+}
+
+// Face + 3 Outline
+void Layer4_float(float4 alpha, float4 color0, float4 color1, float4 color2, float4 color3, out float4 outColor)
+{
+	color3.a *= alpha.w;
+	color0.rgb *= color0.a; color1.rgb *= color1.a; color2.rgb *= color2.a; color3.rgb *= color3.a;
+	outColor = lerp(lerp(lerp(color3, color2, alpha.z), color1, alpha.y), color0, alpha.x);
+	outColor.rgb /= outColor.a;
+}

Assets/Resources/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 96de908384869cd409c75efa351d5edf
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: