Code cleanup.

Assets/AssemblyInfo.cs

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

Assets/Cryville/Common/Buffers/TargetString.cs

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

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

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

Assets/Cryville/Common/IdentifierManager.cs

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

Assets/Cryville/Common/Logger.cs

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

Assets/Cryville/Common/Math/FractionUtils.cs

@@ -48,5 +48,31 @@ namespace Cryville.Common.Math {
 				}
 			}
 		}
+
+		/// <summary>
+		/// Gets the greatest common divisor (GCD) of two integers.
+		/// </summary>
+		/// <param name="n">The first integer.</param>
+		/// <param name="d">The second integer.</param>
+		/// <returns>The greatest common divisor (GCD) of the two integers.</returns>
+		public static int GreatestCommonDivisor(int n, int d) {
+			while (d != 0) {
+				int t = d;
+				d = n % d;
+				n = t;
+			}
+			return n;
+		}
+
+		/// <summary>
+		/// Simplifies a fraction.
+		/// </summary>
+		/// <param name="n">The numerator.</param>
+		/// <param name="d">The denominator.</param>
+		public static void Simplify(ref int n, ref int d) {
+			var gcd = GreatestCommonDivisor(n, d);
+			n /= gcd;
+			d /= gcd;
+		}
 	}
 }

Assets/Cryville/Common/Math/SquareMatrix.cs

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

Assets/Cryville/Common/Network/HttpClient.cs

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

Assets/Cryville/Common/Network/HttpResponseStream.cs

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

Assets/Cryville/Common/Network/TlsClient.cs

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

Assets/Cryville/Common/StringUtils.cs

@@ -44,5 +44,21 @@ namespace Cryville.Common {
 			if (result.Length == 0) return "_";
 			return result;
 		}
+		/// <summary>
+		/// Gets the process path from a command.
+		/// </summary>
+		/// <param name="command">The command.</param>
+		/// <returns>The process path.</returns>
+		public static string GetProcessPathFromCommand(string command) {
+			command = command.Trim();
+			if (command[0] == '"') {
+				return command.Substring(1, command.IndexOf('"', 1) - 1);
+			}
+			else {
+				int e = command.IndexOf(' ');
+				if (e == -1) return command;
+				else return command.Substring(0, e);
+			}
+		}
 	}
 }

Assets/Cryville/Common/Unity/FileDialog.cs

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

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

@@ -11,8 +11,7 @@ namespace Cryville.Common.Unity.Input {
 			typeof(UnityMouseHandler),
 			typeof(UnityTouchHandler),
 		};
-		// TODO set private
-		public readonly List<InputHandler> _handlers = new List<InputHandler>();
+		readonly List<InputHandler> _handlers = new List<InputHandler>();
 		readonly Dictionary<Type, InputHandler> _typemap = new Dictionary<Type, InputHandler>();
 		readonly Dictionary<InputHandler, double> _timeOrigins = new Dictionary<InputHandler, double>();
 		readonly object _lock = new object();

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

@@ -49,6 +49,9 @@ namespace Cryville.Common.Unity.Input {
 			Callback = h;
 		}
 		public abstract string GetKeyName(int type);
+		void Awake() {
+			useGUILayout = false;
+		}
 		void Update() {
 			double time = Time.realtimeSinceStartupAsDouble;
 			foreach (var k in Keys) {

Assets/Cryville/Common/Unity/PropItem.cs

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

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

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

Assets/Cryville/Crtr/Browsing/ExtensionInterface.cs

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

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

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

Assets/Cryville/Crtr/Browsing/IResourceManager.cs

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

Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs

@@ -17,6 +17,8 @@ namespace Cryville.Crtr.Browsing {
 
 		static readonly Dictionary<string, List<ResourceConverter>> converters
 			= new Dictionary<string, List<ResourceConverter>>();
+		static readonly Dictionary<string, string> localRes
+			= new Dictionary<string, string>();
 
 		public LegacyResourceManager(string rootPath) {
 			_rootPath = rootPath;
@@ -25,15 +27,37 @@ namespace Cryville.Crtr.Browsing {
 		static LegacyResourceManager() {
 			foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) {
 				foreach (var type in asm.GetTypes()) {
-					if (type.IsSubclassOf(typeof(ResourceConverter))) {
-						var converter = (ResourceConverter)Activator.CreateInstance(type);
-						foreach (var f in converter.GetSupportedFormats()) {
+					if (!type.IsSubclassOf(typeof(ExtensionInterface))) continue;
+					var ext = (ExtensionInterface)Activator.CreateInstance(type);
+					try {
+						var cs = ext.GetResourceConverters();
+						if (cs != null) {
+							foreach (var c in cs) {
+								var fs = c.GetSupportedFormats();
+								if (fs == null) continue;
+								foreach (var f in fs) {
+									if (f == null) continue;
 									if (!converters.ContainsKey(f))
-								converters.Add(f, new List<ResourceConverter> { converter });
-							else converters[f].Add(converter);
+										converters.Add(f, new List<ResourceConverter> { c });
+									else converters[f].Add(c);
 								}
 							}
 						}
+						var fs2 = ext.GetResourceFinders();
+						if (fs2 != null) {
+							foreach (var f in fs2) {
+								var name = f.Name;
+								var path = f.GetRootPath();
+								if (name != null && path != null)
+									localRes.Add(name, path);
+							}
+						}
+						Logger.Log("main", 1, "Resource", "Loaded extension {0}", ReflectionHelper.GetNamespaceQualifiedName(type));
+					}
+					catch (Exception ex) {
+						Logger.Log("main", 4, "Resource", "Failed to initialize extension {0}: {1}", ReflectionHelper.GetNamespaceQualifiedName(type), ex);
+					}
+				}
 			}
 		}
 
@@ -150,9 +174,11 @@ namespace Cryville.Crtr.Browsing {
 							tres.Meta.data = "";
 							writer.Write(JsonConvert.SerializeObject(tres.Meta, Game.GlobalJsonSerializerSettings));
 						}
-						if (tres.Meta.cover != null)
-							new FileInfo(Path.Combine(file.Directory.FullName, tres.Meta.cover))
-								.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true);
+						if (tres.Meta.cover != null) {
+							var coverFile = new FileInfo(Path.Combine(file.Directory.FullName, tres.Meta.cover));
+							if (coverFile.Exists)
+								coverFile.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true);
+						}
 					}
 					else if (res is FileResource) {
 						var tres = (FileResource)res;
@@ -196,5 +222,9 @@ namespace Cryville.Crtr.Browsing {
 		public string[] GetSupportedFormats() {
 			return converters.Keys.ToArray();
 		}
+
+		public Dictionary<string, string> GetPresetPaths() {
+			return localRes;
+		}
 	}
 }

Assets/Cryville/Crtr/Browsing/LocalResourceFinder.cs

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

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

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

Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs

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

Assets/Cryville/Crtr/Browsing/ResourceConverter.cs

@@ -1,7 +1,6 @@
 using Cryville.Common;
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IO;
 
 namespace Cryville.Crtr.Browsing {

Assets/Cryville/Crtr/Chart.cs

@@ -3,18 +3,24 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace Cryville.Crtr {
 	[JsonConverter(typeof(BeatTimeConverter))]
-	public struct BeatTime {
+	public struct BeatTime : IComparable<BeatTime>, IEquatable<BeatTime> {
 		[JsonConstructor()]
 		public BeatTime(int _b, int _n, int _d) {
 			b = _b;
 			n = _n;
 			d = _d;
 		}
+		public BeatTime(int _n, int _d) {
+			b = _n / _d;
+			n = _n % _d;
+			d = _d;
+		}
 
 		[JsonIgnore]
 		public int b;
@@ -24,6 +30,36 @@ namespace Cryville.Crtr {
 		
 		[JsonIgnore]
 		public int d;
+
+		[JsonIgnore]
+		public double Decimal { get { return b + (double)n / d; } }
+
+		public int CompareTo(BeatTime other) {
+			var c = b.CompareTo(other.b);
+			if (c != 0) return c;
+			return ((double)n / d).CompareTo((double)other.n / other.d);
+		}
+
+		public override bool Equals(object obj) {
+			if (!(obj is BeatTime)) return false;
+			return Equals((BeatTime)obj);
+		}
+
+		public bool Equals(BeatTime other) {
+			return b.Equals(other.b) && ((double)n / d).Equals((double)other.n / other.d);
+		}
+
+		public override int GetHashCode() {
+			return Decimal.GetHashCode();
+		}
+
+		public static bool operator ==(BeatTime left, BeatTime right) {
+			return left.Equals(right);
+		}
+
+		public static bool operator !=(BeatTime left, BeatTime right) {
+			return !left.Equals(right);
+		}
 	}
 	
 	public class BeatTimeConverter : JsonConverter {
@@ -55,7 +91,7 @@ namespace Cryville.Crtr {
 		[JsonIgnore]
 		public float BeatPosition {
 			get {
-				return time.Value.b + time.Value.n / (float)time.Value.d + BeatOffset;
+				return (float)time.Value.Decimal + BeatOffset;
 			}
 		}
 
@@ -65,7 +101,7 @@ namespace Cryville.Crtr {
 		public float EndBeatPosition {
 			get {
 				if (endtime == null) return BeatPosition;
-				return endtime.Value.b + endtime.Value.n / (float)endtime.Value.d + BeatOffset;
+				return (float)endtime.Value.Decimal + BeatOffset;
 			}
 		}
 		
@@ -275,7 +311,7 @@ namespace Cryville.Crtr {
 
 			private void LoadFromString(string s) {
 				Match m = Regex.Match(s, @"^(.+?)(#(\d+))?(@(.+?))?(\^(.+?))?(\*(.+?))?(:(.+))?$");
-				if (!m.Success) throw new ArgumentException(); // TODO
+				if (!m.Success) throw new ArgumentException("Invalid motion string format");
 				name = new Identifier(m.Groups[1].Value);
 				var registry = ChartPlayer.motionRegistry[name];
 				if (m.Groups[3].Success) {
@@ -303,7 +339,7 @@ namespace Cryville.Crtr {
 					var node = RelativeNode;
 					result += "#" + node.Id;
 					if (node.Time != null) result += "@" + node.Time.ToString();
-					if (node.Transition != null) result = "^" + node.Transition.ToString();
+					if (node.Transition != null) result = "^" + ((byte)node.Transition).ToString(CultureInfo.InvariantCulture);
 					if (node.Rate != null) result += "*" + node.Rate.ToString();
 					if (node.Value != null) result += ":" + node.Value.ToString();
 				}
@@ -391,10 +427,12 @@ namespace Cryville.Crtr {
 		public class Judge : ChartEvent {
 			[JsonIgnore]
 			public Identifier Id;
+#pragma warning disable IDE1006
 			public string name {
 				get { return Id.ToString(); }
 				set { Id = new Identifier(value); }
 			}
+#pragma warning restore IDE1006
 
 			public override int Priority {
 				get { return 0; }

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -371,8 +371,9 @@ namespace Cryville.Crtr {
 			texloadtimer.Start();
 			frames = new Dictionary<string, SpriteFrame>();
 			texs = new Dictionary<string, Texture2D>();
+			var skinDir = skinFile.Directory.FullName;
 			foreach (var f in skin.frames) {
-				texLoadQueue.Enqueue(Path.Combine(skinFile.Directory.FullName, f));
+				texLoadQueue.Enqueue(Path.Combine(skinDir, f));
 			}
 		}
 
@@ -380,7 +381,7 @@ namespace Cryville.Crtr {
 			try {
 				diag::Stopwatch timer = new diag::Stopwatch();
 				timer.Reset(); timer.Start();
-				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 3)");
+				Logger.Log("main", 0, "Load/Prehandle", "Initializing textures");
 				foreach (var t in texs) {
 					if (frames.ContainsKey(t.Key)) {
 						Logger.Log("main", 3, "Load/Prehandle", "Duplicated texture name: {0}", t.Key);
@@ -390,15 +391,25 @@ namespace Cryville.Crtr {
 					f.Init();
 					frames.Add(t.Key, f);
 				}
-				Logger.Log("main", 0, "Load/Prehandle", "Initializing states");
-				cbus.BroadcastInit();
+				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 2)");
+				cbus.BroadcastPreInit();
+				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 3)");
+				using (var pbus = cbus.Clone(17)) {
+					pbus.Forward();
+				}
+				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 4)");
+				cbus.BroadcastPostInit();
 				inputProxy.Activate();
-				if (logEnabled) ToggleLogs();
+				if (logEnabled && Settings.Default.HideLogOnPlay) ToggleLogs();
 				Logger.Log("main", 0, "Load/Prehandle", "Cleaning up");
 				GC.Collect();
 				if (disableGC) GarbageCollector.GCMode = GarbageCollector.Mode.Disabled;
 				timer.Stop();
 				Logger.Log("main", 1, "Load/Prehandle", "Prehandling done ({0}ms)", timer.Elapsed.TotalMilliseconds);
+				if (Settings.Default.ClearLogOnPlay) {
+					logs.text = "";
+					Game.MainLogger.Enumerate((level, module, msg) => { });
+				}
 				Game.AudioSequencer.Playing = true;
 				atime0 = Game.AudioClient.BufferPosition;
 				Thread.Sleep((int)((atime0 - Game.AudioClient.Position) * 1000));
@@ -518,7 +529,7 @@ namespace Cryville.Crtr {
 					foreach (var ts in gs.Value.Children) {
 						ContainerHandler th;
 						if (ts.Key is Chart.Note) {
-							th = new NoteHandler(gh, (Chart.Note)ts.Key, pruleset, judge);
+							th = new NoteHandler(gh, (Chart.Note)ts.Key, pruleset);
 						}
 						else {
 							th = new TrackHandler(gh, (Chart.Track)ts.Key);
@@ -533,10 +544,6 @@ namespace Cryville.Crtr {
 				}
 				Logger.Log("main", 0, "Load/WorkerThread", "Patching events");
 				cbus.DoPatch();
-				Logger.Log("main", 0, "Load/WorkerThread", "Prehandling (iteration 2)");
-				using (var pbus = cbus.Clone(17)) {
-					pbus.Forward();
-				}
 
 				Logger.Log("main", 0, "Load/WorkerThread", "Cloning states (type 1)");
 				bbus = cbus.Clone(1, -clippingDist);

Assets/Cryville/Crtr/Components/MeshBase.cs

@@ -22,7 +22,9 @@ namespace Cryville.Crtr.Components {
 		}
 		protected void UpdateZIndex() {
 			if (!mesh.Initialized) return;
-			mesh.Renderer.material.renderQueue = _zindex;
+			foreach (var mat in mesh.Renderer.materials) {
+				mat.renderQueue = _zindex;
+			}
 		}
 	}
 }

Assets/Cryville/Crtr/Components/SectionalGameObject.cs

@@ -9,6 +9,11 @@ namespace Cryville.Crtr.Components {
 		protected Vector3? prevpt;
 		protected Quaternion? prevrot;
 		protected int vertCount = 0;
+		bool suppressed;
+
+		public SectionalGameObject() {
+			SubmitProperty("suppressed", new PropOp.Boolean(v => suppressed = v), 2);
+		}
 
 		protected override void OnDestroy() {
 			mesh.Destroy();
@@ -23,7 +28,7 @@ namespace Cryville.Crtr.Components {
 		}
 
 		public void AppendPoint(Vector3 p, Quaternion r) {
-			if (prevpt == p && prevrot == r) return;
+			if (prevpt == p && prevrot == r || suppressed) return;
 			AppendPointInternal(p, r);
 			// if (!headGenerated) Logger.Log("main", 0, "Skin/Polysec", "{0}", r);
 			prevpt = p;
@@ -55,7 +60,7 @@ namespace Cryville.Crtr.Components {
 			SubmitProperty("head", new PropOp.String(v => head.FrameName = v));
 			SubmitProperty("body", new PropOp.String(v => body.FrameName = v));
 			SubmitProperty("tail", new PropOp.String(v => tail.FrameName = v));
-			SubmitProperty("shape", new op_set_shape(this));
+			SubmitProperty("shape", new op_set_shape(this), 2);
 		}
 
 #pragma warning disable IDE1006
@@ -98,24 +103,14 @@ namespace Cryville.Crtr.Components {
 
 		public override void Init() {
 			base.Init();
-
-			head.Load();
-			body.Load();
-			tail.Load();
-
 			mesh.Init(transform);
 
-			List<Material> materials = new List<Material>();
-			if (head.FrameName != null) AddMat(materials, head.FrameName);
-			if (body.FrameName != null) AddMat(materials, body.FrameName);
-			if (tail.FrameName != null) AddMat(materials, tail.FrameName);
-			mesh.Renderer.materials = materials.ToArray();
-		}
+			var mats = mesh.Renderer.materials = new Material[] { mesh.NewMaterial, mesh.NewMaterial, mesh.NewMaterial };
+			head.Bind(mats[0]);
+			body.Bind(mats[1]);
+			tail.Bind(mats[2]);
 
-		void AddMat(List<Material> list, string frame) {
-			var mat = mesh.NewMaterial;
-			mat.mainTexture = ChartPlayer.frames[frame].Texture;
-			list.Add(mat);
+			UpdateZIndex();
 		}
 
 		protected override void OnDestroy() {
@@ -129,7 +124,6 @@ namespace Cryville.Crtr.Components {
 			}
 		}
 
-		// Vector3 prevp = Vector3.zero;
 		protected override void AppendPointInternal(Vector3 p, Quaternion r) {
 			if (vertices == null) {
 				vertices = _ptPool.Rent();
@@ -157,9 +151,9 @@ namespace Cryville.Crtr.Components {
 			int vcpsec = _shapeLength; // Vertex Count Per Section
 			float width = GetWidth();
 			float headLength = 0;
-			if (head.FrameName != null) headLength = width / head.Ratio;
+			if (head.Frame != null) headLength = width / head.Ratio;
 			float tailLength = 0;
-			if (tail.FrameName != null) tailLength = width / tail.Ratio;
+			if (tail.Frame != null) tailLength = width / tail.Ratio;
 			float endLength = headLength + tailLength;
 			if (sumLength <= endLength) {
 				// The total length of the two ends is longer than the whole mesh, squeeze the two ends
@@ -187,17 +181,17 @@ namespace Cryville.Crtr.Components {
 			verts = _vertPool.Rent(vc * vcpsec);
 			uvs = _uvPool.Rent(vc * vcpsec);
 			int i = 0; int t = 0; float l = 0; int m = 0;
-			if (head.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); }
-			if (body.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
-			if (tail.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
+			if (head.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); }
+			if (body.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
+			if (tail.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
 
 			mesh.Mesh.subMeshCount = m;
 			m = 0;
 			mesh.Mesh.SetVertices(verts);
 			mesh.Mesh.SetUVs(0, uvs);
-			if (head.FrameName != null) mesh.Mesh.SetTriangles(trih, m++);
-			if (body.FrameName != null) mesh.Mesh.SetTriangles(trib, m++);
-			if (tail.FrameName != null) mesh.Mesh.SetTriangles(trit, m++);
+			if (head.Frame != null) mesh.Mesh.SetTriangles(trih, m++);
+			if (body.Frame != null) mesh.Mesh.SetTriangles(trib, m++);
+			if (tail.Frame != null) mesh.Mesh.SetTriangles(trit, m++);
 			mesh.Mesh.RecalculateNormals();
 
 			_vertPool.Return(verts); verts = null;

Assets/Cryville/Crtr/Components/SkinComponent.cs

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

Assets/Cryville/Crtr/Components/SpritePlane.cs

@@ -4,7 +4,16 @@ using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr.Components {
 	public class SpriteInfo {
-		public string FrameName;
+		string m_frameName;
+		public string FrameName {
+			get {
+				return m_frameName;
+			}
+			set {
+				m_frameName = value;
+				Reload();
+			}
+		}
 		public SpriteFrame Frame {
 			get;
 			private set;
@@ -20,15 +29,32 @@ namespace Cryville.Crtr.Components {
 				return Rect.width / Rect.height;
 			}
 		}
+		bool _loaded;
+		Material _mat;
+		public void Bind(Material mat) {
+			_loaded = true;
+			_mat = mat;
+			Reload();
+		}
 		public void Load() {
-			if (FrameName != null) {
+			_loaded = true;
+			Reload();
+		}
+		public void Reload() {
+			if (!_loaded) return;
+			if (!string.IsNullOrEmpty(FrameName)) {
 				if (ChartPlayer.frames.ContainsKey(FrameName)) {
 					Frame = ChartPlayer.frames[FrameName];
 				}
 				else {
 					Logger.Log("main", 4, "Skin", "Texture {0} not found", FrameName);
+					Frame = null;
 				}
 			}
+			else Frame = null;
+			if (_mat != null) {
+				_mat.mainTexture = Frame == null ? null : Frame.Texture;
+			}
 		}
 	}
 
@@ -68,16 +94,11 @@ namespace Cryville.Crtr.Components {
 		}
 		protected void OnFrameUpdate() {
 			if (!mesh.Initialized) return;
-			if (frameInfo.FrameName == null) {
+			if (frameInfo.Frame == null) {
 				mesh.Renderer.enabled = false;
 				return;
 			}
 			mesh.Renderer.enabled = true;
-			frameInfo.Load();
-			if (frameInfo.Frame != null)
-				mesh.Renderer.material.mainTexture = frameInfo.Frame.Texture;
-			else
-				Logger.Log("main", 4, "Skin", "Unable to load texture {0}", frameInfo.FrameName);
 			UpdateUV();
 			UpdateScale();
 			UpdateZIndex();
@@ -140,8 +161,8 @@ namespace Cryville.Crtr.Components {
 		}
 
 		public override void Init() {
-			frameInfo.Load();
 			InternalInit();
+			frameInfo.Bind(mesh.Renderer.material);
 			OnFrameUpdate();
 			UpdateOpacity();
 		}

Assets/Cryville/Crtr/Components/SpriteText.cs

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

Assets/Cryville/Crtr/Config/ConfigScene.cs

@@ -1,5 +1,4 @@
-using JetBrains.Annotations;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Text;

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -25,13 +25,14 @@ namespace Cryville.Crtr.Config {
 		GameObject m_prefabInputConfigEntry;
 
 		public InputProxy proxy;
-		Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
+		readonly Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
 
 		string _sel;
 		public void OpenDialog(string entry) {
 			_sel = entry;
 			m_inputDialog.SetActive(true);
 			CallHelper.Purge(m_deviceList);
+			Game.InputManager.EnumerateEvents(ev => { });
 			_recvsrcs.Clear();
 			AddSourceItem(null);
 		}

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -1,6 +1,8 @@
+using Cryville.Common;
 using Cryville.Crtr.Components;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine;
 
 namespace Cryville.Crtr.Event {
@@ -35,9 +37,10 @@ namespace Cryville.Crtr.Event {
 		/// </summary>
 		public Transform gogroup;
 
-		public readonly Dictionary<string, Anchor> Anchors = new Dictionary<string, Anchor>();
-		public Transform a_head;
-		public Transform a_tail;
+		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;
@@ -63,8 +66,8 @@ namespace Cryville.Crtr.Event {
 			get { return cs.Container; }
 		}
 
-		public SkinContainer skinContainer;
-		public Judge judge;
+		SkinContainer skinContainer;
+		protected Judge judge;
 		public void AttachSystems(PdtSkin skin, Judge judge) {
 			skinContainer = new SkinContainer(skin);
 			this.judge = judge;
@@ -74,22 +77,29 @@ namespace Cryville.Crtr.Event {
 		public abstract string TypeName {
 			get;
 		}
+		protected readonly static int _a_cur = IdentifierManager.SharedInstance.Request("cur");
+		protected readonly static int _a_head = IdentifierManager.SharedInstance.Request("head");
+		protected readonly static int _a_tail = IdentifierManager.SharedInstance.Request("tail");
 		public virtual void PreInit() {
-			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString()).transform;
+			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString(CultureInfo.InvariantCulture)).transform;
 			if (cs.Parent != null)
 				gogroup.SetParent(cs.Parent.Handler.gogroup, false);
-			a_head = new GameObject("::head").transform;
-			a_head.SetParent(gogroup, false);
-			Anchors.Add("head", new Anchor() { Transform = a_head });
-			a_tail = new GameObject("::tail").transform;
-			a_tail.SetParent(gogroup, false);
-			Anchors.Add("tail", new Anchor() { Transform = a_tail });
+			a_cur = RegisterAnchor(_a_cur);
+			a_head = RegisterAnchor(_a_head);
+			a_tail = RegisterAnchor(_a_tail);
 		}
+		protected Transform RegisterAnchor(int name) {
+			var go = new GameObject("." + IdentifierManager.SharedInstance.Retrieve(name)).transform;
+			go.SetParent(gogroup, false);
+			Anchors.Add(name, new Anchor() { Transform = go });
+			return go;
+		}
+
 		/// <summary>
-		/// Called upon initialization of <see cref="cs" />.
+		/// Called upon StartUpdate of ps 17.
 		/// </summary>
 		public virtual void Init() {
-			skinContainer.MatchStatic(cs);
+			skinContainer.MatchStatic(ps);
 			foreach (var i in gogroup.GetComponentsInChildren<SkinComponent>())
 				i.Init();
 		}
@@ -107,10 +117,10 @@ namespace Cryville.Crtr.Event {
 		protected virtual void PreAwake(ContainerState s) {
 			if (gogroup) gogroup.gameObject.SetActive(true);
 			Awoken = true; Alive = true;
-			OpenAnchor("head");
+			OpenAnchor(_a_head);
 		}
 		protected virtual void Awake(ContainerState s) {
-			CloseAnchor("head");
+			CloseAnchor(_a_head);
 		}
 		protected virtual void GetPosition(ContainerState s) { }
 		public virtual void StartUpdate(ContainerState s) {
@@ -118,11 +128,14 @@ namespace Cryville.Crtr.Event {
 				PreAwake(s);
 				Awake(s);
 			}
+			else if (s.CloneType == 17) {
+				Init();
+			}
 		}
 		public virtual void Update(ContainerState s, StampedEvent ev) {
 			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
 			if (flag) PreAwake(s);
-			if (Awoken && s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s);
+			if (s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s);
 			if (flag) Awake(s);
 		}
 		public virtual void ExUpdate(ContainerState s, StampedEvent ev) { }
@@ -134,10 +147,10 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 		public virtual void Anchor() { }
-		protected void OpenAnchor(string name) {
+		protected void OpenAnchor(int name) {
 			if (Anchors.ContainsKey(name)) Anchors[name].Open();
 		}
-		protected void CloseAnchor(string name) {
+		protected void CloseAnchor(int name) {
 			if (Anchors.ContainsKey(name)) Anchors[name].Close();
 		}
 	}

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -56,7 +56,7 @@ namespace Cryville.Crtr.Event {
 			private set;
 		}
 
-		public float Time {
+		public double Time {
 			get {
 				return Bus.Time;
 			}
@@ -65,8 +65,14 @@ namespace Cryville.Crtr.Event {
 		readonly RMVPool RMVPool = new RMVPool();
 		protected Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new Dictionary<StampedEvent, RealtimeMotionValue>();
 		protected Dictionary<Identifier, RealtimeMotionValue> Values;
-		protected Dictionary<Identifier, Vector> CachedValues;
-		protected Dictionary<Identifier, bool> CachedValueStates;
+		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.
@@ -88,7 +94,10 @@ namespace Cryville.Crtr.Event {
 		}
 
 		void InvalidateMotion(Identifier name) {
-			CachedValueStates[name] = false;
+			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);
 		}
@@ -102,8 +111,7 @@ namespace Cryville.Crtr.Event {
 			}
 
 			Values = new Dictionary<Identifier, RealtimeMotionValue>(ChartPlayer.motionRegistry.Count);
-			CachedValues = new Dictionary<Identifier, Vector>(ChartPlayer.motionRegistry.Count);
-			CachedValueStates = new Dictionary<Identifier, bool>(ChartPlayer.motionRegistry.Count);
+			CachedValues = new Dictionary<Identifier, CacheEntry>(ChartPlayer.motionRegistry.Count);
 			foreach (var m in ChartPlayer.motionRegistry)
 				Values.Add(m.Key, new RealtimeMotionValue().Init(Parent == null ? m.Value.GlobalInitValue : m.Value.InitValue));
 		}
@@ -124,18 +132,12 @@ namespace Cryville.Crtr.Event {
 			}
 			r.Values = mvs;
 
-			var cvs = new Dictionary<Identifier, Vector>(ChartPlayer.motionRegistry.Count);
+			var cvs = new Dictionary<Identifier, CacheEntry>(ChartPlayer.motionRegistry.Count);
 			foreach (var cv in CachedValues) {
 				cvs.Add(cv.Key, cv.Value.Clone());
 			}
 			r.CachedValues = cvs;
 
-			var cvss = new Dictionary<Identifier, bool>(ChartPlayer.motionRegistry.Count);
-			foreach (var cv in CachedValueStates) {
-				cvss.Add(cv.Key, cv.Value);
-			}
-			r.CachedValueStates = cvss;
-
 			r.Children = new Dictionary<EventContainer, ContainerState>();
 			foreach (var child in Children) {
 				var cc = child.Value.Clone(ct);
@@ -170,11 +172,13 @@ namespace Cryville.Crtr.Event {
 			}
 
 			foreach (var cv in CachedValues) {
-				Vector dv;
-				if(dest.CachedValues.TryGetValue(cv.Key, out dv)) cv.Value.CopyTo(dv);
+				CacheEntry dv;
+				if (dest.CachedValues.TryGetValue(cv.Key, out dv)) {
+					dv.Valid = cv.Value.Valid;
+					if (cv.Value.Value != null) cv.Value.Value.CopyTo(dv.Value);
+				}
 				else dest.CachedValues.Add(cv.Key, cv.Value.Clone());
 			}
-			foreach (var cvs in CachedValueStates) dest.CachedValueStates[cvs.Key] = cvs.Value;
 
 			if (ct != 1) foreach (var cev in WorkingChildren)
 				Children[cev].CopyTo(ct, dest.Children[cev]);
@@ -182,7 +186,6 @@ namespace Cryville.Crtr.Event {
 				child.Value.CopyTo(ct, dest.Children[child.Key]);
 			ValidateChildren();
 
-			RMVPool.ReturnAll();
 			dest.PlayingMotions.Clear();
 			foreach (var m in PlayingMotions) dest.PlayingMotions.Add(m.Key, m.Value);
 		}
@@ -212,22 +215,21 @@ namespace Cryville.Crtr.Event {
 		}
 
 		public Vector GetRawValue(Identifier key) {
-			Vector tr;
-			if (!CachedValues.TryGetValue(key, out tr)) {
-				tr = (Vector)ReflectionHelper.InvokeEmptyConstructor(ChartPlayer.motionRegistry[key].Type);
-				CachedValues.Add(key, tr);
-				CachedValueStates[key] = false;
-			}
-			Vector r = tr;
+			CacheEntry tr;
+			if (!CachedValues.TryGetValue(key, out tr))
+				CachedValues.Add(key, tr = new CacheEntry { Valid = false });
+			if (tr.Value == null)
+				tr.Value = (Vector)ReflectionHelper.InvokeEmptyConstructor(ChartPlayer.motionRegistry[key].Type);
+			Vector r = tr.Value;
 #if !DISABLE_CACHE
-			if (CachedValueStates[key]) return r;
+			if (tr.Valid) return r;
 #endif
 			float reltime = 0;
-			if (rootPrototype != null) reltime = Time - rootPrototype.Time;
+			if (rootPrototype != null) reltime = (float)(Time - rootPrototype.Time);
 			GetMotionValue(key).GetValue(reltime, ref r);
 			if (Parent != null) r.ApplyFrom(Parent.GetRawValue(key));
 #if !DISABLE_CACHE
-			CachedValueStates[key] = true;
+			tr.Valid = true;
 #endif
 			return r;
 		}
@@ -321,11 +323,14 @@ namespace Cryville.Crtr.Event {
 				if (ev.Unstamped is Chart.Motion) {
 					var tev = (Chart.Motion)ev.Unstamped;
 					var mv = RMVPool.Rent(tev.Name);
+					mv.CloneTypeFlag = CloneType;
 					GetMotionValue(tev.Name).CopyTo(mv);
 					PlayingMotions.Add(ev, mv);
 					Callback(ev, callback);
-					if (!ev.Unstamped.IsLong)
+					if (!ev.Unstamped.IsLong) {
 						PlayingMotions.Remove(ev);
+						RMVPool.Return(mv);
+					}
 				}
 				else if (ev.Unstamped is EventContainer) {
 					var cev = (EventContainer)ev.Unstamped;
@@ -345,6 +350,8 @@ namespace Cryville.Crtr.Event {
 						var nev = tev.Original;
 						if (nev is Chart.Motion) {
 							Callback(ev, callback);
+							var mv = PlayingMotions[ev.Origin];
+							if (mv.CloneTypeFlag == CloneType) RMVPool.Return(mv);
 							PlayingMotions.Remove(ev.Origin);
 						}
 						else if (nev is EventContainer) {
@@ -387,7 +394,7 @@ namespace Cryville.Crtr.Event {
 					}
 				}
 				else {
-					var scaledTime = (Time - m.Key.Time - ChartPlayer.actualRenderStep * tev.sumfix) / m.Key.Duration;
+					var scaledTime = (float)((Time - m.Key.Time - ChartPlayer.actualRenderStep * tev.sumfix) / m.Key.Duration);
 					var lerpedTime = MotionLerper.GetEaseTime(scaledTime, tev.transition, tev.rate);
 					if (tev.RelativeNode != null) {
 						var target = value.QueryRelativeNode(tev.RelativeNode.Id);
@@ -401,13 +408,17 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 
-		public void BroadcastInit() {
+		public void BroadcastPreInit() {
 			Handler.PreInit();
-			Handler.Init();
-			foreach (var s in Children) {
-				s.Value.BroadcastInit();
+			foreach (var c in Children.Values) {
+				c.BroadcastPreInit();
 			}
+		}
+		public void BroadcastPostInit() {
 			Handler.PostInit();
+			foreach (var c in Children.Values) {
+				c.BroadcastPostInit();
+			}
 		}
 
 		public void StartUpdate() {

Assets/Cryville/Crtr/Event/EventBatch.cs

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

Assets/Cryville/Crtr/Event/EventBatcher.cs

@@ -18,7 +18,7 @@ namespace Cryville.Crtr.Event {
 		public List<StampedEvent> stampedEvents = new List<StampedEvent>();
 		readonly List<EventBatch> batches = new List<EventBatch>();
 
-		float beat;
+		double beat;
 		float tempo;
 		
 		public EventBatcher(Chart c) : base(c, new List<ChartEvent>()) {
@@ -56,12 +56,12 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 		
-		public override void ForwardOnceToTime(float toTime, Action<ChartEvent> callback) {
-			float toBeat = (float)Math.Round(beat + (toTime - Time) * tempo / 60f, 6);
+		public override void ForwardOnceToTime(double toTime, Action<ChartEvent> callback) {
+			double toBeat = Math.Round(beat + (toTime - Time) * tempo / 60f, 6);
 			if (EventId >= events.Count)
 				goto return_ahead;
-			float ebeat = events[EventId].BeatPosition;
-			float etime = (float)Math.Round((ebeat - beat) / tempo * 60f + Time, 6);
+			double ebeat = events[EventId].BeatPosition;
+			double etime = Math.Round((ebeat - beat) / tempo * 60f + Time, 6);
 			if (etime > toTime)
 				goto return_ahead;
 			var batch = GetEventBatch();

Assets/Cryville/Crtr/Event/EventBus.cs

@@ -114,7 +114,7 @@ namespace Cryville.Crtr.Event {
 			patch.Clear();
 		}
 
-		public override void ForwardOnceToTime(float toTime, Action<EventBatch> callback = null) {
+		public override void ForwardOnceToTime(double toTime, Action<EventBatch> callback = null) {
 			if (EventId < events.Count && events[EventId].Time <= toTime) {
 				Time = events[EventId].Time;
 				var batch = events[EventId];
@@ -147,8 +147,11 @@ namespace Cryville.Crtr.Event {
 			invalidatedStates.Clear();
 		}
 		
-		public void BroadcastInit() {
-			RootState.BroadcastInit();
+		public void BroadcastPreInit() {
+			RootState.BroadcastPreInit();
+		}
+		public void BroadcastPostInit() {
+			RootState.BroadcastPostInit();
 		}
 
 		public void BroadcastEndUpdate() {

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

@@ -6,11 +6,12 @@ using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 namespace Cryville.Crtr.Extensions.Bestdori {
 	public class BestdoriChartConverter : ResourceConverter {
-		static readonly string[] SUPPORTED_FORMATS = { ".json" };
+		static readonly string[] SUPPORTED_FORMATS = { ".bestdori" };
 		public override string[] GetSupportedFormats() {
 			return SUPPORTED_FORMATS;
 		}
@@ -35,15 +36,12 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 				motions = new List<Chart.Motion>(),
 				groups = new List<Chart.Group> { group },
 			};
+			var tm = new BeatTimeTimingModel();
 			string bgm = null;
-			double? cbpm = null;
-			double pbeat = 0, ctime = 0;
 			double endbeat = 0;
 			foreach (var ev in src) {
-				double cbeat = ev.StartBeat;
-				ctime += cbpm == null ? 0 : (cbeat - pbeat) / cbpm.Value * 60;
-				pbeat = cbeat;
-				if (cbeat > endbeat) endbeat = cbeat;
+				tm.ForwardTo(ev.StartBeat);
+				if (ev.StartBeat > endbeat) endbeat = ev.StartBeat;
 				if (ev is BestdoriChartEvent.System) {
 					if (bgm != null) continue;
 					var tev = (BestdoriChartEvent.System)ev;
@@ -54,7 +52,7 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 				}
 				else if (ev is BestdoriChartEvent.BPM) {
 					var tev = (BestdoriChartEvent.BPM)ev;
-					cbpm = tev.bpm;
+					tm.BPM = tev.bpm;
 					chart.sigs.Add(new Chart.Signature { time = ToBeatTime(tev.beat), tempo = (float)tev.bpm });
 				}
 				else if (ev is BestdoriChartEvent.Single) {
@@ -62,7 +60,7 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 					group.notes.Add(new Chart.Note {
 						time = ToBeatTime(tev.beat),
 						judges = new List<Chart.Judge> { new Chart.Judge { name = tev.flick ? "single_flick" : "single" } },
-						motions = new List<Chart.Motion> { new Chart.Motion { motion = "track:" + tev.lane.ToString() } },
+						motions = new List<Chart.Motion> { new Chart.Motion { motion = "track:" + tev.lane.ToString(CultureInfo.InvariantCulture) } },
 					});
 				}
 				else if (ev is BestdoriChartEvent.Long) {
@@ -75,27 +73,32 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 					};
 					for (int i = 0; i < tev.connections.Count; i++) {
 						BestdoriChartEvent.Connection c = tev.connections[i];
-						note.motions.Add(new Chart.Motion { motion = "track:" + c.lane.ToString() });
-						if (i == 0)
+						if (i == 0) {
 							note.judges.Add(new Chart.Judge { name = "single" });
-						else if (i == tev.connections.Count - 1)
+							note.motions.Add(new Chart.Motion { motion = "track:" + c.lane.ToString(CultureInfo.InvariantCulture) });
+						}
+						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) });
+							if (i == tev.connections.Count - 1)
 								note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = c.flick ? "longend_flick" : "longend" });
 							else if (!c.hidden)
 								note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = "longnode" });
 						}
+					}
 					if (c1.beat > endbeat) endbeat = c1.beat;
 					group.notes.Add(note);
 				}
 				else throw new NotImplementedException("Unsupported event: " + ev.type);
 			}
 			if (bgm == null) throw new FormatException("Chart contains no song");
-			chart.endtime = ToBeatTime(endbeat);
+			chart.endtime = ToBeatTime(endbeat + 4);
+			if (endbeat > tm.BeatTime) tm.ForwardTo(endbeat);
 			result.Add(new RawChartResource(string.Format("bang_dream_girls_band_party__{0}__{1}", bgm, StringUtils.TrimExt(file.Name)), chart, new ChartMeta {
 				name = string.Format("Bandori {0} {1}", bgm, StringUtils.TrimExt(file.Name)),
 				author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",
 				ruleset = "bang_dream_girls_band_party",
 				note_count = group.notes.Count,
-				length = (float)ctime,
+				length = (float)tm.Time,
 				song = new SongMetaInfo {
 					name = bgm,
 					author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",
@@ -110,7 +113,6 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 			i = n / d; n %= d;
 			return new BeatTime(i, n, d);
 		}
-	}
 
 #pragma warning disable IDE1006
 		[JsonConverter(typeof(BestdoriChartEventCreator))]
@@ -181,3 +183,4 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 			}
 		}
 	}
+}

Assets/Cryville/Crtr/Extensions/Extensions.cs

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

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

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 62489f8e495a805478e5b45c0f53ca4e
-timeCreated: 1623583546
-licenseType: Pro
+guid: 23377bf2926d93a4b8e3f3ab6040c7f2
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs

@@ -23,7 +23,6 @@ namespace Cryville.Crtr.Extensions.Malody {
 				src = JsonConvert.DeserializeObject<MalodyChart>(reader.ReadToEnd());
 			}
 			if (src.meta.mode != 0) throw new NotImplementedException("The chart mode is not supported");
-			if (src.meta.mode_ext.column != 4) throw new NotImplementedException("The key count is not supported");
 
 			var ruleset = "malody!" + MODES[src.meta.mode];
 			if (src.meta.mode == 0) {
@@ -74,31 +73,29 @@ namespace Cryville.Crtr.Extensions.Malody {
 			Dictionary<MalodyChart.IEvent, StartEventState> longEvents
 				= new Dictionary<MalodyChart.IEvent, StartEventState>();
 
-			float? baseBpm = null, cbpm = null;
-			float pbeat = 0f, ctime = 0f;
-			int[] endbeat = new int[] { 0, 0, 1 };
+			float? baseBpm = null;
+			var tm = new FractionalBeatTimeTimingModel();
 			foreach (var ev in events) {
-				float cbeat = ConvertBeat(ev.beat);
-				ctime += cbpm == null ? 0 : (cbeat - pbeat) / cbpm.Value * 60f;
-				pbeat = cbeat;
+				var beat = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]);
+				tm.ForwardTo(beat);
 				if (ev is MalodyChart.Time) {
 					var tev = (MalodyChart.Time)ev;
 					if (baseBpm == null) baseBpm = tev.bpm;
-					cbpm = tev.bpm;
+					tm.BPM = tev.bpm;
 					chart.sigs.Add(new Chart.Signature {
-						time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
+						time = beat,
 						tempo = tev.bpm,
 					});
 					chart.motions.Add(new Chart.Motion {
-						time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
-						motion = "svm:" + (tev.bpm / baseBpm).ToString()
+						time = beat,
+						motion = "svm:" + (tev.bpm / baseBpm.Value).ToString(CultureInfo.InvariantCulture)
 					});
 				}
 				else if (ev is MalodyChart.Effect) {
 					var tev = (MalodyChart.Effect)ev;
 					if (tev.scroll != null) group.motions.Add(new Chart.Motion {
-						time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
-						motion = "svm:" + tev.scroll.ToString()
+						time = beat,
+						motion = "svm:" + tev.scroll.Value.ToString(CultureInfo.InvariantCulture)
 					});
 				}
 				else if (ev is MalodyChart.Note) {
@@ -116,19 +113,17 @@ namespace Cryville.Crtr.Extensions.Malody {
 						else throw new NotImplementedException();
 					}
 					else {
-						if (ConvertBeat(tev.beat) > ConvertBeat(endbeat)) endbeat = tev.beat;
 						var rn = new Chart.Note() {
-							time = new BeatTime(tev.beat[0], tev.beat[1], tev.beat[2]),
+							time = beat,
 							motions = new List<Chart.Motion> {
-								new Chart.Motion() { motion = "track:" + tev.column.ToString() }
+								new Chart.Motion() { motion = "track:" + tev.column.ToString(CultureInfo.InvariantCulture) }
 							},
 						};
 						if (tev.endbeat != null) {
-							if (ConvertBeat(tev.endbeat) > ConvertBeat(endbeat)) endbeat = tev.endbeat;
 							rn.endtime = new BeatTime(tev.endbeat[0], tev.endbeat[1], tev.endbeat[2]);
 							longEvents.Add(ev, new StartEventState {
 								Destination = rn,
-								Time = ctime,
+								Time = tm.Time,
 							});
 						}
 						group.notes.Add(rn);
@@ -144,8 +139,10 @@ namespace Cryville.Crtr.Extensions.Malody {
 				}
 				else throw new NotSupportedException();
 			}
-			chart.endtime = new BeatTime(endbeat[0] + 4, endbeat[1], endbeat[2]);
-			meta.length = ctime;
+			var endbeat = tm.FractionalBeatTime;
+			endbeat.b += 4;
+			chart.endtime = endbeat;
+			meta.length = (float)tm.Time;
 			meta.note_count = group.notes.Count;
 			string chartName = string.Format("{0} - {1}", meta.song.name, meta.name);
 			if (src.meta.background != null) {
@@ -156,15 +153,10 @@ namespace Cryville.Crtr.Extensions.Malody {
 		}
 
 		struct StartEventState {
-			public float Time { get; set; }
+			public double Time { get; set; }
 			public ChartEvent Destination { get; set; }
 		}
 
-		float ConvertBeat(int[] beat) {
-			return beat[0] + (float)beat[1] / beat[2];
-		}
-	}
-
 #pragma warning disable IDE1006
 		struct MalodyChart {
 			public interface IEvent {
@@ -230,3 +222,4 @@ namespace Cryville.Crtr.Extensions.Malody {
 		}
 #pragma warning restore IDE1006
 	}
+}

Assets/Cryville/Crtr/Extensions/Malody/MalodyChartFinder.cs

@@ -0,0 +1,26 @@
+using Cryville.Common;
+using Cryville.Crtr.Browsing;
+using Microsoft.Win32;
+using System;
+using System.IO;
+
+namespace Cryville.Crtr.Extensions.Malody {
+	public class MalodyChartFinder : LocalResourceFinder {
+		public override string Name { get { return "Malody beatmaps"; } }
+
+		public override string GetRootPath() {
+			switch (Environment.OSVersion.Platform) {
+				case PlatformID.Unix:
+					return "/storage/emulated/0/data/malody/beatmap";
+				case PlatformID.Win32NT:
+					var reg = Registry.ClassesRoot.OpenSubKey(@"malody\Shell\Open\Command");
+					if (reg == null) return null;
+					var pathObj = reg.GetValue(null);
+					if (pathObj == null) return null;
+					var path = (string)pathObj;
+					return Path.Combine(new FileInfo(StringUtils.GetProcessPathFromCommand(path)).Directory.FullName, "beatmap");
+				default: return null;
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Extensions/Malody/MalodyChartFinder.cs.meta

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

Assets/Cryville/Crtr/Extensions/Quaver.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: ef3100799cf39eb4d8585dcfba2529a5
+guid: 6823ead66b33bc048bbad48719feb25d
 folderAsset: yes
-timeCreated: 1623583530
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Cryville/Crtr/Extensions/Quaver/QuaverChartConverter.cs

@@ -0,0 +1,153 @@
+using Cryville.Crtr.Browsing;
+using Quaver.API.Maps;
+using Quaver.API.Maps.Structures;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+namespace Cryville.Crtr.Extensions.Quaver {
+	public class QuaverChartConverter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".qua" };
+		const double OFFSET = 0.05;
+
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			List<Resource> result = new List<Resource>();
+			var src = Qua.Parse(file.FullName);
+			var ruleset = "quaver!" + src.Mode.ToString().ToLower();
+			var meta = new ChartMeta {
+				name = src.DifficultyName,
+				author = src.Creator,
+				song = new SongMetaInfo {
+					name = src.Title,
+					author = src.Artist,
+				},
+				ruleset = ruleset,
+				cover = src.BackgroundFile,
+				note_count = src.HitObjects.Count,
+			};
+			var chart = new Chart {
+				format = 2,
+				time = new BeatTime(-4, 0, 1),
+				ruleset = ruleset,
+				sigs = new List<Chart.Signature>(),
+				sounds = new List<Chart.Sound> {
+					new Chart.Sound { time = new BeatTime(0, 0, 1), id = src.Title, offset = (float)(src.TimingPoints[0].StartTime / 1e3 + OFFSET) }
+				},
+				motions = new List<Chart.Motion>(),
+				groups = new List<Chart.Group>(),
+			};
+			var group = new Chart.Group() {
+				tracks = new List<Chart.Track>(),
+				notes = new List<Chart.Note>(),
+				motions = new List<Chart.Motion>(),
+			};
+			chart.groups.Add(group);
+			result.Add(new RawChartResource(string.Format("{0} - {1}", meta.song.name, meta.name), chart, meta));
+			result.Add(new SongResource(meta.song.name, new FileInfo(Path.Combine(file.DirectoryName, src.AudioFile))));
+
+			var evs = new List<EventWrapper>();
+			foreach (var e in src.HitObjects) evs.Add(new EventWrapper.HitObject(e));
+			foreach (var e in src.SliderVelocities) evs.Add(new EventWrapper.SliderVelocity(e));
+			foreach (var e in src.SoundEffects) evs.Add(new EventWrapper.SoundEffect(e));
+			foreach (var e in src.TimingPoints) evs.Add(new EventWrapper.TimingPoint(e));
+			var evc = evs.Count;
+			for (int i = 0; i < evc; i++) if (evs[i].IsLong) evs.Add(new EventWrapper.EndEvent(evs[i]));
+			evs.Sort();
+
+			var longevs = new Dictionary<EventWrapper, ChartEvent>();
+			var tm = new TimeTimingModel(src.TimingPoints[0].StartTime / 1e3);
+			foreach (var ev in evs) {
+				tm.ForwardTo(ev.StartTime / 1e3);
+				if (ev is EventWrapper.HitObject) {
+					var tev = (EventWrapper.HitObject)ev;
+					var rn = new Chart.Note {
+						time = tm.FractionalBeatTime,
+						motions = new List<Chart.Motion> {
+							new Chart.Motion { motion = string.Format(CultureInfo.InvariantCulture, "track:{0}", tev.Event.Lane - 1) }
+						},
+					};
+					if (ev.IsLong) longevs.Add(ev, rn);
+					group.notes.Add(rn);
+				}
+				else if (ev is EventWrapper.SliderVelocity) {
+					var tev = (EventWrapper.SliderVelocity)ev;
+					group.motions.Add(new Chart.Motion {
+						time = tm.FractionalBeatTime,
+						motion = string.Format(CultureInfo.InvariantCulture, "svm:{0}", tev.Event.Multiplier),
+					});
+				}
+				else if (ev is EventWrapper.TimingPoint) {
+					var tev = (EventWrapper.TimingPoint)ev;
+					tm.BPM = tev.Event.Bpm;
+					chart.sigs.Add(new Chart.Signature {
+						time = tm.FractionalBeatTime,
+						tempo = tev.Event.Bpm,
+					});
+				}
+				else if (ev is EventWrapper.EndEvent) {
+					var tev = (EventWrapper.EndEvent)ev;
+					var oev = tev.Original;
+					longevs[oev].endtime = tm.FractionalBeatTime;
+				}
+				else throw new NotSupportedException("Sound effects are not supported yet");
+			}
+			var endbeat = tm.FractionalBeatTime;
+			endbeat.b += 4;
+			chart.endtime = endbeat;
+			meta.length = (float)tm.Time;
+			return result;
+		}
+
+		abstract class EventWrapper : IComparable<EventWrapper> {
+			public abstract int StartTime { get; }
+			public abstract int EndTime { get; }
+			public bool IsLong { get { return EndTime > 0; } }
+			public abstract int Priority { get; }
+			public int CompareTo(EventWrapper other) {
+				var c = StartTime.CompareTo(other.StartTime);
+				if (c != 0) return c;
+				return Priority.CompareTo(other.Priority);
+			}
+			public class HitObject : EventWrapper {
+				public HitObjectInfo Event;
+				public HitObject(HitObjectInfo ev) { Event = ev; }
+				public override int StartTime { get { return Event.StartTime; } }
+				public override int EndTime { get { return Event.EndTime; } }
+				public override int Priority { get { return 0; } }
+			}
+			public class SliderVelocity : EventWrapper {
+				public SliderVelocityInfo Event;
+				public SliderVelocity(SliderVelocityInfo ev) { Event = ev; }
+				public override int StartTime { get { return (int)Event.StartTime; } }
+				public override int EndTime { get { return 0; } }
+				public override int Priority { get { return 0; } }
+			}
+			public class SoundEffect : EventWrapper {
+				public SoundEffectInfo Event;
+				public SoundEffect(SoundEffectInfo ev) { Event = ev; }
+				public override int StartTime { get { return (int)Event.StartTime; } }
+				public override int EndTime { get { return 0; } }
+				public override int Priority { get { return 0; } }
+			}
+			public class TimingPoint : EventWrapper {
+				public TimingPointInfo Event;
+				public TimingPoint(TimingPointInfo ev) { Event = ev; }
+				public override int StartTime { get { return (int)Event.StartTime; } }
+				public override int EndTime { get { return 0; } }
+				public override int Priority { get { return -2; } }
+			}
+			public class EndEvent : EventWrapper {
+				public EventWrapper Original;
+				public EndEvent(EventWrapper ev) { if (!ev.IsLong) throw new ArgumentException("Event is not long"); Original = ev; }
+				public override int StartTime { get { return Original.EndTime; } }
+				public override int EndTime { get { return 0; } }
+				public override int Priority { get { return Original.Priority - 1; } }
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Extensions/Quaver/QuaverChartConverter.cs.meta

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

Assets/Cryville/Crtr/Extensions/Quaver/QuaverChartFinder.cs

@@ -0,0 +1,24 @@
+using Cryville.Common;
+using Cryville.Crtr.Browsing;
+using Microsoft.Win32;
+using System;
+using System.IO;
+
+namespace Cryville.Crtr.Extensions.Quaver {
+	public class QuaverChartFinder : LocalResourceFinder {
+		public override string Name { get { return "Quaver beatmaps"; } }
+
+		public override string GetRootPath() {
+			switch (Environment.OSVersion.Platform) {
+				case PlatformID.Win32NT:
+					var reg = Registry.ClassesRoot.OpenSubKey(@"quaver\Shell\Open\Command");
+					if (reg == null) return null;
+					var pathObj = reg.GetValue(null);
+					if (pathObj == null) return null;
+					var path = (string)pathObj;
+					return Path.Combine(new FileInfo(StringUtils.GetProcessPathFromCommand(path)).Directory.FullName, "Songs");
+				default: return null;
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Extensions/Quaver/QuaverChartFinder.cs.meta

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

Assets/Cryville/Crtr/Extensions/TimingModel.cs

@@ -0,0 +1,56 @@
+using Cryville.Common.Math;
+using System;
+
+namespace Cryville.Crtr.Extensions {
+	public abstract class TimingModel {
+		public double Time { get; protected set; }
+		public double BeatTime { get; protected set; }
+		public BeatTime FractionalBeatTime { get; protected set; }
+		double m_bpm;
+		public double BPM { get { return m_bpm; } set { m_bpm = value; } }
+		public double BeatLength { get { return 60 / m_bpm; } set { m_bpm = 60 / value; } }
+		public TimingModel(double offset) {
+			Time = offset;
+			FractionalBeatTime = new BeatTime(0, 0, 1);
+		}
+	}
+	public class FractionalBeatTimeTimingModel : TimingModel {
+		public FractionalBeatTimeTimingModel(double offset = 0) : base(offset) { }
+		public void ForwardTo(BeatTime t) {
+			if (t == FractionalBeatTime) return;
+			if (BPM == 0) throw new InvalidOperationException("BPM not determined");
+			FractionalBeatTime = t;
+			var nt = t.Decimal;
+			Time += (nt - BeatTime) / BPM * 60;
+			BeatTime = nt;
+		}
+	}
+	public class BeatTimeTimingModel : TimingModel {
+		public BeatTimeTimingModel(double offset = 0) : base(offset) { }
+		public void ForwardTo(double t) {
+			if (t == BeatTime) return;
+			if (BPM == 0) throw new InvalidOperationException("BPM not determined");
+			Time += (t - BeatTime) / BPM * 60;
+			BeatTime = t;
+			FractionalBeatTime = ToBeatTime(t);
+		}
+		static BeatTime ToBeatTime(double beat, double error = 1e-4) {
+			int i, n, d;
+			FractionUtils.ToFraction(beat, error, out n, out d);
+			i = n / d; n %= d;
+			return new BeatTime(i, n, d);
+		}
+	}
+	public class TimeTimingModel : TimingModel {
+		public TimeTimingModel(double offset = 0) : base(offset) { }
+		public void ForwardTo(double t) {
+			if (t == Time) return;
+			if (BPM == 0) throw new InvalidOperationException("BPM not determined");
+			BeatTime += (t - Time) * BPM / 60;
+			int n, d;
+			FractionUtils.ToFraction(BeatTime, 1f / 48 / BPM * 60, out n, out d);
+			FractionalBeatTime = new BeatTime(n, d);
+			Time = t;
+		}
+	}
+}

Assets/Cryville/Crtr/Extensions/TimingModel.cs.meta

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

Assets/Cryville/Crtr/Extensions/osu.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: dc2947c139e087f43b375d2510a449df
+guid: dbc046e7cabacbb4fbf74520399a7340
 folderAsset: yes
-timeCreated: 1621384032
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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

@@ -0,0 +1,373 @@
+using Cryville.Crtr.Browsing;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Extensions.osu {
+#pragma warning disable IDE1006
+	public class osuChartConverter : ResourceConverter {
+#pragma warning restore IDE1006
+		static readonly string[] SUPPORTED_FORMATS = { ".osu" };
+		const double OFFSET = 0.07;
+
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			List<Resource> result = new List<Resource>();
+			var meta = new ChartMeta { song = new SongMetaInfo() };
+			var group = new Chart.Group() {
+				tracks = new List<Chart.Track>(),
+				notes = new List<Chart.Note>(),
+				motions = new List<Chart.Motion>(),
+			};
+			var chart = new Chart {
+				format = 2,
+				time = new BeatTime(-4, 0, 1),
+				sigs = new List<Chart.Signature>(),
+				sounds = new List<Chart.Sound>(),
+				motions = new List<Chart.Motion>(),
+				groups = new List<Chart.Group> { group },
+			};
+			var diff = new DifficultyInfo();
+			var evs = new List<osuEvent>();
+
+			using (var reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+				Section section = Section.General;
+				int version;
+				bool flag = false;
+				string line;
+				while ((line = reader.ReadLine()) != null) {
+					if (!flag) {
+						if (line.StartsWith("osu file format v")) {
+							version = int.Parse(line.Substring(17), CultureInfo.InvariantCulture);
+							if (version > 14) throw new NotSupportedException("osu! chart format version too high");
+							else if (version < 5) throw new NotSupportedException("osu! chart format version too low"); // TODO apply offset
+						}
+						else throw new NotSupportedException("Unrecognized osu! chart format");
+						flag = true;
+					}
+					if (ShouldSkipLine(line)) continue;
+					if (section != Section.Metadata) line = StripComments(line);
+					line = line.TrimEnd();
+					if (line.StartsWith('[') && line.EndsWith(']')) {
+						Enum.TryParse(line.Substring(1, line.Length - 2), out section);
+						continue;
+					}
+					ParseLine(meta, chart, diff, evs, section, line);
+				}
+			}
+
+			result.Add(new RawChartResource(string.Format("{0} - {1}", meta.song.name, meta.name), chart, meta));
+			var evc = evs.Count;
+			for (int i = 0; i < evc; i++) if (evs[i].IsLong) evs.Add(new osuEvent.EndEvent(evs[i]));
+			evs.Sort();
+
+			var longevs = new Dictionary<osuEvent, ChartEvent>();
+			Chart.Sound bgmEv = null;
+			TimeTimingModel tm = null;
+			foreach (var ev in evs) {
+				if (tm != null) tm.ForwardTo(ev.StartTime / 1e3);
+				if (ev is osuEvent.Audio) {
+					var tev = (osuEvent.Audio)ev;
+					chart.sounds.Add(bgmEv = new Chart.Sound { time = new BeatTime(0, 0, 1), id = meta.song.name });
+					result.Add(new SongResource(meta.song.name, new FileInfo(Path.Combine(file.DirectoryName, tev.AudioFile))));
+				}
+				else if (ev is osuEvent.Background) {
+					meta.cover = ((osuEvent.Background)ev).FileName;
+				}
+				else if (ev is osuEvent.EffectPoint) {
+					var tev = (osuEvent.EffectPoint)ev;
+					group.motions.Add(new Chart.Motion { motion = string.Format(CultureInfo.InvariantCulture, "svm:{0}", tev.ScrollSpeed) });
+				}
+				else if (ev is osuEvent.EndEvent) {
+					if (tm == null) throw new InvalidOperationException("Unconvertible chart: timed event before first timing point");
+					var tev = (osuEvent.EndEvent)ev;
+					longevs[tev.Original].endtime = tm.FractionalBeatTime;
+				}
+				else if (ev is osuEvent.HOMania) {
+					if (tm == null) throw new InvalidOperationException("Unconvertible chart: timed event before first timing point");
+					var tev = (osuEvent.HOMania)ev;
+					var rn = new Chart.Note {
+						time = tm.FractionalBeatTime,
+						motions = new List<Chart.Motion> {
+							new Chart.Motion{ motion = string.Format(CultureInfo.InvariantCulture, "track:{0}", (int)(tev.X * diff.CircleSize / 512)) }
+						},
+					};
+					group.notes.Add(rn);
+					if (tev.IsLong) longevs.Add(tev, rn);
+				}
+				else if (ev is osuEvent.TimingChange) {
+					var tev = (osuEvent.TimingChange)ev;
+					if (tm == null) {
+						tm = new TimeTimingModel(tev.StartTime / 1e3);
+						bgmEv.offset = (float)(tev.StartTime / 1e3 + OFFSET);
+					}
+					tm.BeatLength = tev.BeatLength / 1e3;
+					chart.sigs.Add(new Chart.Signature {
+						time = tm.FractionalBeatTime,
+						tempo = (float)tm.BPM,
+					});
+				}
+				else throw new NotSupportedException("Unsupported event detected");
+			}
+			var endbeat = tm.FractionalBeatTime;
+			endbeat.b += 4;
+			chart.endtime = endbeat;
+			meta.length = (float)tm.Time;
+			meta.note_count = group.notes.Count;
+			return result;
+		}
+
+		void ParseLine(ChartMeta meta, Chart chart, DifficultyInfo diff, List<osuEvent> evs, Section section, string line) {
+			switch (section) {
+				case Section.General: HandleGeneral(meta, chart, evs, line); return;
+				case Section.Metadata: HandleMetadata(meta, line); return;
+				case Section.Difficulty: HandleDifficulty(diff, line); return;
+				case Section.Events: HandleEvent(evs, line); return;
+				case Section.TimingPoints: HandleTimingPoint(chart, evs, line); return;
+				case Section.HitObjects: HandleHitObject(evs, line); return;
+			}
+		}
+
+		void HandleGeneral(ChartMeta meta, Chart chart, List<osuEvent> evs, string line) {
+			var pair = SplitKeyVal(line);
+			switch (pair.Key) {
+				case @"AudioFilename":
+					evs.Add(new osuEvent.Audio { StartTime = double.NegativeInfinity, AudioFile = pair.Value });
+					break;
+				case @"Mode":
+					int rulesetID = int.Parse(pair.Value, CultureInfo.InvariantCulture);
+					var ruleset = "osu!";
+					switch (rulesetID) {
+						case 0: /*ruleset += "standard";*/ throw new NotSupportedException("osu!standard mode is not supported yet");
+						case 1: /*ruleset += "taiko";*/ throw new NotSupportedException("osu!taiko mode is not supported yet");
+						case 2: /*ruleset += "catch";*/ throw new NotSupportedException("osu!catch mode is not supported yet");
+						case 3: ruleset += "mania"; break;
+					}
+					meta.ruleset = chart.ruleset = ruleset;
+					break;
+			}
+		}
+
+		void HandleMetadata(ChartMeta meta, string line) {
+			var pair = SplitKeyVal(line);
+			switch (pair.Key) {
+				case @"Title": if (meta.song.name == null) meta.song.name = pair.Value; break;
+				case @"TitleUnicode": meta.song.name = pair.Value; break;
+				case @"Artist": if (meta.song.author == null) meta.song.author = pair.Value; break;
+				case @"ArtistUnicode": meta.song.author = pair.Value; break;
+				case @"Creator": meta.author = pair.Value; break;
+				case @"Version": meta.name = pair.Value; break;
+			}
+		}
+
+		void HandleDifficulty(DifficultyInfo diff, string line) {
+			var pair = SplitKeyVal(line);
+			switch (pair.Key) {
+				case @"CircleSize":
+					diff.CircleSize = float.Parse(pair.Value, CultureInfo.InvariantCulture);
+					break;
+				case @"SliderMultiplier":
+					diff.SliderMultiplier = double.Parse(pair.Value, CultureInfo.InvariantCulture);
+					break;
+			}
+		}
+
+		void HandleEvent(List<osuEvent> evs, string line) {
+			string[] split = line.Split(',');
+			if (!Enum.TryParse(split[0], out LegacyEventType type))
+				throw new InvalidDataException($@"Unknown event type: {split[0]}");
+			switch (type) {
+				case LegacyEventType.Sprite:
+					if (evs.Count == 0 || !(evs[evs.Count - 1] is osuEvent.Background))
+						evs.Add(new osuEvent.Background { StartTime = double.NegativeInfinity, FileName = CleanFilename(split[3]) });
+					break;
+				case LegacyEventType.Background:
+					evs.Add(new osuEvent.Background { StartTime = double.NegativeInfinity, FileName = CleanFilename(split[2]) });
+					break;
+			}
+		}
+		enum LegacyEventType {
+			Background = 0,
+			Video = 1,
+			Break = 2,
+			Colour = 3,
+			Sprite = 4,
+			Sample = 5,
+			Animation = 6
+		}
+
+		void HandleTimingPoint(Chart chart, List<osuEvent> evs, string line) {
+			string[] split = line.Split(',');
+
+			double time = double.Parse(split[0].Trim(), CultureInfo.InvariantCulture)/* + offset*/;
+
+			// beatLength is allowed to be NaN to handle an edge case in which some beatmaps use NaN slider velocity to disable slider tick generation (see LegacyDifficultyControlPoint).
+			double beatLength = double.Parse(split[1].Trim(), CultureInfo.InvariantCulture);
+
+			// If beatLength is NaN, speedMultiplier should still be 1 because all comparisons against NaN are false.
+			double speedMultiplier = beatLength < 0 ? 100.0 / -beatLength : 1;
+
+			int timeSignature = 4;
+			if (split.Length >= 3)
+				timeSignature = split[2][0] == '0' ? 4 : int.Parse(split[2], CultureInfo.InvariantCulture);
+
+			bool timingChange = true;
+			if (split.Length >= 7)
+				timingChange = split[6][0] == '1';
+
+			//bool omitFirstBarSignature = false;
+
+			//if (split.Length >= 8) {
+			//	int effectFlags = int.Parse(split[7], CultureInfo.InvariantCulture);
+			//	omitFirstBarSignature = (effectFlags & 0x8) != 0;
+			//}
+
+			if (timingChange) {
+				if (double.IsNaN(beatLength))
+					throw new InvalidDataException("Beat length cannot be NaN in a timing control point");
+				evs.Add(new osuEvent.TimingChange { StartTime = time, BeatLength = beatLength, TimeSignature = timeSignature });
+			}
+
+			// osu!taiko and osu!mania use effect points rather than difficulty points for scroll speed adjustments.
+			if (chart.ruleset == "osu!taiko" || chart.ruleset == "osu!mania")
+				evs.Add(new osuEvent.EffectPoint { StartTime = time, ScrollSpeed = speedMultiplier });
+		}
+
+		void HandleHitObject(List<osuEvent> evs, string line) {
+			string[] split = line.Split(',');
+
+			int posx = (int)float.Parse(split[0], CultureInfo.InvariantCulture);
+			// int posy = (int)float.Parse(split[1], CultureInfo.InvariantCulture);
+
+			double startTime = double.Parse(split[2], CultureInfo.InvariantCulture)/* + Offset*/;
+
+			LegacyHitObjectType type = (LegacyHitObjectType)int.Parse(split[3], CultureInfo.InvariantCulture);
+
+			// int comboOffset = (int)(type & LegacyHitObjectType.ComboOffset) >> 4;
+			type &= ~LegacyHitObjectType.ComboOffset;
+
+			// bool combo = type.HasFlag(LegacyHitObjectType.NewCombo);
+			type &= ~LegacyHitObjectType.NewCombo;
+
+			osuEvent.HitObject result;
+
+			if (type.HasFlag(LegacyHitObjectType.Circle)) {
+				result = new osuEvent.HOManiaHit { X = posx };
+			}
+			else if (type.HasFlag(LegacyHitObjectType.Hold)) {
+				double endTime = Math.Max(startTime, double.Parse(split[2], CultureInfo.InvariantCulture));
+				if (split.Length > 5 && !string.IsNullOrEmpty(split[5])) {
+					string[] ss = split[5].Split(':');
+					endTime = Math.Max(startTime, double.Parse(ss[0], CultureInfo.InvariantCulture));
+				}
+				result = new osuEvent.HOManiaHold { X = posx, EndTime = endTime };
+			}
+			else throw new NotSupportedException(string.Format("Hit objects of type {0} is not supported yet", type));
+
+			if (result == null) throw new InvalidDataException($"Unknown hit object type: {split[3]}");
+
+			result.StartTime = startTime;
+
+			if (result != null) evs.Add(result);
+		}
+		[Flags]
+		enum LegacyHitObjectType {
+			Circle = 1,
+			Slider = 1 << 1,
+			NewCombo = 1 << 2,
+			Spinner = 1 << 3,
+			ComboOffset = (1 << 4) | (1 << 5) | (1 << 6),
+			Hold = 1 << 7
+		}
+
+		static bool ShouldSkipLine(string line) => string.IsNullOrWhiteSpace(line) || line.TrimStart().StartsWith("//", StringComparison.Ordinal)
+			|| line.StartsWith(' ') || line.StartsWith('_');
+		protected string StripComments(string line) {
+			int index = line.IndexOf("//");
+			if (index > 0) return line.Substring(0, index);
+			return line;
+		}
+		KeyValuePair<string, string> SplitKeyVal(string line, char separator = ':', bool shouldTrim = true) {
+			string[] split = line.Split(separator, 2);
+			if (shouldTrim) {
+				for (int i = 0; i < split.Length; i++)
+					split[i] = split[i].Trim();
+			}
+			return new KeyValuePair<string, string> (
+				split[0],
+				split.Length > 1 ? split[1] : string.Empty
+			);
+		}
+		static string CleanFilename(string path) => path.Replace(@"\\", @"\").Trim('"');
+
+		enum Section {
+			General,
+			Editor,
+			Metadata,
+			Difficulty,
+			Events,
+			TimingPoints,
+			Colours,
+			HitObjects,
+			Variables,
+			Fonts,
+			CatchTheBeat,
+			Mania,
+		}
+
+		class DifficultyInfo {
+			public float CircleSize { get; internal set; }
+			public double SliderMultiplier { get; set; }
+		}
+#pragma warning disable IDE1006 // Naming Styles
+		abstract class osuEvent : IComparable<osuEvent> {
+			public virtual double StartTime { get; set; }
+			public virtual double EndTime { get; set; }
+			public bool IsLong { get { return EndTime - StartTime > 0 && EndTime > 0; } }
+			public abstract int Priority { get; }
+			public int CompareTo(osuEvent other) {
+				var c = StartTime.CompareTo(other.StartTime);
+				if (c != 0) return c;
+				return Priority.CompareTo(other.Priority);
+			}
+			public class EndEvent : osuEvent {
+				public osuEvent Original;
+				public EndEvent(osuEvent ev) { if (!ev.IsLong) throw new ArgumentException("Event is not long"); Original = ev; }
+				public override double StartTime { get { return Original.EndTime; } }
+				public override double EndTime { get { return 0; } }
+				public override int Priority { get { return Original.Priority - 1; } }
+			}
+			public class Audio : osuEvent {
+				public string AudioFile { get; set; }
+				public override int Priority { get { return 0; } }
+			}
+			public class TimingChange : osuEvent {
+				public double BeatLength { get; set; }
+				public int TimeSignature { get; set; }
+				public override int Priority { get { return -4; } }
+			}
+			public class EffectPoint : osuEvent {
+				public double ScrollSpeed { get; set; }
+				public override int Priority { get { return -2; } }
+			}
+			public class Background : osuEvent {
+				public string FileName { get; set; }
+				public override int Priority { get { return 0; } }
+			}
+			public class HitObject : osuEvent {
+				public sealed override int Priority { get { return 0; } }
+			}
+			public class HOMania : HitObject {
+				public float X { get; set; }
+			}
+			public class HOManiaHit : HOMania { }
+			public class HOManiaHold : HOMania { }
+		}
+#pragma warning restore IDE1006 // Naming Styles
+	}
+}

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

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

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

@@ -0,0 +1,24 @@
+using Cryville.Common;
+using Cryville.Crtr.Browsing;
+using Microsoft.Win32;
+using System;
+using System.IO;
+
+namespace Cryville.Crtr.Extensions.osu {
+	public class osuChartFinder : LocalResourceFinder {
+		public override string Name { get { return "osu! beatmaps"; } }
+
+		public override string GetRootPath() {
+			switch (Environment.OSVersion.Platform) {
+				case PlatformID.Win32NT:
+					var reg = Registry.ClassesRoot.OpenSubKey(@"osu!\Shell\Open\Command");
+					if (reg == null) return null;
+					var pathObj = reg.GetValue(null);
+					if (pathObj == null) return null;
+					var path = (string)pathObj;
+					return Path.Combine(new FileInfo(StringUtils.GetProcessPathFromCommand(path)).Directory.FullName, "Songs");
+				default: return null;
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Extensions/osu/osuChartFinder.cs.meta

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

Assets/Cryville/Crtr/Game.cs

@@ -76,7 +76,14 @@ namespace Cryville.Crtr {
 #if UNITY_ANDROID
 			Cryville.Audio.OpenSL.OutputClient.CallbackFunction = audioCallback;
 #endif
+			while (true) {
+				try {
 					AudioManager = EngineBuilder.Create();
+					if (AudioManager == null) {
+						Popup.Create("Cannot initialize audio engine");
+						Logger.Log("main", 5, "Audio", "Cannot initialize audio engine");
+					}
+					else {
 						Logger.Log("main", 1, "Audio", "Using audio API: {0}", AudioManager.GetType().Namespace);
 						AudioClient = AudioManager.GetDefaultDevice(DataFlow.Out).Connect();
 						AudioClient.Init(AudioClient.DefaultFormat);
@@ -84,6 +91,15 @@ namespace Cryville.Crtr {
 						AudioSession = AudioSequencer.NewSession();
 						AudioSequencer.Playing = true;
 						AudioClient.Start();
+					}
+					break;
+				}
+				catch (Exception ex) {
+					Logger.Log("main", 4, "Audio", "An error occured when initializing the audio engine: {0}", ex);
+					Logger.Log("main", 3, "Audio", "Trying to use fallback audio engines");
+					EngineBuilder.Engines.Remove(AudioManager.GetType());
+				}
+			}
 
 			ChartPlayer.motionRegistry = new Dictionary<Identifier, MotionRegistry> {
 				{ "pt"     , new MotionRegistry(typeof(VecPt)) },

Assets/Cryville/Crtr/GroupHandler.cs

@@ -1,7 +1,6 @@
 using Cryville.Common.Math;
 using Cryville.Crtr.Event;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 
@@ -10,7 +9,7 @@ namespace Cryville.Crtr {
 		public ChartHandler ch;
 
 		SquareMatrix matFrame;
-		List<ContainerState> tracks;
+		ContainerState[] tracks;
 
 		public GroupHandler(Chart.Group tg, ChartHandler ch) : base() {
 			this.ch = ch;
@@ -28,20 +27,22 @@ namespace Cryville.Crtr {
 				from c in cs.Children
 				where c.Value.Container is Chart.Track
 				select c.Value
-			).ToList();
-			matFrame = SquareMatrix.WithPolynomialCoefficients(tracks.Count);
+			).ToArray();
+			matFrame = SquareMatrix.WithPolynomialCoefficients(tracks.Length);
+			frame = new ColumnVector<Vector3>(tracks.Length);
 		}
 
+		ColumnVector<Vector3> frame;
 		public ColumnVector<Vector3> GetCurrentFrame(Func<ContainerState, Vector3> func) {
-			var vl = from t in tracks select func(t);
-			return matFrame.Eliminate(
-				new ColumnVector<Vector3>(vl.ToArray()),
-				new Vector3Operator()
-			);
+			for (int i = 0; i < tracks.Length; i++)
+				frame[i] = func(tracks[i]);
+			return matFrame.Eliminate(frame, Vector3Operator.Instance);
 		}
 	}
 
 	class Vector3Operator : IVectorOperator<Vector3> {
+		public static Vector3Operator Instance = new Vector3Operator();
+
 		public Vector3 Add(Vector3 lhs, Vector3 rhs) {
 			return lhs + rhs;
 		}

Assets/Cryville/Crtr/InputProxy.cs

@@ -17,6 +17,7 @@ namespace Cryville.Crtr {
 					*(int*)(ptr + 3 * sizeof(float)) = PdtInternalType.Number;
 				}
 			}
+			_vecsrc = new PropSrc.Arbitrary(PdtInternalType.Vector, _vecbuf);
 			_etor = ChartPlayer.etor;
 			_ruleset = ruleset;
 			_judge = judge;
@@ -168,11 +169,12 @@ namespace Cryville.Crtr {
 		static readonly int _var_value = IdentifierManager.SharedInstance.Request("value");
 		static readonly PropOp.Arbitrary _arbop = new PropOp.Arbitrary();
 		readonly byte[] _vecbuf = new byte[3 * sizeof(float) + sizeof(int)];
+		readonly PropSrc.Arbitrary _vecsrc;
 		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>();
-		static readonly byte[] _nullvalue = new byte[0];
+		static readonly PropSrc.Arbitrary _nullsrc = new PropSrc.Arbitrary(PdtInternalType.Null, new byte[0]);
 		unsafe void OnInput(InputIdentifier id, InputVector vec) {
 			lock (_lock) {
 				InputProxyEntry proxy;
@@ -181,14 +183,15 @@ namespace Cryville.Crtr {
 					float ft, tt = (float)(vec.Time - _timeOrigins[id.Source.Handler]);
 					if (!_vect.TryGetValue(id, out ft)) ft = tt;
 					if (vec.IsNull) {
-						_etor.ContextCascadeUpdate(_var_value, new PropSrc.Arbitrary(PdtInternalType.Null, _nullvalue));
+						_etor.ContextCascadeUpdate(_var_value, _nullsrc);
 						OnInput(id, proxy.Target, ft, tt, true);
 					}
 					else {
 						fixed (byte* ptr = _vecbuf) {
 							*(Vector3*)ptr = vec.Vector;
 						}
-						_etor.ContextCascadeUpdate(_var_value, new PropSrc.Arbitrary(PdtInternalType.Vector, _vecbuf));
+						_vecsrc.Invalidate();
+						_etor.ContextCascadeUpdate(_var_value, _vecsrc);
 						OnInput(id, proxy.Target, ft, tt, false);
 					}
 					_vect[id] = tt;
@@ -212,7 +215,7 @@ namespace Cryville.Crtr {
 			else {
 				var pid = new ProxiedInputIdentifier { Source = id, Target = target };
 				PropSrc.Arbitrary fv, tv = _etor.ContextCascadeLookup(_var_value);
-				if (!_vecs.TryGetValue(pid, out fv)) fv = new PropSrc.Arbitrary(PdtInternalType.Null, _nullvalue);
+				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]++;
 					_etor.ContextCascadeInsert();
@@ -222,7 +225,7 @@ namespace Cryville.Crtr {
 					_etor.ContextCascadeDiscard();
 					if (tv.Type == PdtInternalType.Null) _activeCounts[id.Source]--;
 				}
-				_judge.Cleanup(target, ft, tt);
+				_judge.Cleanup(target, tt);
 				_vecs[pid] = tv;
 			}
 		}

Assets/Cryville/Crtr/Judge.cs

@@ -17,10 +17,10 @@ namespace Cryville.Crtr {
 		readonly Dictionary<Identifier, List<JudgeEvent>> activeEvs
 			= new Dictionary<Identifier, List<JudgeEvent>>();
 		struct JudgeEvent {
-			public float StartTime { get; set; }
-			public float EndTime { get; set; }
-			public float StartClip { get; set; }
-			public float EndClip { get; set; }
+			public double StartTime { get; set; }
+			public double EndTime { get; set; }
+			public double StartClip { get; set; }
+			public double EndClip { get; set; }
 			public JudgeDefinition Definition { get; set; }
 			public ContainerState State { get; set; }
 		}
@@ -35,7 +35,7 @@ namespace Cryville.Crtr {
 			_rs = rs;
 			InitScores();
 		}
-		public void Prepare(float st, float et, Identifier input, JudgeDefinition def, ContainerState container) {
+		public void Prepare(double st, double et, Identifier input, JudgeDefinition def, ContainerState container) {
 			List<JudgeEvent> list;
 			if (!evs.TryGetValue(input, out list)) {
 				ct.Add(input, 0);
@@ -89,10 +89,12 @@ namespace Cryville.Crtr {
 				int num3 = num + (num2 - num >> 1);
 				int num4 = -list[num3].Definition.stack.CompareTo(stack);
 				if (num4 == 0) num4 = list[num3].StartClip.CompareTo(time);
-				if (num4 >= 0) num2 = num3 - 1;
-				else num = num3 + 1;
+				if (num4 > 0) num2 = num3 - 1;
+				else if (num4 < 0) num = num3 + 1;
+				else if (num != num3) num2 = num3;
+				else return num;
 			}
-			return num + 1;
+			return ~num;
 		}
 		public void Feed(Identifier target, float ft, float tt) {
 			Forward(target, tt);
@@ -103,8 +105,8 @@ namespace Cryville.Crtr {
 				var index = 0;
 				while (index >= 0 && index < actlist.Count) {
 					var ev = actlist[index];
-					LoadNum(_numbuf1, ev.StartTime); _etor.ContextCascadeUpdate(_var_fn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf1));
-					LoadNum(_numbuf2, ev.EndTime); _etor.ContextCascadeUpdate(_var_tn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf2));
+					LoadNum(_numbuf1, (float)ev.StartTime); _etor.ContextCascadeUpdate(_var_fn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf1));
+					LoadNum(_numbuf2, (float)ev.EndTime); _etor.ContextCascadeUpdate(_var_tn, new PropSrc.Arbitrary(PdtInternalType.Number, _numbuf2));
 					var def = ev.Definition;
 					if (def.hit != null) _etor.Evaluate(_flagop, def.hit);
 					else _flag = true;
@@ -113,7 +115,7 @@ namespace Cryville.Crtr {
 						if (def.pass != null) Pass(def.pass);
 						actlist.RemoveAt(index);
 						if (def.prop != 0 && actlist.Count > 0) {
-							index = BinarySearchFirst(actlist, ev.StartClip, def.stack - def.prop);
+							index = BinarySearchFirst(actlist, (float)ev.StartClip, def.stack - def.prop);
 							if (index < 0) index = ~index;
 						}
 						else index++;
@@ -135,7 +137,7 @@ namespace Cryville.Crtr {
 			}
 			return false;
 		}
-		public void Cleanup(Identifier target, float ft, float tt) {
+		public void Cleanup(Identifier target, float tt) {
 			Forward(target, tt);
 			var actlist = activeEvs[target];
 			for (int i = actlist.Count - 1; i >= 0; i--) {
@@ -152,7 +154,7 @@ namespace Cryville.Crtr {
 			JudgeEvent ev;
 			while (list.Count > 0 && (ev = list[0]).StartClip <= tt) {
 				list.RemoveAt(0);
-				var index = BinarySearch(actlist, ev.StartClip, ev.Definition.stack);
+				var index = BinarySearch(actlist, (float)ev.StartClip, ev.Definition.stack);
 				if (index < 0) index = ~index;
 				actlist.Insert(index, ev);
 			}

Assets/Cryville/Crtr/MeshWrapper.cs

@@ -41,7 +41,7 @@ namespace Cryville.Crtr {
 				MeshObject.AddComponent<MeshRenderer>();
 			MeshFilter = MeshObject.GetComponent<MeshFilter>();
 			Renderer = MeshObject.GetComponent<Renderer>();
-			Renderer.material = GenericResources.Materials["-SpriteMat"];
+			Renderer.material = NewMaterial;
 			Initialized = true;
 		}
 		public void Destroy() {

Assets/Cryville/Crtr/Motion.cs

@@ -2,6 +2,7 @@ using Cryville.Common;
 using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
@@ -22,9 +23,9 @@ namespace Cryville.Crtr {
 	}
 
 	public static class MotionLerper {
-		public static void Lerp<T>(float time, float tt, T tv, float ft, T fv, TransitionType type, float rate, ref T result) where T : Vector {
+		public static void Lerp<T>(double time, double tt, T tv, double ft, T fv, TransitionType type, float rate, ref T result) where T : Vector {
 			if (fv == null) fv = (T)ReflectionHelper.InvokeEmptyConstructor(tv.GetType());
-			Lerp((time - ft) / (tt - ft), fv, tv, type, rate, ref result);
+			Lerp((float)((time - ft) / (tt - ft)), fv, tv, type, rate, ref result);
 		}
 
 		public static void Lerp<T>(float scaledTime, T from, T to, TransitionType type, float rate, ref T result) where T : Vector {
@@ -34,7 +35,7 @@ namespace Cryville.Crtr {
 			to.LerpWith(from, GetEaseTime(scaledTime, type, rate), ref r);
 		}
 
-		public static float Delerp<T>(T value, float tt, T tv, float ft, T fv, TransitionType type, float rate) where T : Vector {
+		public static double Delerp<T>(T value, double tt, T tv, double ft, T fv, TransitionType type, float rate) where T : Vector {
 			if (fv == null) fv = (T)ReflectionHelper.InvokeEmptyConstructor(tv.GetType());
 			var t = Delerp(value, fv, tv, type, rate);
 			return ft * (1 - t) + tt * t;
@@ -170,6 +171,7 @@ namespace Cryville.Crtr {
 	public class RealtimeMotionValue {
 		public Vector AbsoluteValue;
 		List<MotionNode> RelativeNodes;
+		internal byte CloneTypeFlag;
 
 		public RealtimeMotionValue Init(Vector init) {
 			RelativeNodes = new List<MotionNode> {
@@ -367,11 +369,11 @@ namespace Cryville.Crtr {
 		static readonly Type[] stringTypeArray = new Type[] { typeof(string) };
 		static readonly Type[] floatArrayTypeArray = new Type[] { typeof(float[]) };
 		public static Vector Construct(Type type, string s) {
-			if (!typeof(Vector).IsAssignableFrom(type)) throw new ArgumentException(); // TODO
+			if (!typeof(Vector).IsAssignableFrom(type)) throw new ArgumentException("Type is not vector");
 			return (Vector)type.GetConstructor(stringTypeArray).Invoke(new object[] { s });
 		}
 		public static Vector Construct(Type type, float[] values) {
-			if (!typeof(Vector).IsAssignableFrom(type)) throw new ArgumentException(); // TODO
+			if (!typeof(Vector).IsAssignableFrom(type)) throw new ArgumentException("Type is not vector");
 			return (Vector)type.GetConstructor(floatArrayTypeArray).Invoke(new object[] { values });
 		}
 	}
@@ -433,7 +435,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return Value.ToString();
+			return Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		public override float[] ToArray() {
@@ -493,7 +495,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return Value.ToString();
+			return Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		public override float[] ToArray() {
@@ -553,7 +555,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return Value.ToString();
+			return Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		public override float[] ToArray() {
@@ -648,8 +650,8 @@ namespace Cryville.Crtr {
 
 		public static string ToString(float? w, float? h) {
 			List<string> list = new List<string>();
-			if (w != null) list.Add(w.ToString() + "w");
-			if (h != null) list.Add(h.ToString() + "h");
+			if (w != null) list.Add(w.Value.ToString(CultureInfo.InvariantCulture) + "w");
+			if (h != null) list.Add(h.Value.ToString(CultureInfo.InvariantCulture) + "h");
 			return string.Join("+", list.ToArray());
 		}
 
@@ -744,9 +746,9 @@ namespace Cryville.Crtr {
 
 		public override string ToString() {
 			return string.Format("{0},{1},{2}",
-				x != null ? x.ToString() : "",
-				y != null ? y.ToString() : "",
-				z != null ? z.ToString() : ""
+				x != null ? x.Value.ToString(CultureInfo.InvariantCulture) : "",
+				y != null ? y.Value.ToString(CultureInfo.InvariantCulture) : "",
+				z != null ? z.Value.ToString(CultureInfo.InvariantCulture) : ""
 			);
 		}
 
@@ -915,7 +917,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return VecPtComp.ToString(xw, xh) + "," + VecPtComp.ToString(yw, yh) + "," + (z != null ? z.ToString() : "");
+			return VecPtComp.ToString(xw, xh) + "," + VecPtComp.ToString(yw, yh) + "," + (z != null ? z.Value.ToString(CultureInfo.InvariantCulture) : "");
 		}
 
 		public override float[] ToArray() {

Assets/Cryville/Crtr/NoteHandler.cs

@@ -11,11 +11,10 @@ namespace Cryville.Crtr {
 		readonly GroupHandler gh;
 		public readonly Chart.Note Event;
 		readonly PdtRuleset ruleset;
-		public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs, Judge j) : base() {
+		public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs) : base() {
 			this.gh = gh;
 			Event = ev;
 			ruleset = rs;
-			judge = j;
 		}
 		
 		public override string TypeName {
@@ -43,8 +42,7 @@ namespace Cryville.Crtr {
 			base.Awake(s);
 			if (s.CloneType == 2) {
 				if (!gogroup) return;
-				Chart.Note tev = Event;
-				if (tev.IsLong) {
+				if (Event.IsLong) {
 					foreach (var i in sgos) {
 						i.Reset();
 						i.AppendPoint(Position, Rotation);
@@ -63,13 +61,19 @@ namespace Cryville.Crtr {
 
 		public override void Update(ContainerState s, StampedEvent ev) {
 			base.Update(s, ev);
-			if (s.CloneType == 1) {
-				Position = GetFramePoint(bs.Parent, bs.Track);
-				Rotation = GetFrameRotation(bs.Parent, bs.Track);
+			if (s.CloneType <= 2) {
+				Position = GetFramePoint(s.Parent, s.Track);
+				Rotation = GetFrameRotation(s.Parent, s.Track);
+			}
+			if (s.CloneType == 0) {
+#if UNITY_5_6_OR_NEWER
+				a_cur.SetPositionAndRotation(Position, Rotation);
+#else
+				a_cur.position = Position;
+				a_cur.rotation = Rotation;
+#endif
 			}
 			else if (s.CloneType == 2) {
-				Position = GetFramePoint(ts.Parent, ts.Track);
-				Rotation = GetFrameRotation(ts.Parent, ts.Track);
 				if (!gogroup) return;
 				Chart.Note tev = Event;
 				if (tev.IsLong) {
@@ -103,9 +107,9 @@ namespace Cryville.Crtr {
 				a_tail.rotation = Quaternion.Euler(ts.Direction);
 #endif
 			}
-			OpenAnchor("tail");
+			OpenAnchor(_a_tail);
 			base.EndUpdate(s);
-			CloseAnchor("tail");
+			CloseAnchor(_a_tail);
 		}
 		
 		Vector3 GetFramePoint(ContainerState state, float track) {
@@ -117,6 +121,7 @@ namespace Cryville.Crtr {
 			return Quaternion.LookRotation(r, state.Normal);
 		}
 
+		readonly List<Vector3> ctrl = new List<Vector3>(2);
 		Vector3 GetFrame(ContainerState state, float track, Func<ContainerState, Vector3> func) {
 			// TODO
 			int id = Mathf.FloorToInt(track);
@@ -134,7 +139,7 @@ namespace Cryville.Crtr {
 			if (c0 && c1)
 				return (1 - t) * p1 + t * p2;
 			else {
-				var ctrl = new List<Vector3>(2);
+				ctrl.Clear();
 				if (!c0) {
 					var tp = ts0.GetControlPoint(true, deltaz);
 					if (tp != Vector3.zero) ctrl.Add(tp);
@@ -149,7 +154,7 @@ namespace Cryville.Crtr {
 						ColumnVector<float>.WithPolynomialCoefficients(
 							frame.Size, track
 						),
-						new Vector3Operator()
+						Vector3Operator.Instance
 					);
 				}
 				else if (ctrl.Count == 1) {

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -3,6 +3,7 @@ using Cryville.Common.Pdt;
 using Cryville.Crtr.Event;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine;
 
 namespace Cryville.Crtr {
@@ -45,29 +46,18 @@ namespace Cryville.Crtr {
 					}
 					else {
 						type = PdtInternalType.Undefined;
-						LoadNum(name);
+						LoadIdent(name);
 						value = _numbuf;
 					}
 				}
 			}
 		}
-		unsafe void LoadNum(int value) {
+		unsafe void LoadIdent(int value) {
 			fixed (byte* ptr = _numbuf) *(int*)ptr = value;
 		}
 		unsafe void LoadNum(float value) {
 			fixed (byte* ptr = _numbuf) *(float*)ptr = value;
 		}
-		unsafe byte[] GetBytes(string value) {
-			int strlen = value.Length;
-			byte[] result = new byte[strlen * sizeof(char) + sizeof(int)];
-			fixed (byte* _ptr = result) {
-				char* ptr = (char*)(_ptr + sizeof(int));
-				*(int*)_ptr = strlen;
-				int i = 0;
-				foreach (var c in value) ptr[i++] = c;
-			}
-			return result;
-		}
 		static readonly int _op_sep = IdentifierManager.SharedInstance.Request(",");
 		static readonly int _func_int_map = IdentifierManager.SharedInstance.Request("int_map");
 		protected override PdtOperator GetOperator(PdtOperatorSignature sig) {
@@ -261,7 +251,7 @@ namespace Cryville.Crtr {
 				if (blit) GetReturnFrame(PdtInternalType.Array, len + 2 * sizeof(int)).SetArraySuffix(type, LoadedOperandCount);
 				else GetReturnFrame(PdtInternalType.Vector, len + sizeof(int)).SetArraySuffix(type);
 			}
-			bool IsBlittable(int type) {
+			static bool IsBlittable(int type) {
 				return type == PdtInternalType.Number;
 			}
 		}
@@ -309,7 +299,7 @@ namespace Cryville.Crtr {
 				ret.SetArraySuffix(PdtInternalType.String, fc);
 				int o = 0;
 				for (int i = f; i <= t; i++) {
-					var s = pf + i.ToString();
+					var s = pf + i.ToString(CultureInfo.InvariantCulture);
 					ret.SetString(s, o);
 					o += sizeof(int) + s.Length * sizeof(char);
 				}

Assets/Cryville/Crtr/PropOp.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using RBeatTime = Cryville.Crtr.BeatTime;
+using RTargetString = Cryville.Common.Buffers.TargetString;
 
 namespace Cryville.Crtr {
 	public abstract class PropOp : PdtOperator {
@@ -45,6 +46,22 @@ namespace Cryville.Crtr {
 				_cb(GetOperand(0).AsString());
 			}
 		}
+		public class TargetString : PropOp {
+			readonly Func<RTargetString> _cb;
+			public TargetString(Func<RTargetString> cb) { _cb = cb; }
+			protected override unsafe void Execute() {
+				var target = _cb();
+				var op = GetOperand(0);
+				if (op.Type != PdtInternalType.String) throw new ArgumentException("Not a string");
+				var ptr = (byte*)op.TrustedAsOfLength(op.Length);
+				var len = *(int*)ptr;
+				target.Length = len;
+				var cptr = (char*)(ptr + sizeof(int));
+				for (int i = 0; i < len; i++)
+					target[i] = cptr[i];
+				target.Validate();
+			}
+		}
 		public class Identifier : PropOp {
 			readonly Action<int> _cb;
 			public Identifier(Action<int> cb) { _cb = cb; }

Assets/Cryville/Crtr/Settings.cs

@@ -175,6 +175,26 @@ namespace Cryville.Crtr {
 			}
 		}
 
+		[Category("debug")]
+		public bool ClearLogOnPlay {
+			get {
+				return PlayerPrefs.GetInt("ClearLogOnPlay", 1) == 1;
+			}
+			set {
+				PlayerPrefs.SetInt("ClearLogOnPlay", value ? 1 : 0);
+			}
+		}
+
+		[Category("debug")]
+		public bool HideLogOnPlay {
+			get {
+				return PlayerPrefs.GetInt("HideLogOnPlay", 1) == 1;
+			}
+			set {
+				PlayerPrefs.SetInt("HideLogOnPlay", value ? 1 : 0);
+			}
+		}
+
 		public void Save() { PlayerPrefs.Save(); }
 		public void Reset() { PlayerPrefs.DeleteAll(); }
 	}

Assets/Cryville/Crtr/SettingsPanel.cs

@@ -36,7 +36,7 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		Dictionary<string, List<PropertyInfo>> _categories = new Dictionary<string, List<PropertyInfo>>();
+		readonly Dictionary<string, List<PropertyInfo>> _categories = new Dictionary<string, List<PropertyInfo>>();
 		public void LoadProperties() {
 			_categories.Clear();
 			_invalidated = false;

Assets/Cryville/Crtr/Skin.cs

@@ -69,7 +69,7 @@ namespace Cryville.Crtr {
 	}
 	public struct SkinPropertyKey {
 		public Type Component;
-		public string Name;
+		public int Name;
 	}
 	public class SkinElementBinder : EmptyBinder {
 		public override object ChangeType(object value, Type type, CultureInfo culture) {
@@ -81,9 +81,9 @@ namespace Cryville.Crtr {
 						if (key[0] == '*')
 							return new SkinPropertyKey { Component = GetComponentByName(key.Substring(1)) };
 						else
-							return new SkinPropertyKey { Component = typeof(TransformInterface), Name = key };
+							return new SkinPropertyKey { Component = typeof(TransformInterface), Name = IdentifierManager.SharedInstance.Request(key) };
 					case 2:
-						return new SkinPropertyKey { Component = GetComponentByName(cp[0]), Name = cp[1] };
+						return new SkinPropertyKey { Component = GetComponentByName(cp[0]), Name = IdentifierManager.SharedInstance.Request(cp[1]) };
 				}
 			}
 			return base.ChangeType(value, type, culture);

Assets/Cryville/Crtr/SkinContainer.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.Pdt;
+using Cryville.Common.Pdt;
 using Cryville.Crtr.Components;
 using Cryville.Crtr.Event;
 using System;
@@ -9,86 +9,100 @@ using UnityEngine.Profiling;
 namespace Cryville.Crtr {
 	public class SkinContainer {
 		readonly PdtSkin skin;
-		readonly Dictionary<SkinElement, Transform> matchedStatic
-			= new Dictionary<SkinElement, Transform>();
-		readonly Dictionary<SkinElement, Transform> matchedDynamic
-			= new Dictionary<SkinElement, Transform>();
+		readonly List<DynamicProperty> dynprops = new List<DynamicProperty>();
+		struct DynamicProperty {
+			public Transform Anchor { 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 SkinSelectors Selectors { get; set; }
+			public SkinElement Element { get; set; }
+		}
 		public SkinContainer(PdtSkin _skin) {
 			skin = _skin;
 		}
 		public void MatchStatic(ContainerState context) {
+			dynprops.Clear(); dynelems.Clear();
 			ChartPlayer.etor.ContextState = context;
 			ChartPlayer.etor.ContextEvent = context.Container;
-			matchedStatic.Clear();
 			MatchStatic(skin, context, context.Handler.gogroup);
-
-			foreach (var m in matchedStatic) {
-				var el = m.Key;
-				var obj = m.Value;
-				ChartPlayer.etor.ContextTransform = obj;
-				foreach (var p in el.properties) {
-					if (p.Key.Name == null)
-						obj.gameObject.AddComponent(p.Key.Component);
-					else {
-						ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
-					}
-				}
-				ChartPlayer.etor.ContextTransform = null;
-			}
 			ChartPlayer.etor.ContextEvent = null;
 			ChartPlayer.etor.ContextState = null;
 		}
 		void MatchStatic(SkinElement rel, ContainerState context, Transform anchor = null) {
-			matchedStatic.Add(rel, anchor);
+			ChartPlayer.etor.ContextTransform = anchor;
+			foreach (var p in rel.properties) {
+				if (p.Key.Name == 0)
+					anchor.gameObject.AddComponent(p.Key.Component);
+				else {
+					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) {
+				try {
 					var new_anchor = r.Key.MatchStatic(context, anchor);
 					if (new_anchor != null) {
 						MatchStatic(r.Value, context, new_anchor);
 					}
 				}
+				catch (SelectorNotStaticException) {
+					dynelems.Add(
+						new DynamicElement { Anchor = anchor, Selectors = r.Key, Element = r.Value }
+					);
+				}
+			}
 		}
 		public void MatchDynamic(ContainerState context) {
+			if (dynprops.Count == 0 && dynelems.Count == 0) return;
 			Profiler.BeginSample("SkinContainer.MatchDynamic");
 			ChartPlayer.etor.ContextState = context;
 			ChartPlayer.etor.ContextEvent = context.Container;
-			matchedDynamic.Clear();
-			MatchDynamic(skin, context, context.Handler.gogroup);
-
-			foreach (var m in matchedDynamic) {
-				var el = m.Key;
-				var obj = m.Value;
-				ChartPlayer.etor.ContextTransform = obj;
-				foreach (var p in el.properties) {
-					if (p.Key.Name == null) continue;
-					if (p.Value.IsConstant) continue;
-					ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
+			for (int i = 0; i < dynprops.Count; i++) {
+				DynamicProperty p = dynprops[i];
+				var prop = GetPropOp(p.Anchor, p.Key);
+				if (context.CloneType > prop.UpdateCloneType) continue;
+				ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
 			}
-				ChartPlayer.etor.ContextTransform = null;
+			for (int i = 0; i < dynelems.Count; i++) {
+				DynamicElement e = dynelems[i];
+				var anchor = e.Selectors.MatchDynamic(context, e.Anchor);
+				if (anchor != null) MatchDynamic(e.Element, context, anchor);
 			}
 			ChartPlayer.etor.ContextEvent = null;
 			ChartPlayer.etor.ContextState = null;
 			Profiler.EndSample();
 		}
 		void MatchDynamic(SkinElement rel, ContainerState context, Transform anchor = null) {
-			matchedDynamic.Add(rel, anchor);
+			ChartPlayer.etor.ContextTransform = anchor;
+			foreach (var p in rel.properties) {
+				if (p.Key.Name == 0)
+					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) {
-				Transform new_anchor;
-				if (!matchedStatic.ContainsKey(r.Value)) continue;
 				if (!r.Key.IsUpdatable(context)) continue;
-				new_anchor = r.Key.MatchDynamic(
-					context, r.Value, matchedStatic[r.Value], anchor
-				);
+				var new_anchor = r.Key.MatchDynamic(context, anchor);
 				if (new_anchor != null) {
 					MatchDynamic(r.Value, context, new_anchor);
 				}
 			}
 		}
-		PdtOperator GetPropOp(Transform obj, SkinPropertyKey key) {
+		SkinProperty GetPropOp(Transform obj, SkinPropertyKey key) {
 			var ctype = key.Component;
 			var comp = (SkinComponent)obj.GetComponent(ctype);
 			if (comp == null) throw new InvalidOperationException("Component instance not found");
-			PdtOperator result;
-			if (!comp.PropOps.TryGetValue(key.Name, out result))
+			SkinProperty result;
+			if (!comp.Properties.TryGetValue(key.Name, out result))
 				throw new ArgumentException(string.Format("Property {0} not found on component", key.Name));
 			return result;
 		}

Assets/Cryville/Crtr/SkinInterpreter.cs

@@ -28,7 +28,7 @@ namespace Cryville.Crtr {
 						GetChar();
 						if (cc == '.') {
 							GetChar();
-							s.Add(new SkinSelector.State(GetIdentifier()));
+							s.Add(new SkinSelector.AtAnchor(GetIdentifier()));
 							key = null;
 						}
 						else {

Assets/Cryville/Crtr/SkinSelectors.cs

@@ -1,9 +1,11 @@
+using Cryville.Common;
 using Cryville.Common.Pdt;
 using Cryville.Crtr.Components;
 using Cryville.Crtr.Event;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using UnityEngine;
 
 namespace Cryville.Crtr {
@@ -34,7 +36,15 @@ namespace Cryville.Crtr {
 				selectors[i].Optimize(etor);
 			}
 		}
-		public Transform MatchStatic(ContainerState h, Transform anchor = null) {
+		public bool IsStatic {
+			get {
+				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);
 				if (anchor == null) return null;
@@ -46,10 +56,9 @@ namespace Cryville.Crtr {
 				if (!s.IsUpdatable(h)) return false;
 			return true;
 		}
-		public Transform MatchDynamic(ContainerState h, SkinElement e, Transform old_target, Transform anchor = null) {
-			if (!e.IsDynamic) return null;
+		public Transform MatchDynamic(ContainerState h, Transform anchor) {
 			foreach (var s in selectors) {
-				anchor = s.Match(h, anchor, old_target);
+				anchor = s.Match(h, anchor, true);
 				if (anchor == null) return null;
 			}
 			return anchor;
@@ -62,7 +71,7 @@ namespace Cryville.Crtr {
 			get;
 		}
 		public virtual void Optimize(PdtEvaluatorBase etor) { }
-		public abstract Transform Match(ContainerState h, Transform a, Transform ot = null);
+		public abstract Transform Match(ContainerState h, Transform a, bool dyn = false);
 		public virtual bool IsUpdatable(ContainerState h) {
 			return true;
 		}
@@ -71,33 +80,47 @@ namespace Cryville.Crtr {
 			public override bool IsStatic {
 				get { return true; }
 			}
-			public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
-				if (ot != null)
-					return ot;
-				var obj = new GameObject {
-					name = "__obj__"
-				};
+			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.AddComponent<TransformInterface>();
 				return obj.transform;
 			}
 		}
 		public class Anchor : SkinSelector {
-			public string Name { get; private set; }
+			public int Name { get; private set; }
 			public Anchor(string name) {
-				Name = name;
+				Name = IdentifierManager.SharedInstance.Request(name);
 			}
 			public override bool IsStatic {
 				get { return true; }
 			}
 
-			public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
+			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
 				return h.Handler.Anchors[Name].Transform;
 			}
 			public override bool IsUpdatable(ContainerState h) {
 				return h.Handler.Anchors[Name].Opened;
 			}
 		}
+		public class AtAnchor : SkinSelector {
+			public int Name { get; private set; }
+			public AtAnchor(string name) {
+				Name = IdentifierManager.SharedInstance.Request(name);
+			}
+			public override bool IsStatic {
+				get { return false; }
+			}
+
+			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
+				if (!dyn) throw new SelectorNotStaticException();
+				return IsUpdatable(h) ? a : null;
+			}
+			public override bool IsUpdatable(ContainerState h) {
+				return h.Handler.Anchors[Name].Opened;
+			}
+		}
 		public class Property : SkinSelector {
 			readonly PdtExpression _exp;
 			readonly PdtOperator _op;
@@ -110,22 +133,30 @@ namespace Cryville.Crtr {
 				etor.Optimize(_exp);
 			}
 			public override bool IsStatic {
-				get { throw new NotImplementedException(); }
+				get { return _exp.IsConstant; }
 			}
-			public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
+			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
 				ChartPlayer.etor.ContextTransform = a;
+				try {
 					ChartPlayer.etor.Evaluate(_op, _exp);
-				ChartPlayer.etor.ContextTransform = null;
 					return _flag ? a : null;
 				}
+				catch (Exception) {
+					throw new SelectorNotStaticException();
+				}
+				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, Transform ot = null) {
-				return null; // TODO
+			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
+				if (!dyn) throw new SelectorNotStaticException();
+				return null;
 			}
 		}
 		public class ElementType : SkinSelector {
@@ -134,9 +165,15 @@ namespace Cryville.Crtr {
 			public override bool IsStatic {
 				get { return true; }
 			}
-			public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
+			public override Transform Match(ContainerState h, Transform a, bool dyn = false) {
 				return h.Handler.TypeName == _type ? a : null;
 			}
 		}
 	}
+	public class SelectorNotStaticException : Exception {
+		public SelectorNotStaticException() : base("The selector is not static") { }
+		public SelectorNotStaticException(string message) : base(message) { }
+		public SelectorNotStaticException(string message, Exception innerException) : base(message, innerException) { }
+		protected SelectorNotStaticException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+	}
 }

Assets/Cryville/Crtr/SpriteFrame.cs

@@ -78,7 +78,7 @@ namespace Cryville.Crtr {
 
 		public void Init() {
 			if (Texture == null)
-				throw new InvalidOperationException(); // TODO
+				throw new InvalidOperationException("Missing texture");
 			_frame = new Rect(Vector2.zero, Size);
 			var w = _frame.width;
 			var h = _frame.height;
@@ -92,7 +92,7 @@ namespace Cryville.Crtr {
 
 		public void Init(int w, int h, Texture2D _base) {
 			if (Texture != null)
-				throw new InvalidOperationException(); // TODO
+				throw new InvalidOperationException("Missing texture");
 			Texture = _base;
 			float x = _frame.x / w;
 			float y = 1 - _frame.y / h;

Assets/Cryville/Crtr/StampedEvent.cs

@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace Cryville.Crtr {
 	public class StampedEvent : IComparable<StampedEvent> {
-		public float Time;
+		public double Time;
 		public ChartEvent Unstamped;
 		public EventContainer Container;
 		public StampedEvent Origin;
@@ -12,7 +12,7 @@ namespace Cryville.Crtr {
 		private StampedEvent attev = null;
 		private StampedEvent relev = null;
 
-		public float Duration {
+		public double Duration {
 			get {
 				if (Unstamped == null) return 0;
 				if (Unstamped.IsLong)
@@ -43,7 +43,7 @@ namespace Cryville.Crtr {
 			public override int Priority {
 				get { return StartEvent == null ? 4 : 6; }
 			}
-			protected override int cmpExtra(StampedEvent other) {
+			protected override int CompareExtra(StampedEvent other) {
 				return Equals(StartEvent, other) ? 1 : 0;
 			}
 		}
@@ -75,12 +75,12 @@ namespace Cryville.Crtr {
 			if (u != 0) return u;
 			u = this.Duration.CompareTo(other.Duration);
 			if (u != 0) return u;
-			u = cmpExtra(other);
+			u = CompareExtra(other);
 			if (u != 0) return u;
 			return GetHashCode().CompareTo(other.GetHashCode());
 		}
 
-		protected virtual int cmpExtra(StampedEvent other) {
+		protected virtual int CompareExtra(StampedEvent other) {
 			return 0;
 		}
 	}

Assets/Cryville/Crtr/StateBase.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace Cryville.Crtr {
 	public abstract class StateBase<T> {
 		public int EventId;
-		public float Time;
+		public double Time;
 		public Chart chart;
 		public List<T> events;
 
@@ -18,7 +18,7 @@ namespace Cryville.Crtr {
 		}
 
 		public virtual StateBase<T> Clone() {
-			return (StateBase<T>)base.MemberwiseClone();
+			return (StateBase<T>)MemberwiseClone();
 		}
 
 		public virtual void CopyTo(StateBase<T> dest) {
@@ -32,18 +32,18 @@ namespace Cryville.Crtr {
 		}
 
 		public void Forward(Action<T> callback = null) {
-			ForwardToTime(float.PositiveInfinity, callback);
+			ForwardToTime(double.PositiveInfinity, callback);
 		}
 
-		public void ForwardByTime(float time, Action<T> callback = null) {
+		public void ForwardByTime(double time, Action<T> callback = null) {
 			ForwardToTime(Time + time, callback);
 		}
 
-		public void ForwardOnceByTime(float time, Action<T> callback = null) {
+		public void ForwardOnceByTime(double time, Action<T> callback = null) {
 			ForwardOnceToTime(Time + time, callback);
 		}
 
-		public void ForwardToTime(float toTime, Action<T> callback = null) {
+		public void ForwardToTime(double toTime, Action<T> callback = null) {
 			breakflag = false;
 			ForwardOnceToTime(Time, callback);
 			while (Time < toTime) {
@@ -52,20 +52,20 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		public void ForwardStepByTime(float time, float step, Action<T> callback = null) {
+		public void ForwardStepByTime(double time, double step, Action<T> callback = null) {
 			ForwardStepToTime(Time + time, step, callback);
 		}
 
-		public void ForwardStepToTime(float toTime, float step, Action<T> callback = null) {
+		public void ForwardStepToTime(double toTime, double step, Action<T> callback = null) {
 			breakflag = false;
 			ForwardOnceToTime(Time, callback);
 			while (Time < toTime) {
-				float next = Time + step;
+				double next = Time + step;
 				ForwardOnceToTime(next < toTime ? next : toTime, callback);
 				if (breakflag) break;
 			}
 		}
 		
-		public abstract void ForwardOnceToTime(float toTime, Action<T> callback = null);
+		public abstract void ForwardOnceToTime(double toTime, Action<T> callback = null);
 	}
 }

Assets/Cryville/Crtr/TrackHandler.cs

@@ -39,7 +39,6 @@ namespace Cryville.Crtr {
 #endif
 			}
 			else if (s.CloneType == 3) {
-				spos = Vector3.zero;
 				bpos = cpt;
 				brot = Quaternion.Euler(s.Direction);
 			}
@@ -57,17 +56,28 @@ namespace Cryville.Crtr {
 		Vector3 cpt; // Current point
 		Vector3 ppt = Vector3.zero; // Previous point
 		Vector3 pwp = Vector3.zero; // Previous world point
-		float ptime; // Previous time
+		double ptime; // Previous time
 		float length;
 
 		public override void Update(ContainerState s, StampedEvent ev) {
 			base.Update(s, ev);
-			if (s.CloneType == 2 || s.CloneType == 3) {
+			if (s.CloneType == 0) {
+				pwp = Vector3.zero;
+				cpt = s.ScreenPoint;
+				spos = Vector3.zero;
+#if UNITY_5_6_OR_NEWER
+				a_cur.SetPositionAndRotation(s.ScreenPoint, Quaternion.Euler(s.Direction));
+#else
+				a_cur.position = s.ScreenPoint;
+				a_cur.rotation = Quaternion.Euler(s.Direction);
+#endif
+			}
+			else if (s.CloneType == 2 || s.CloneType == 3) {
 				var tpt = s.ScreenPoint;
 				var tsv = s.ScrollVelocity;
 
 				Vector3 dpt = (Vector3)tpt - ppt; // Delta 2D point
-				dpt.z = (s.Time - ptime) * ChartPlayer.sv * tsv; // Delta Z
+				dpt.z = (float)((s.Time - ptime) * ChartPlayer.sv * tsv); // Delta Z
 				Quaternion rotq = Quaternion.Euler(s.Direction); // Rotation
 				var dwp = rotq * dpt; // Delta world point
 				var nl = length + dwp.magnitude; // New length
@@ -107,9 +117,9 @@ namespace Cryville.Crtr {
 		}
 
 		public override void EndUpdate(ContainerState s) {
-			OpenAnchor("tail");
+			OpenAnchor(_a_tail);
 			base.EndUpdate(s);
-			CloseAnchor("tail");
+			CloseAnchor(_a_tail);
 			if (s.CloneType == 0 || s.CloneType == 2) {
 				EndUpdatePosition(ts);
 				var p = GetCurrentWorldPoint();
@@ -133,7 +143,7 @@ namespace Cryville.Crtr {
 			var tsv = s.ScrollVelocity;
 			
 			Vector3 dpt = (Vector3)tpt - ppt;
-			dpt.z = (s.Time - ptime) * ChartPlayer.sv * tsv;
+			dpt.z = (float)((s.Time - ptime) * ChartPlayer.sv * tsv);
 			Quaternion rotq = Quaternion.Euler(s.Direction);
 			var dwp = rotq * dpt; // Delta world point
 			var nl = length + dwp.magnitude; // New length

Assets/Cryville/Cryville.Crtr.asmdef

@@ -0,0 +1,16 @@
+{
+    "name": "Cryville.Crtr",
+    "rootNamespace": "",
+    "references": [
+        "GUID:d8ea0e0da3ad53a45b65c912ffcacab0"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/Cryville/Cryville.Crtr.asmdef.meta

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

Assets/Cryville/GlobalSuppressions.cs

@@ -9,6 +9,7 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Style", "IDE0020")]
 [assembly: SuppressMessage("Style", "IDE0038")]
 [assembly: SuppressMessage("Style", "IDE0018")]
+[assembly: SuppressMessage("Style", "IDE0019")]
 
 // Null operators not supported
 [assembly: SuppressMessage("Style", "IDE0016")]
@@ -40,3 +41,6 @@ using System.Diagnostics.CodeAnalysis;
 
 // Local function not supported
 [assembly: SuppressMessage("Style", "IDE0039")]
+
+// Readonly struct not supported
+[assembly: SuppressMessage("Style", "IDE0250")]

Assets/Cryville/GlobalSuppressions.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 50c5924700029154f807fa804934cd76
+guid: c800326c576090042bed36b262ea3514
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Editor/FixProjectVersion.cs

@@ -1,15 +0,0 @@
-#if UNITY_5
-using System.Text.RegularExpressions;
-using SyntaxTree.VisualStudio.Unity.Bridge;
-using UnityEditor;
-
-[InitializeOnLoad]
-public class ProjectFilesGeneration {
-	static ProjectFilesGeneration() {
-		ProjectFilesGenerator.ProjectFileGeneration += ReplaceContent;
-	}
-	static string ReplaceContent(string n, string c) {
-		return Regex.Replace(c, @"<LangVersion(.*?)>.*?</LangVersion>", @"<LangVersion$1>3</LangVersion>");
-	}
-}
-#endif

Assets/EricHaines/TextureScale.cs

@@ -1,144 +0,0 @@
-namespace EricHaines {
-	// Only works on ARGB32, RGB24 and Alpha8 textures that are marked readable
-
-	using System.Threading;
-	using UnityEngine;
-
-	public class TextureScale {
-		public class ThreadData {
-			public int start;
-			public int end;
-			public ThreadData(int s, int e) {
-				start = s;
-				end = e;
-			}
-		}
-
-		private static Color[] texColors;
-		private static Color[] newColors;
-		private static int w;
-		private static float ratioX;
-		private static float ratioY;
-		private static int w2;
-		private static int finishCount;
-		private static Mutex mutex;
-
-		public static void Point(Texture2D tex, int newWidth, int newHeight) {
-			ThreadedScale(tex, newWidth, newHeight, false);
-		}
-
-		public static void Bilinear(Texture2D tex, int newWidth, int newHeight) {
-			ThreadedScale(tex, newWidth, newHeight, true);
-		}
-
-		private static void ThreadedScale(Texture2D tex, int newWidth, int newHeight, bool useBilinear) {
-			texColors = tex.GetPixels();
-			newColors = new Color[newWidth * newHeight];
-			if (useBilinear) {
-				ratioX = 1.0f / ((float)newWidth / (tex.width - 1));
-				ratioY = 1.0f / ((float)newHeight / (tex.height - 1));
-			}
-			else {
-				ratioX = (float)tex.width / newWidth;
-				ratioY = (float)tex.height / newHeight;
-			}
-			w = tex.width;
-			w2 = newWidth;
-			var cores = Mathf.Min(SystemInfo.processorCount, newHeight);
-			var slice = newHeight/cores;
-
-			finishCount = 0;
-			if (mutex == null) {
-				mutex = new Mutex(false);
-			}
-			if (cores > 1) {
-				int i = 0;
-				ThreadData threadData;
-				for (i = 0; i < cores - 1; i++) {
-					threadData = new ThreadData(slice * i, slice * (i + 1));
-					ParameterizedThreadStart ts = useBilinear ? new ParameterizedThreadStart(BilinearScale) : new ParameterizedThreadStart(PointScale);
-					Thread thread = new Thread(ts);
-					thread.Start(threadData);
-				}
-				threadData = new ThreadData(slice * i, newHeight);
-				if (useBilinear) {
-					BilinearScale(threadData);
-				}
-				else {
-					PointScale(threadData);
-				}
-				while (finishCount < cores) {
-					Thread.Sleep(1);
-				}
-			}
-			else {
-				ThreadData threadData = new ThreadData(0, newHeight);
-				if (useBilinear) {
-					BilinearScale(threadData);
-				}
-				else {
-					PointScale(threadData);
-				}
-			}
-
-#if UNITY_2021_2_OR_NEWER
-			tex.Reinitialize(newWidth, newHeight);
-#else
-			tex.Resize(newWidth, newHeight);
-#endif
-			tex.SetPixels(newColors);
-			tex.Apply();
-
-			texColors = null;
-			newColors = null;
-		}
-
-		public static void BilinearScale(object obj) {
-			ThreadData threadData = (ThreadData) obj;
-			for (var y = threadData.start; y < threadData.end; y++) {
-				int yFloor = (int)Mathf.Floor(y * ratioY);
-				var y1 = yFloor * w;
-				var y2 = (yFloor+1) * w;
-				var yw = y * w2;
-
-				for (var x = 0; x < w2; x++) {
-					int xFloor = (int)Mathf.Floor(x * ratioX);
-					var xLerp = x * ratioX-xFloor;
-					newColors[yw + x] = ColorLerpUnclamped(
-						ColorLerpUnclamped(texColors[y1 + xFloor], texColors[y1 + xFloor + 1], xLerp),
-						ColorLerpUnclamped(texColors[y2 + xFloor], texColors[y2 + xFloor + 1], xLerp),
-						y * ratioY - yFloor
-					);
-				}
-			}
-
-			mutex.WaitOne();
-			finishCount++;
-			mutex.ReleaseMutex();
-		}
-
-		public static void PointScale(object obj) {
-			ThreadData threadData = (ThreadData) obj;
-			for (var y = threadData.start; y < threadData.end; y++) {
-				var thisY = (int)(ratioY * y) * w;
-				var yw = y * w2;
-				for (var x = 0; x < w2; x++) {
-					newColors[yw + x] = texColors[(int)(thisY + ratioX * x)];
-				}
-			}
-
-			mutex.WaitOne();
-			finishCount++;
-			mutex.ReleaseMutex();
-		}
-
-		private static Color ColorLerpUnclamped(Color c1, Color c2, float value) {
-			return new Color(
-				c1.r + (c2.r - c1.r) * value,
-				c1.g + (c2.g - c1.g) * value,
-				c1.b + (c2.b - c1.b) * value,
-				c1.a + (c2.a - c1.a) * value
-			);
-		}
-	}
-}

Assets/Extensions.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: abad95983f1ca394a92bb061b76ebb2f
+guid: 5335612e48e4c3947808c99fb99411d5
 folderAsset: yes
-timeCreated: 1638411493
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Extensions/Quaver.API.meta

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

Assets/Extensions/Quaver.API/Enums.meta

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

Assets/Extensions/Quaver.API/Enums/GameMode.cs

@@ -0,0 +1,21 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * Copyright (c) 2017-2018 Swan & The Quaver Team <support@quavergame.com>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Quaver.API.Enums
+{
+    public enum GameMode
+    {
+        Keys4 = 1,
+        Keys7 = 2
+    }
+}

Assets/Extensions/Quaver.API/Enums/GameMode.cs.meta

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

Assets/Extensions/Quaver.API/Enums/Hitsounds.cs

@@ -0,0 +1,24 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * Copyright (c) 2017-2018 Swan & The Quaver Team <support@quavergame.com>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Quaver.API.Enums
+{
+    [Flags]
+    public enum HitSounds
+    {
+        Normal = 1 << 0, // This is 1, but Normal should be played regardless if it's 0 or 1.
+        Whistle = 1 << 1, // 2
+        Finish = 1 << 2, // 4
+        Clap = 1 << 3 // 8
+    }
+}

Assets/Extensions/Quaver.API/Enums/Hitsounds.cs.meta

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

Assets/Extensions/Quaver.API/Enums/TimeSignature.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Quaver.API.Enums
+{
+    /// <summary>
+    ///     Signature of a timing point
+    /// </summary>
+    [Serializable]
+    public enum TimeSignature
+    {
+        Quadruple = 4,
+        Triple = 3,
+    }
+}

Assets/Extensions/Quaver.API/Enums/TimeSignature.cs.meta

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

Assets/Extensions/Quaver.API/Maps.meta

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

Assets/Extensions/Quaver.API/Maps/Qua.cs.meta

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

Assets/Extensions/Quaver.API/Maps/Structures.meta

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

Assets/Extensions/Quaver.API/Maps/Structures/CustomAudioSampleInfo.cs

@@ -0,0 +1,54 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Copyright (c) 2017-2019 Swan & The Quaver Team <support@quavergame.com>.
+*/
+
+using System;
+using System.Collections.Generic;
+
+namespace Quaver.API.Maps.Structures
+{
+    /// <summary>
+    ///     CustomAudioSamples section of the .qua
+    /// </summary>
+    [Serializable]
+    public class CustomAudioSampleInfo
+    {
+        /// <summary>
+        ///     The path to the audio sample.
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        ///     If true, the audio sample is always played back at 1.0x speed, regardless of the rate.
+        /// </summary>
+        public bool UnaffectedByRate { get; set; }
+
+        /// <summary>
+        ///     By-value comparer, auto-generated by Rider.
+        /// </summary>
+        private sealed class ByValueEqualityComparer : IEqualityComparer<CustomAudioSampleInfo>
+        {
+            public bool Equals(CustomAudioSampleInfo x, CustomAudioSampleInfo y)
+            {
+                if (ReferenceEquals(x, y)) return true;
+                if (ReferenceEquals(x, null)) return false;
+                if (ReferenceEquals(y, null)) return false;
+                if (x.GetType() != y.GetType()) return false;
+                return string.Equals(x.Path, y.Path) && x.UnaffectedByRate == y.UnaffectedByRate;
+            }
+
+            public int GetHashCode(CustomAudioSampleInfo obj)
+            {
+                unchecked
+                {
+                    return ((obj.Path != null ? obj.Path.GetHashCode() : 0) * 397) ^ obj.UnaffectedByRate.GetHashCode();
+                }
+            }
+        }
+
+        public static IEqualityComparer<CustomAudioSampleInfo> ByValueComparer { get; } = new ByValueEqualityComparer();
+    }
+}

Assets/Extensions/Quaver.API/Maps/Structures/CustomAudioSampleInfo.cs.meta

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

Assets/Extensions/Quaver.API/Maps/Structures/EditorLayerInfo.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+//using MoonSharp.Interpreter;
+//using MoonSharp.Interpreter.Interop;
+using YamlDotNet.Serialization;
+
+namespace Quaver.API.Maps.Structures
+{
+    [Serializable]
+    /*[MoonSharpUserData]*/
+    public class EditorLayerInfo
+    {
+        /// <summary>
+        ///     The name of the layer
+        /// </summary>
+        public string Name { get; /*[MoonSharpVisible(false)]*/ set; }
+
+        /// <summary>
+        ///     Is the layer hidden in the editor?
+        /// </summary>
+        public bool Hidden { get; /*[MoonSharpVisible(false)]*/ set; }
+
+        /// <summary>
+        ///     The color of the layer (default is white)
+        /// </summary>
+        public string ColorRgb { get; /*[MoonSharpVisible(false)]*/ set; }
+
+        /// <summary>
+        ///     Converts the stringified color to a System.Drawing color
+        /// </summary>
+        /// <returns></returns>
+        /*[MoonSharpVisible(false)]*/
+        public Color GetColor()
+        {
+            if (ColorRgb == null)
+                return Color.White;
+
+            var split = ColorRgb.Split(',');
+
+            try
+            {
+                return Color.FromArgb(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]));
+            }
+            catch (Exception)
+            {
+                return Color.White;
+            }
+        }
+
+        /// <summary>
+        ///     By-value comparer, auto-generated by Rider.
+        /// </summary>
+        private sealed class ByValueEqualityComparer : IEqualityComparer<EditorLayerInfo>
+        {
+            public bool Equals(EditorLayerInfo x, EditorLayerInfo y)
+            {
+                if (ReferenceEquals(x, y)) return true;
+                if (ReferenceEquals(x, null)) return false;
+                if (ReferenceEquals(y, null)) return false;
+                if (x.GetType() != y.GetType()) return false;
+                return string.Equals(x.Name, y.Name) && x.Hidden == y.Hidden && string.Equals(x.ColorRgb, y.ColorRgb);
+            }
+
+            public int GetHashCode(EditorLayerInfo obj)
+            {
+                unchecked
+                {
+                    var hashCode = obj.Name.GetHashCode();
+                    hashCode = (hashCode * 397) ^ obj.Hidden.GetHashCode();
+                    hashCode = (hashCode * 397) ^ obj.ColorRgb.GetHashCode();
+                    return hashCode;
+                }
+            }
+        }
+
+        public static IEqualityComparer<EditorLayerInfo> ByValueComparer { get; } = new ByValueEqualityComparer();
+    }
+}

Assets/Extensions/Quaver.API/Maps/Structures/EditorLayerInfo.cs.meta

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

Assets/Extensions/Quaver.API/Maps/Structures/HitObjectInfo.cs

@@ -0,0 +1,187 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Copyright (c) 2017-2019 Swan & The Quaver Team <support@quavergame.com>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+//using MoonSharp.Interpreter;
+//using MoonSharp.Interpreter.Interop;
+using Quaver.API.Enums;
+using YamlDotNet.Serialization;
+
+namespace Quaver.API.Maps.Structures
+{
+
+    /// <summary>
+    ///     HitObjects section of the .qua
+    /// </summary>
+    /*[MoonSharpUserData]*/
+    [Serializable]
+    public class HitObjectInfo
+    {
+        /// <summary>
+        ///     The time in milliseconds when the HitObject is supposed to be hit.
+        /// </summary>
+        public int StartTime
+        {
+            get;
+            /*[MoonSharpVisible(false)]*/ set;
+        }
+
+        /// <summary>
+        ///     The lane the HitObject falls in
+        /// </summary>
+        public int Lane
+        {
+            get;
+            /*MoonSharpVisible(false)]*/ set;
+        }
+
+        /// <summary>
+        ///     The endtime of the HitObject (if greater than 0, it's considered a hold note.)
+        /// </summary>
+        public int EndTime
+        {
+            get;
+            /*[MoonSharpVisible(false)]*/ set;
+        }
+
+        /// <summary>
+        ///     Bitwise combination of hit sounds for this object
+        /// </summary>
+        public HitSounds HitSound
+        {
+            get;
+            /*[MoonSharpVisible(false)]*/ set;
+        }
+
+        /// <summary>
+        ///     Key sounds to play when this object is hit.
+        /// </summary>
+        /*[MoonSharpVisible(false)]*/
+        public List<KeySoundInfo> KeySounds { get; set; } = new List<KeySoundInfo>();
+
+        /// <summary>
+        ///     The layer in the editor that the object belongs to.
+        /// </summary>
+        public int EditorLayer
+        {
+            get;
+            /*[MoonSharpVisible(false)]*/ set;
+        }
+
+        /// <summary>
+        ///     If the object is a long note. (EndTime > 0)
+        /// </summary>
+        [YamlIgnore]
+        public bool IsLongNote => EndTime > 0;
+
+        /// <summary>
+        ///     Returns if the object is allowed to be edited in lua scripts
+        /// </summary>
+        [YamlIgnore]
+        public bool IsEditableInLuaScript
+        {
+            get;
+            /*[MoonSharpVisible(false)]*/ set;
+        }
+
+        /// <summary>
+        ///     Gets the timing point this object is in range of.
+        /// </summary>
+        /// <returns></returns>
+        public TimingPointInfo GetTimingPoint(List<TimingPointInfo> timingPoints)
+        {
+            // Search through the entire list for the correct point
+            for (var i = timingPoints.Count - 1; i >= 0; i--)
+            {
+                if (StartTime >= timingPoints[i].StartTime)
+                    return timingPoints[i];
+            }
+
+            return timingPoints.First();
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="time"></param>
+        /// <exception cref="InvalidOperationException"></exception>
+        public void SetStartTime(int time)
+        {
+            ThrowUneditableException();
+            StartTime = time;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <exception cref="InvalidOperationException"></exception>
+        public void SetEndTime(int time)
+        {
+            ThrowUneditableException();
+            EndTime = time;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="lane"></param>
+        public void SetLane(int lane)
+        {
+            ThrowUneditableException();
+            Lane = lane;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="hitsounds"></param>
+        public void SetHitSounds(HitSounds hitsounds)
+        {
+            ThrowUneditableException();
+            HitSound = hitsounds;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <exception cref="InvalidOperationException"></exception>
+        private void ThrowUneditableException()
+        {
+            if (!IsEditableInLuaScript)
+                throw new InvalidOperationException("Value is not allowed to be edited in lua scripts.");
+        }
+
+        /// <summary>
+        ///     By-value comparer, mostly auto-generated by Rider: KeySounds-related code is changed to by-value.
+        /// </summary>
+        private sealed class ByValueEqualityComparer : IEqualityComparer<HitObjectInfo>
+        {
+            public bool Equals(HitObjectInfo x, HitObjectInfo y)
+            {
+                if (ReferenceEquals(x, y)) return true;
+                if (ReferenceEquals(x, null)) return false;
+                if (ReferenceEquals(y, null)) return false;
+                if (x.GetType() != y.GetType()) return false;
+                return x.StartTime == y.StartTime && x.Lane == y.Lane && x.EndTime == y.EndTime && x.HitSound == y.HitSound && x.KeySounds.SequenceEqual(y.KeySounds, KeySoundInfo.ByValueComparer) && x.EditorLayer == y.EditorLayer;
+            }
+
+            public int GetHashCode(HitObjectInfo obj)
+            {
+                unchecked
+                {
+                    var hashCode = obj.StartTime;
+                    hashCode = (hashCode * 397) ^ obj.Lane;
+                    hashCode = (hashCode * 397) ^ obj.EndTime;
+                    hashCode = (hashCode * 397) ^ (int) obj.HitSound;
+                    foreach (var keySound in obj.KeySounds)
+                        hashCode = (hashCode * 397) ^ KeySoundInfo.ByValueComparer.GetHashCode(keySound);
+                    hashCode = (hashCode * 397) ^ obj.EditorLayer;
+                    return hashCode;
+                }
+            }
+        }
+
+        public static IEqualityComparer<HitObjectInfo> ByValueComparer { get; } = new ByValueEqualityComparer();
+    }
+}

Assets/Extensions/Quaver.API/Maps/Structures/HitObjectInfo.cs.meta

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