Remove callback parameters on states.

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/Pdt/PdtOperator.cs

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

Assets/Cryville/Common/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");
@@ -38,8 +47,8 @@ namespace Cryville.Common.Unity {
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
 				CurrentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
 #elif UNITY_ANDROID
-				using (AndroidJavaClass ajc=new AndroidJavaClass("android.os.Environment"))
-				using (AndroidJavaObject file=ajc.CallStatic<AndroidJavaObject>("getExternalStorageDirectory")) {
+				using (AndroidJavaClass ajc = new AndroidJavaClass("android.os.Environment"))
+				using (AndroidJavaObject file = ajc.CallStatic<AndroidJavaObject>("getExternalStorageDirectory")) {
 					androidStorage = file.Call<string>("getAbsolutePath");
 					CurrentDirectory = new DirectoryInfo(androidStorage);
 				}
@@ -47,9 +56,8 @@ namespace Cryville.Common.Unity {
 #error No default directory
 #endif
 			}
-			UpdateGUI();
+			UpdateGUI(0);
 		}
-#pragma warning restore IDE0051
 
 		public void Show() {
 			fileName = null;
@@ -57,85 +65,82 @@ namespace Cryville.Common.Unity {
 		}
 
 		public void Close() {
-			if (Callback != null) Callback.Invoke();
+			var ev = OnClose;
+			if (ev != null) ev.Invoke();
 			gameObject.SetActive(false);
 		}
 
 		public DirectoryInfo CurrentDirectory;
 
-		void OnDriveChanged(string s) {
-#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
-			CurrentDirectory = new DirectoryInfo(s);
-#elif UNITY_ANDROID
-			switch (s) {
-				case "?storage":
-					CurrentDirectory = new DirectoryInfo(androidStorage);
-					break;
-			}
-#else
-#error No change drive logic
-#endif
-			UpdateGUI();
+		void ChangeDirectory(DirectoryInfo s) {
+			CurrentDirectory = s;
+			UpdateGUI(1);
 		}
 
-		void OnDirectoryChanged(string s) {
-			CurrentDirectory = new DirectoryInfo(CurrentDirectory.FullName + "/" + s);
-			UpdateGUI();
-		}
-
-		void OnFileChanged(string s) {
+		void SelectFile(string s) {
 			fileName = s;
 			Close();
 		}
 
-		void UpdateGUI() {
+		void UpdateGUI(int depth) {
 			title.GetComponent<Text>().text = CurrentDirectory.FullName;
 
+			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(() => ChangeDirectory(new DirectoryInfo(androidStorage)));
 				sbtn.transform.SetParent(drives, false);
 #else
 #error No update GUI logic
 #endif
+				foreach (var p in m_presetPaths) {
+					var d = new DirectoryInfo(p.Value);
+					if (d.Exists) {
+						GameObject btn = Instantiate(prefabButton);
+						btn.GetComponentInChildren<Text>().text = p.Key;
+						btn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(d));
+						btn.transform.SetParent(drives, false);
+					}
+				}
+			}
 
 			CallHelper.Purge(dirs);
 			DirectoryInfo[] subdirs = CurrentDirectory.GetDirectories();
-			GameObject pbtn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
+			GameObject pbtn = Instantiate(prefabButton);
 			pbtn.GetComponentInChildren<Text>().text = "..";
-			pbtn.GetComponentInChildren<Button>().onClick.AddListener(() => OnDirectoryChanged(".."));
+			pbtn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(new DirectoryInfo(Path.Combine(CurrentDirectory.FullName, ".."))));
 			pbtn.transform.SetParent(dirs, false);
 			foreach (DirectoryInfo d in subdirs) {
-				GameObject btn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
+				GameObject btn = Instantiate(prefabButton);
 				btn.GetComponentInChildren<Text>().text = d.Name;
-				var ts = d.Name;
-				btn.GetComponentInChildren<Button>().onClick.AddListener(() => OnDirectoryChanged(ts));
+				var ts = d;
+				btn.GetComponentInChildren<Button>().onClick.AddListener(() => ChangeDirectory(ts));
 				btn.transform.SetParent(dirs, false);
 			}
 
 			CallHelper.Purge(files);
 			FileInfo[] fl = CurrentDirectory.GetFiles();
 			foreach (FileInfo d in fl) {
-				foreach (string ext in m_filter)
-					if (d.Extension == ext) goto ext_matched;
-				continue;
-			ext_matched:
-				GameObject btn = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Button"));
+				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/Input/UnityMouseHandler.cs

@@ -28,19 +28,19 @@ namespace Cryville.Common.Unity.Input {
 		}
 
 		public override bool IsNullable(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return false;
 		}
 
 		public override byte GetDimension(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return 2;
 		}
 
 		public override string GetTypeName(int type) {
 			switch (type) {
 				case 0: return "Mouse Position";
-				default: throw new ArgumentOutOfRangeException(nameof(type));
+				default: throw new ArgumentOutOfRangeException("type");
 			}
 		}
 

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

@@ -28,19 +28,19 @@ namespace Cryville.Common.Unity.Input {
 		}
 
 		public override bool IsNullable(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return true;
 		}
 
 		public override byte GetDimension(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException(nameof(type));
+			if (type != 0) throw new ArgumentOutOfRangeException("type");
 			return 2;
 		}
 
 		public override string GetTypeName(int type) {
 			switch (type) {
 				case 0: return "Touch";
-				default: throw new ArgumentOutOfRangeException(nameof(type));
+				default: throw new ArgumentOutOfRangeException("type");
 			}
 		}
 

Assets/Cryville/Common/Unity/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/ResourceBrowserMaster.cs

@@ -73,6 +73,9 @@ namespace Cryville.Crtr.Browsing {
 			Application.LoadLevelAdditive("Play");
 #endif
 			GameObject.Find("/Master").GetComponent<Master>().HideMenu();
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+			DiscordController.Instance.SetPlaying(string.Format("{0} - {1}", detail.Meta.song.name, detail.Meta.name), detail.Meta.length);
+#endif
 		}
 
 		public void OpenConfig(int id, ChartDetail detail) {

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;
 			}
 		}
 		
@@ -167,7 +203,7 @@ namespace Cryville.Crtr {
 		public virtual EventList GetEventsOfType(string type) {
 			switch (type) {
 				case "motions": return new EventList<Chart.Motion>(motions);
-				default: throw new ArgumentException("Unknown type");
+				default: throw new ArgumentException(string.Format("Unknown event type {0}", type));
 			}
 		}
 	}
@@ -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

@@ -54,8 +54,8 @@ namespace Cryville.Crtr {
 		static bool disableGC = true;
 		static float clippingDist = 1f;
 		static float renderDist = 6f;
-		static float renderStep = 0.05f;
-		public static float actualRenderStep = 0f;
+		static double renderStep = 0.05;
+		public static double actualRenderStep = 0;
 		static bool autoRenderStep = false;
 		public static float soundOffset = 0;
 		static float startOffset = 0;
@@ -111,7 +111,7 @@ namespace Cryville.Crtr {
 
 		bool texloaddone;
 		diag::Stopwatch texloadtimer = new diag::Stopwatch();
-		bool firstFrame;
+		int forceSyncFrames;
 		double atime0;
 		void Update() {
 			if (started) GameUpdate();
@@ -123,10 +123,18 @@ namespace Cryville.Crtr {
 			try {
 				if (Screen.width != screenSize.x || Screen.height != screenSize.y)
 					throw new InvalidOperationException("Window resized while playing");
-				float dt = firstFrame
-						? 1f / Application.targetFrameRate
-						: Time.deltaTime;
-				firstFrame = false;
+				double dt, step;
+				if (forceSyncFrames != 0) {
+					forceSyncFrames--;
+					double target = Game.AudioClient.Position - atime0;
+					dt = target - cbus.Time;
+					step = autoRenderStep ? 1f / Application.targetFrameRate : renderStep;
+					inputProxy.SyncTime(target);
+				}
+				else {
+					dt = Time.deltaTime;
+					step = autoRenderStep ? Time.smoothDeltaTime : renderStep;
+				}
 				inputProxy.ForceTick();
 				cbus.ForwardByTime(dt);
 				bbus.ForwardByTime(dt);
@@ -135,10 +143,6 @@ namespace Cryville.Crtr {
 				bbus.CopyTo(2, tbus);
 				bbus.CopyTo(3, nbus);
 				UnityEngine.Profiling.Profiler.EndSample();
-				float step = autoRenderStep ? ( firstFrame
-						? 1f / Application.targetFrameRate
-						: Time.smoothDeltaTime
-					) : renderStep;
 				actualRenderStep = step;
 
 				nbus.ForwardStepByTime(clippingDist, step);
@@ -250,14 +254,15 @@ namespace Cryville.Crtr {
 			status.text = sttext;
 		}
 		void OnCameraPostRender(Camera cam) {
+			if (!started) return;
 			if (!logEnabled) return;
-			if (started) timetext = string.Format(
-				"\nSTime: {0:R}\nATime: {1:R}\nITime: {2:R}",
+			timetext = string.Format(
+				"\nSTime: {0:R}s {3}\ndATime: {1:+0.0ms;-0.0ms;0} {3}\ndITime: {2:+0.0ms;-0.0ms;0} {3}",
 				cbus.Time,
-				Game.AudioClient.Position - atime0,
-				inputProxy.GetTimestampAverage()
+				(Game.AudioClient.Position - atime0 - cbus.Time) * 1e3,
+				(inputProxy.GetTimestampAverage() - cbus.Time) * 1e3,
+				forceSyncFrames != 0 ? "(force sync)" : ""
 			);
-			else timetext = string.Empty;
 		}
 		#endregion
 
@@ -278,6 +283,9 @@ namespace Cryville.Crtr {
 			SceneManager.UnloadSceneAsync("Play");
 #elif UNITY_5_3_OR_NEWER
 			SceneManager.UnloadScene("Play");
+#endif
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+			DiscordController.Instance.SetIdle();
 #endif
 		}
 #pragma warning restore IDE1006
@@ -308,7 +316,7 @@ namespace Cryville.Crtr {
 			autoRenderStep = renderStep == 0;
 			soundOffset = Settings.Default.SoundOffset;
 			startOffset = Settings.Default.StartOffset;
-			firstFrame = true;
+			forceSyncFrames= Settings.Default.ForceSyncFrames;
 			texloaddone = false;
 			Game.NetworkTaskWorker.SuspendBackgroundTasks();
 			Game.AudioSession = Game.AudioSequencer.NewSession();
@@ -371,8 +379,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 +389,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 +399,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 +537,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);
@@ -531,12 +550,6 @@ namespace Cryville.Crtr {
 				using (var pbus = cbus.Clone(16)) {
 					pbus.Forward();
 				}
-				Logger.Log("main", 0, "Load/WorkerThread", "Patching events");
-				cbus.DoPatch();
-				Logger.Log("main", 0, "Load/WorkerThread", "Prehandling (iteration 2)");
-				using (var pbus = cbus.Clone(17)) {
-					pbus.Forward();
-				}
 
 				Logger.Log("main", 0, "Load/WorkerThread", "Cloning states (type 1)");
 				bbus = cbus.Clone(1, -clippingDist);

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,18 @@ namespace Cryville.Crtr.Components {
 		protected Vector3? prevpt;
 		protected Quaternion? prevrot;
 		protected int vertCount = 0;
+		Part part = Part.whole;
+		enum Part {
+			whole = 0,
+			idle = 1,
+			start = 2,
+			end = 3,
+		}
+
+		public SectionalGameObject() {
+			SubmitProperty("partial", new PropOp.Boolean(v => part = Part.idle));
+			SubmitProperty("part", new PropOp.Enum<Part>(v => part = v, v => (Part)v));
+		}
 
 		protected override void OnDestroy() {
 			mesh.Destroy();
@@ -23,7 +35,7 @@ namespace Cryville.Crtr.Components {
 		}
 
 		public void AppendPoint(Vector3 p, Quaternion r) {
-			if (prevpt == p && prevrot == r) return;
+			if (prevpt == p && prevrot == r || ((int)part & 1) == 1) return;
 			AppendPointInternal(p, r);
 			// if (!headGenerated) Logger.Log("main", 0, "Skin/Polysec", "{0}", r);
 			prevpt = p;
@@ -55,7 +67,7 @@ namespace Cryville.Crtr.Components {
 			SubmitProperty("head", new PropOp.String(v => head.FrameName = v));
 			SubmitProperty("body", new PropOp.String(v => body.FrameName = v));
 			SubmitProperty("tail", new PropOp.String(v => tail.FrameName = v));
-			SubmitProperty("shape", new op_set_shape(this));
+			SubmitProperty("shape", new op_set_shape(this), 2);
 		}
 
 #pragma warning disable IDE1006
@@ -98,24 +110,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 +131,6 @@ namespace Cryville.Crtr.Components {
 			}
 		}
 
-		// Vector3 prevp = Vector3.zero;
 		protected override void AppendPointInternal(Vector3 p, Quaternion r) {
 			if (vertices == null) {
 				vertices = _ptPool.Rent();
@@ -151,15 +152,16 @@ namespace Cryville.Crtr.Components {
 		List<Vector3> verts;
 		List<Vector2> uvs;
 		List<int> trih = null, trib = null, trit = null;
+		static List<int> _emptyTris = new List<int>();
 
 		public override void Seal() {
 			if (vertCount <= 1 || sumLength == 0) return;
 			int vcpsec = _shapeLength; // Vertex Count Per Section
 			float width = GetWidth();
 			float headLength = 0;
-			if (head.FrameName != null) headLength = width / head.Ratio;
+			if (head.Frame != null) headLength = width / head.Ratio;
 			float tailLength = 0;
-			if (tail.FrameName != null) tailLength = width / tail.Ratio;
+			if (tail.Frame != null) tailLength = width / tail.Ratio;
 			float endLength = headLength + tailLength;
 			if (sumLength <= endLength) {
 				// The total length of the two ends is longer than the whole mesh, squeeze the two ends
@@ -187,17 +189,17 @@ namespace Cryville.Crtr.Components {
 			verts = _vertPool.Rent(vc * vcpsec);
 			uvs = _uvPool.Rent(vc * vcpsec);
 			int i = 0; int t = 0; float l = 0; int m = 0;
-			if (head.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); }
-			if (body.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
-			if (tail.FrameName != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
+			if (head.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trih, head, ref i, ref t, ref l, 0, headLength, vcpsec, hvc); }
+			if (body.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trib, body, ref i, ref t, ref l, headLength, sumLength - tailLength, vcpsec, hvc + bvc); }
+			if (tail.Frame != null) { m++; GenerateMeshTo(verts, uvs, out trit, tail, ref i, ref t, ref l, sumLength - tailLength, sumLength, vcpsec, vc); }
 
-			mesh.Mesh.subMeshCount = m;
+			mesh.Mesh.subMeshCount = 3;
 			m = 0;
 			mesh.Mesh.SetVertices(verts);
 			mesh.Mesh.SetUVs(0, uvs);
-			if (head.FrameName != null) mesh.Mesh.SetTriangles(trih, m++);
-			if (body.FrameName != null) mesh.Mesh.SetTriangles(trib, m++);
-			if (tail.FrameName != null) mesh.Mesh.SetTriangles(trit, m++);
+			mesh.Mesh.SetTriangles(head.Frame == null ? _emptyTris : trih, m++);
+			mesh.Mesh.SetTriangles(body.Frame == null ? _emptyTris : trib, m++);
+			mesh.Mesh.SetTriangles(tail.Frame == null ? _emptyTris : trit, m++);
 			mesh.Mesh.RecalculateNormals();
 
 			_vertPool.Return(verts); verts = null;

Assets/Cryville/Crtr/Components/SkinComponent.cs

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

Assets/Cryville/Crtr/Components/SpritePlane.cs

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

Assets/Cryville/Crtr/Components/SpriteScale3.cs

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

Assets/Cryville/Crtr/Components/SpriteText.cs

@@ -1,4 +1,5 @@
-using Cryville.Common.Pdt;
+using Cryville.Common.Buffers;
+using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -7,7 +8,7 @@ namespace Cryville.Crtr.Components {
 	public class SpriteText : SpriteBase {
 		public SpriteText() {
 			SubmitProperty("frames", new op_set_frames(this));
-			SubmitProperty("value", new PropOp.String(v => Value = v));
+			SubmitProperty("value", new PropOp.TargetString(() => Value));
 			SubmitProperty("size", new PropOp.Float(v => Size = v));
 			SubmitProperty("spacing", new PropOp.Float(v => Spacing = v));
 			SubmitProperty("opacity", new PropOp.Float(v => Opacity = v));
@@ -41,21 +42,14 @@ namespace Cryville.Crtr.Components {
 			foreach (var m in meshes) m.Value.Destroy();
 		}
 
-		readonly Dictionary<Texture2D, MeshWrapper> meshes = new Dictionary<Texture2D, MeshWrapper>();
 		Dictionary<char, SpriteInfo> m_frames;
 		public Dictionary<char, SpriteInfo> Frames {
 			get { return m_frames; }
 			set { m_frames = value; UpdateFrames(); UpdateScale(); }
 		}
 
-		public string m_value;
-		public string Value {
-			get { return m_value; }
-			set {
-				if (m_value == value) return;
-				m_value = value; UpdateScale();
-			}
-		}
+		readonly TargetString m_value = new TargetString();
+		public TargetString Value { get { return m_value; } }
 
 		public float m_size;
 		public float Size {
@@ -80,31 +74,38 @@ namespace Cryville.Crtr.Components {
 			float frameHeight = 0;
 			foreach (var m in meshes) m.Value.Destroy();
 			meshes.Clear();
+			verts.Clear();
+			uvs.Clear();
 			foreach (var f in m_frames) {
 				f.Value.Load();
 				if (frameHeight == 0) frameHeight = f.Value.Rect.height;
-				else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height");
-				if (!meshes.ContainsKey(f.Value.Frame.Texture)) {
+				else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height for text component");
+				var tex = f.Value.Frame.Texture;
+				if (!meshes.ContainsKey(tex)) {
 					var m = new MeshWrapper();
 					m.Init(mesh.MeshTransform);
 					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/DiscordController.cs

@@ -0,0 +1,56 @@
+using Discord;
+using System;
+using UnityEngine;
+
+namespace Cryville.Crtr {
+	internal class DiscordController : MonoBehaviour {
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+		public static DiscordController Instance;
+
+		const long CLIENT_ID = 1059021675578007622L;
+
+		Discord.Discord dc;
+		ActivityManager am;
+		long launchTime;
+
+		void Start() {
+			Instance = this;
+			launchTime = (long)(DateTime.UtcNow - DateTime.UnixEpoch).TotalSeconds;
+			dc = new Discord.Discord(CLIENT_ID, (UInt64)CreateFlags.Default);
+			am = dc.GetActivityManager();
+			SetIdle();
+		}
+
+		void Update() {
+			dc.RunCallbacks();
+		}
+
+		void OnApplicationQuit() {
+			dc.Dispose();
+		}
+
+		void Callback(Result result) { }
+
+		public void SetIdle() {
+			am.UpdateActivity(new Activity {
+				State = "Idle",
+				Instance = false,
+				Timestamps = { Start = launchTime },
+			}, Callback);
+		}
+
+		public void SetPlaying(string detail, double? duration) {
+			long now = (long)(DateTime.UtcNow - DateTime.UnixEpoch).TotalSeconds;
+			am.UpdateActivity(new Activity {
+				State = "Playing a chart",
+				Details = detail,
+				Instance = true,
+				Timestamps = {
+					Start = now,
+					End = duration == null ? 0 : now + (long)duration,
+				},
+			}, Callback);
+		}
+#endif
+	}
+}

Assets/Cryville/Crtr/DiscordController.cs.meta

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

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -1,6 +1,9 @@
+using Cryville.Common;
+using Cryville.Common.Buffers;
 using Cryville.Crtr.Components;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine;
 
 namespace Cryville.Crtr.Event {
@@ -35,36 +38,22 @@ 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 Vector3 Position {
-			get;
-			protected set;
-		}
-		public Quaternion Rotation {
-			get;
-			protected set;
-		}
-		public bool Alive {
-			get;
-			private set;
-		}
-		public bool Awoken {
-			get;
-			private set;
-		}
-		public bool Disposed {
-			get;
-			private set;
-		}
+		public readonly Dictionary<int, Anchor> Anchors = new Dictionary<int, Anchor>();
+		protected Transform a_cur;
+		protected Transform a_head;
+		protected Transform a_tail;
+		public Vector3 Position { get; protected set; }
+		public Quaternion Rotation { get; protected set; }
+		public bool Alive { get; private set; }
+		public bool Awoken { get; private set; }
+		public bool Disposed { get; private set; }
 
 		public EventContainer Container {
 			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 +63,30 @@ 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).Transform;
+			a_head = RegisterAnchor(_a_head).Transform;
+			a_tail = RegisterAnchor(_a_tail).Transform;
 		}
+		protected Anchor RegisterAnchor(int name) {
+			var go = new GameObject("." + IdentifierManager.SharedInstance.Retrieve(name)).transform;
+			go.SetParent(gogroup, false);
+			var result = new Anchor() { Transform = go };
+			Anchors.Add(name, result);
+			return result;
+		}
+
 		/// <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 +104,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,14 +115,37 @@ namespace Cryville.Crtr.Event {
 				PreAwake(s);
 				Awake(s);
 			}
+			else if (s.CloneType == 17) {
+				Init();
+			}
+		}
+		static readonly SimpleObjectPool<StampedEvent.Anchor> anchorEvPool
+			= new SimpleObjectPool<StampedEvent.Anchor>(1024);
+		protected void PushAnchorEvent(int name, double time) {
+			var tev = anchorEvPool.Rent();
+			tev.Time = time;
+			tev.Container = Container;
+			tev.Name = name;
+			ts.Bus.PushTempEvent(tev);
 		}
 		public virtual void Update(ContainerState s, StampedEvent ev) {
 			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
 			if (flag) PreAwake(s);
-			if (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) { }
+		public virtual void ExUpdate(ContainerState s, StampedEvent ev) {
+			if (ev is StampedEvent.Anchor) {
+				var tev = (StampedEvent.Anchor)ev;
+				if (gogroup) {
+					OpenAnchor(tev.Name);
+					Anchors[tev.Name].Transform.SetPositionAndRotation(Position, Rotation);
+					skinContainer.MatchDynamic(s);
+					CloseAnchor(tev.Name);
+				}
+				anchorEvPool.Return(tev);
+			}
+		}
 		public virtual void MotionUpdate(byte ct, Chart.Motion ev) { }
 		public virtual void EndUpdate(ContainerState s) {
 			if (s.CloneType < 16) {
@@ -133,11 +153,13 @@ namespace Cryville.Crtr.Event {
 				if (gogroup && s.CloneType <= 2) skinContainer.MatchDynamic(s);
 			}
 		}
-		public virtual void Anchor() { }
-		protected void OpenAnchor(string name) {
+		public virtual void Anchor() {
+			if (cs.Working) PushAnchorEvent(_a_cur, cs.Time);
+		}
+		protected void OpenAnchor(int name) {
 			if (Anchors.ContainsKey(name)) Anchors[name].Open();
 		}
-		protected void CloseAnchor(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.
@@ -75,22 +81,19 @@ namespace Cryville.Crtr.Event {
 		/// <param name="clone">Returns a cloned motion value instead.</param>
 		/// <returns>A motion value.</returns>
 		RealtimeMotionValue GetMotionValue(Identifier name, bool clone = false) {
-			RealtimeMotionValue value;
-			if (!Values.TryGetValue(name, out value)) {
-				value = new RealtimeMotionValue().Init(Parent == null
-					? ChartPlayer.motionRegistry[name].GlobalInitValue
-					: ChartPlayer.motionRegistry[name].InitValue
-				);
-				Values.Add(name, value);
-			}
+			RealtimeMotionValue value = Values[name];
 			if (clone) return value.Clone();
 			return value;
 		}
 
 		void InvalidateMotion(Identifier name) {
-			CachedValueStates[name] = false;
-			foreach (var c in Children)
-				c.Value.InvalidateMotion(name);
+			CacheEntry cache;
+			if (!CachedValues.TryGetValue(name, out cache))
+				CachedValues.Add(name, cache = new CacheEntry());
+			cache.Valid = false;
+			ValidateChildren();
+			foreach (var c in WorkingChildren)
+				Children[c].InvalidateMotion(name);
 		}
 
 		public ContainerState(Chart c, EventContainer _ev, ContainerState parent = null) {
@@ -102,8 +105,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 +126,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);
@@ -169,20 +165,22 @@ namespace Cryville.Crtr.Event {
 				else dest.Values.Add(mv.Key, mv.Value.Clone());
 			}
 
+			foreach (var cv in dest.CachedValues) cv.Value.Valid = false;
 			foreach (var cv in CachedValues) {
-				Vector dv;
-				if(dest.CachedValues.TryGetValue(cv.Key, out dv)) cv.Value.CopyTo(dv);
+				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]);
 			else foreach (var child in Children)
 				child.Value.CopyTo(ct, dest.Children[child.Key]);
-			ValidateChildren();
+			dest.ValidateChildren();
 
-			RMVPool.ReturnAll();
 			dest.PlayingMotions.Clear();
 			foreach (var m in PlayingMotions) dest.PlayingMotions.Add(m.Key, m.Value);
 		}
@@ -202,7 +200,7 @@ namespace Cryville.Crtr.Event {
 
 		public void AttachHandler(ContainerHandler h) {
 			if (Handler != null)
-				throw new InvalidOperationException();
+				throw new InvalidOperationException("Handler attached twice");
 			Handler = h;
 			h.cs = this;
 		}
@@ -212,22 +210,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 { });
+			if (tr.Value == null)
+				tr.Value = RMVPool.Rent(key).AbsoluteValue;
+			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;
 		}
@@ -315,17 +312,20 @@ namespace Cryville.Crtr.Event {
 			Working = false;
 		}
 
-		public void Handle(StampedEvent ev, Action<StampedEvent> callback = null) {
+		public void Handle(StampedEvent ev) {
 			if (breakflag) return;
 			if (ev != null) {
 				if (ev.Unstamped is Chart.Motion) {
 					var tev = (Chart.Motion)ev.Unstamped;
 					var mv = RMVPool.Rent(tev.Name);
+					mv.CloneTypeFlag = CloneType;
 					GetMotionValue(tev.Name).CopyTo(mv);
 					PlayingMotions.Add(ev, mv);
-					Callback(ev, callback);
-					if (!ev.Unstamped.IsLong)
+					Update(ev);
+					if (!ev.Unstamped.IsLong) {
 						PlayingMotions.Remove(ev);
+						RMVPool.Return(mv);
+					}
 				}
 				else if (ev.Unstamped is EventContainer) {
 					var cev = (EventContainer)ev.Unstamped;
@@ -344,7 +344,9 @@ namespace Cryville.Crtr.Event {
 					if (tev.IsRelease) {
 						var nev = tev.Original;
 						if (nev is Chart.Motion) {
-							Callback(ev, callback);
+							Update(ev);
+							var mv = PlayingMotions[ev.Origin];
+							if (mv.CloneTypeFlag == CloneType) RMVPool.Return(mv);
 							PlayingMotions.Remove(ev.Origin);
 						}
 						else if (nev is EventContainer) {
@@ -357,15 +359,13 @@ namespace Cryville.Crtr.Event {
 						}
 					}
 				}
-				Callback(ev.Unstamped == null || ev.Unstamped.Priority >= 0 ? ev : null, callback);
+				Update(ev.Unstamped == null || ev.Unstamped.Priority >= 0 ? ev : null);
 			}
-			else Callback(null, callback);
+			else Update(null);
 		}
 
-		void Callback(StampedEvent ev, Action<StampedEvent> callback) {
+		void Update(StampedEvent ev) {
 			UpdateMotions();
-			if (callback != null)
-				callback(ev);
 			if (ev == null || ev.Unstamped != null) Handler.Update(this, ev);
 			else Handler.ExUpdate(this, ev);
 			foreach (var m in PlayingMotions)
@@ -387,7 +387,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 +401,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) {
+			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();
@@ -84,7 +84,6 @@ namespace Cryville.Crtr.Event {
 				}
 				stampedEvents.Add(sev);
 				if (ev.Priority >= 0) {
-					if (callback != null) callback(ev);
 					flag = true;
 				}
 				if (ev is Chart.Signature) {
@@ -93,12 +92,10 @@ namespace Cryville.Crtr.Event {
 				}
 				EventId++;
 			}
-			if (callback != null && !flag) callback(batch.First());
 			return;
 		return_ahead:
 			Time = toTime;
 			beat = toBeat;
-			if (callback != null) callback(null);
 		}
 		
 		IOrderedEnumerable<ChartEvent> GetEventBatch() {

Assets/Cryville/Crtr/Event/EventBus.cs

@@ -33,6 +33,7 @@ namespace Cryville.Crtr.Event {
 			r.activeContainers = new List<EventContainer>();
 			r.workingStates = new HashSet<ContainerState>();
 			r.invalidatedStates = new HashSet<ContainerState>();
+			r.tempEvents = new List<StampedEvent>();
 			r.Time += offsetTime;
 			r.RootState = RootState.Clone(ct);
 			r.RootState.StartUpdate();
@@ -99,27 +100,23 @@ namespace Cryville.Crtr.Event {
 				s.AttachSystems(skin, judge);
 		}
 
-		readonly List<StampedEvent> patch = new List<StampedEvent>();
-		public void IssuePatch(IEnumerable<StampedEvent> l) {
-			patch.AddRange(l);
-		}
-		public void DoPatch() {
-			foreach (var ev in patch) {
-				var batch = new EventBatch(ev.Time);
-				var batchIndex = events.BinarySearch(batch);
-				if (batchIndex >= 0) batch = events[batchIndex];
-				else events.Insert(~batchIndex, batch);
-				batch.Add(ev);
-			}
-			patch.Clear();
+		List<StampedEvent> tempEvents = new List<StampedEvent>();
+		public void PushTempEvent(StampedEvent ev) {
+			var index = tempEvents.BinarySearch(ev);
+			if (index < 0) index = ~index;
+			tempEvents.Insert(index, ev);
 		}
 
-		public override void ForwardOnceToTime(float toTime, Action<EventBatch> callback = null) {
-			if (EventId < events.Count && events[EventId].Time <= toTime) {
-				Time = events[EventId].Time;
-				var batch = events[EventId];
+		public override void ForwardOnceToTime(double toTime) {
+			double time1 = EventId < events.Count ? events[EventId].Time : double.PositiveInfinity;
+			double time2 = tempEvents.Count > 0 ? tempEvents[0].Time : double.PositiveInfinity;
+			double time0 = Math.Min(time1, time2);
+			if (time0 <= toTime && time0 != double.PositiveInfinity) {
+				Time = time0;
 				foreach (var s in workingStates) s.Handle(null);
 				ValidateStates();
+				if (time1 == time0) {
+					var batch = events[EventId];
 					for (var i = 0; i < batch.Count; i++) {
 						var ev = batch[i];
 						if (ev.Container != null) {
@@ -130,9 +127,20 @@ namespace Cryville.Crtr.Event {
 							if (ev.Container != null) EnsureActivity((EventContainer)ev.Unstamped);
 						}
 					}
-				ValidateStates();
 					EventId++;
 				}
+				if (time2 == time0) {
+					while (tempEvents.Count > 0) {
+						var ev = tempEvents[0];
+						if (ev.Container != null) {
+							EnsureActivity(ev.Container);
+							states[ev.Container].Handle(ev);
+						}
+						tempEvents.RemoveAt(0);
+					}
+				}
+				ValidateStates();
+			}
 			else {
 				Time = toTime;
 				foreach (var s in workingStates) s.Handle(null);
@@ -147,12 +155,16 @@ namespace Cryville.Crtr.Event {
 			invalidatedStates.Clear();
 		}
 		
-		public void BroadcastInit() {
-			RootState.BroadcastInit();
+		public void BroadcastPreInit() {
+			RootState.BroadcastPreInit();
+		}
+		public void BroadcastPostInit() {
+			RootState.BroadcastPostInit();
 		}
 
 		public void BroadcastEndUpdate() {
 			RootState.BroadcastEndUpdate();
+			tempEvents.Clear();
 		}
 
 		public void Anchor() {

Assets/Cryville/Crtr/Event/RMVPool.cs

@@ -20,10 +20,13 @@ namespace Cryville.Crtr.Event {
 				_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
 		}
 
-		readonly Dictionary<RealtimeMotionValue, Identifier> _rented = new Dictionary<RealtimeMotionValue, Identifier>();
+		static readonly SimpleObjectPool<Dictionary<RealtimeMotionValue, Identifier>> _dictPool
+			= new SimpleObjectPool<Dictionary<RealtimeMotionValue, Identifier>>(1024);
+		Dictionary<RealtimeMotionValue, Identifier> _rented;
 		public RealtimeMotionValue Rent(Identifier name) {
 			var n = name;
 			var obj = _buckets[n].Rent();
+			if (_rented == null) _rented = _dictPool.Rent();
 			_rented.Add(obj, n);
 			return obj;
 		}
@@ -35,6 +38,7 @@ namespace Cryville.Crtr.Event {
 			foreach (var obj in _rented)
 				_buckets[obj.Value].Return(obj.Key);
 			_rented.Clear();
+			_dictPool.Return(_rented);
 		}
 	}
 }

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))]
@@ -180,4 +182,5 @@ 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

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

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

@@ -18,12 +18,11 @@ namespace Cryville.Crtr.Extensions.Malody {
 		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
 			List<Resource> result = new List<Resource>();
 			MalodyChart src;
-			if (file.Extension != ".mc") throw new NotImplementedException("mcz file is not supported");
+			if (file.Extension != ".mc") throw new NotImplementedException("mcz file is not supported yet");
 			using (var reader = new StreamReader(file.FullName)) {
 				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");
+			if (src.meta.mode != 0) throw new NotImplementedException(string.Format("{0} mode is not supported yet", MODES[src.meta.mode]));
 
 			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) {
@@ -113,22 +110,20 @@ namespace Cryville.Crtr.Extensions.Malody {
 								offset = -tev.offset / 1000f,
 							});
 						}
-						else throw new NotImplementedException();
+						else throw new NotImplementedException("Key sounds are not supported yet");
 					}
 					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);
@@ -140,12 +135,14 @@ namespace Cryville.Crtr.Extensions.Malody {
 						var sev = tev.StartEvent;
 						longEvents.Remove(sev);
 					}
-					else throw new NotSupportedException();
+					else throw new NotSupportedException("Unrecognized long event");
 				}
-				else throw new NotSupportedException();
+				else throw new NotSupportedException("Unrecognized event");
 			}
-			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 {
@@ -229,4 +221,5 @@ namespace Cryville.Crtr.Extensions.Malody {
 			}
 		}
 #pragma warning restore IDE1006
+	}
 }