Disable Android input handlers in non-Android systems.

.editorconfig

@@ -1,6 +1,9 @@
 # Remove the line below if you want to inherit .editorconfig settings from higher directories
 root = true
 
+[*]
+charset = utf-8
+
 # C# files
 [*.cs]
 

Assets/Cryville/Common/AsyncDelivery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	/// <summary>

Assets/Cryville/Common/BinderAttribute.cs

@@ -13,7 +13,7 @@ namespace Cryville.Common {
 		public static Binder CreateBinderOfType(Type type) {
 			var l = type.GetCustomAttributes(typeof(BinderAttribute), true);
 			if (l.Length > 0) {
-				return (Binder)ReflectionHelper.InvokeEmptyConstructor(
+				return (Binder)Activator.CreateInstance(
 					((BinderAttribute)l[0]).BinderType
 				);
 			}

Assets/Cryville/Common/Buffers/ArrayPool.cs

@@ -1,65 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of arrays of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The item type of the arrays in the pool.</typeparam>
-	public class ArrayPool<T> {
-		private class Bucket : ObjectPool<T[]> {
-			readonly int _size;
-			public Bucket(int size, int capacity) : base(capacity) {
-				_size = size;
-			}
-			protected override T[] Construct() {
-				return new T[_size];
-			}
-		}
-		readonly Bucket[] _buckets;
-		/// <summary>
-		/// Creates an instance of the <see cref="ArrayPool{T}" /> class with the default maximum list size and bucket capacity.
-		/// </summary>
-		public ArrayPool() : this(0x40000000, 256) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="ArrayPool{T}" /> class.
-		/// </summary>
-		/// <param name="maxSize">The maximum size of the arrays in the pool.</param>
-		/// <param name="capacityPerBucket">The capacity of each bucket. The pool groups arrays of similar sizes into buckets for faster access.</param>
-		public ArrayPool(int maxSize, int capacityPerBucket) {
-			if (maxSize < 16) maxSize = 16;
-			int num = GetID(maxSize) + 1;
-			_buckets = new Bucket[num];
-			for (int i = 0; i < num; i++) {
-				_buckets[i] = new Bucket(GetSize(i), capacityPerBucket);
-			}
-		}
-		/// <summary>
-		/// Rents an array that is at least the specified size from the pool.
-		/// </summary>
-		/// <param name="size">The minimum size of the array.</param>
-		/// <returns>An array of type <see cref="T" /> that is at least the specified size.</returns>
-		public T[] Rent(int size) {
-			int len2 = size;
-			if (len2 < 16) len2 = 16;
-			var arr = _buckets[GetID(len2)].Rent();
-			return arr;
-		}
-		/// <summary>
-		/// Returns a rented array to the pool.
-		/// </summary>
-		/// <param name="arr">The array to return.</param>
-		public void Return(T[] arr) {
-			int len2 = arr.Length;
-			if (len2 < 16) len2 = 16;
-			_buckets[GetID(len2)].Return(arr);
-		}
-		static int GetID(int size) {
-			size -= 1;
-			size >>= 4;
-			int num = 0;
-			for (; size != 0; size >>= 1) num++;
-			return num;
-		}
-		static int GetSize(int id) {
-			return 0x10 << id;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/CategorizedPool.cs

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

Assets/Cryville/Common/Buffers/ListPool.cs

@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of lists of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The item type of the lists in the pool.</typeparam>
-	public class ListPool<T> {
-		private class Bucket : ObjectPool<List<T>> {
-			readonly int _size;
-			public Bucket(int size, int capacity) : base(capacity) {
-				_size = size;
-			}
-			protected override List<T> Construct() {
-				return new List<T>(_size);
-			}
-		}
-		readonly Bucket[] _buckets;
-		/// <summary>
-		/// Creates an instance of the <see cref="ListPool{T}" /> class with the default maximum list size and bucket capacity.
-		/// </summary>
-		public ListPool() : this(0x40000000, 256) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="ListPool{T}" /> class.
-		/// </summary>
-		/// <param name="maxSize">The maximum size of the lists in the pool.</param>
-		/// <param name="capacityPerBucket">The capacity of each bucket. The pool groups lists of similar sizes into buckets for faster access.</param>
-		public ListPool(int maxSize, int capacityPerBucket) {
-			if (maxSize < 16) maxSize = 16;
-			int num = GetID(maxSize) + 1;
-			_buckets = new Bucket[num];
-			for (int i = 0; i < num; i++) {
-				_buckets[i] = new Bucket(GetSize(i), capacityPerBucket);
-			}
-		}
-		/// <summary>
-		/// Rents a list of the specified size from the pool. The size of the list must not be changed when it is rented.
-		/// </summary>
-		/// <param name="size">The size of the list.</param>
-		/// <returns>A <see cref="List{T}" /> of the specified size.</returns>
-		public List<T> Rent(int size) {
-			int len2 = size;
-			if (len2 < 16) len2 = 16;
-			var list = _buckets[GetID(len2)].Rent();
-			if (list.Count < size)
-				for (int i = list.Count; i < size; i++) list.Add(default(T));
-			else if (list.Count > size)
-				list.RemoveRange(size, list.Count - size);
-			return list;
-		}
-		/// <summary>
-		/// Returns a rented list to the pool.
-		/// </summary>
-		/// <param name="list">The list to return.</param>
-		public void Return(List<T> list) {
-			int len2 = list.Capacity;
-			if (len2 < 16) len2 = 16;
-			_buckets[GetID(len2)].Return(list);
-		}
-		static int GetID(int size) {
-			size -= 1;
-			size >>= 4;
-			int num = 0;
-			for (; size != 0; size >>= 1) num++;
-			return num;
-		}
-		static int GetSize(int id) {
-			return 0x10 << id;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/ObjectPool.cs

@@ -1,52 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The type of the objects in the pool.</typeparam>
-	public abstract class ObjectPool<T> where T : class {
-		int _index;
-		readonly T[] _objs;
-		/// <summary>
-		/// Creates an instance of the <see cref="ObjectPool{T}" /> class.
-		/// </summary>
-		/// <param name="capacity">The capacity of the pool.</param>
-		public ObjectPool(int capacity) {
-			_objs = new T[capacity];
-		}
-		/// <summary>
-		/// The count of objects rented from the pool.
-		/// </summary>
-		public int RentedCount { get { return _index; } }
-		/// <summary>
-		/// Rents a object from the pool.
-		/// </summary>
-		/// <returns>The rented object.</returns>
-		public T Rent() {
-			T obj = null;
-			if (_index < _objs.Length) {
-				obj = _objs[_index];
-				_objs[_index++] = null;
-			}
-			if (obj == null) obj = Construct();
-			else Reset(obj);
-			return obj;
-		}
-		/// <summary>
-		/// Returns a rented object to the pool.
-		/// </summary>
-		/// <param name="obj">The object to return.</param>
-		public void Return(T obj) {
-			if (_index > 0) _objs[--_index] = obj;
-		}
-		/// <summary>
-		/// Constructs a new instance of type <typeparamref name="T" />.
-		/// </summary>
-		/// <returns>The new instance.</returns>
-		protected abstract T Construct();
-		/// <summary>
-		/// Resets an object.
-		/// </summary>
-		/// <param name="obj">The object.</param>
-		protected virtual void Reset(T obj) { }
-	}
-}

Assets/Cryville/Common/Buffers/SimpleObjectPool.cs

@@ -1,16 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of type <typeparamref name="T" />, which has a parameterless constructor.
-	/// </summary>
-	/// <typeparam name="T">The type of the objects in the pool.</typeparam>
-	public class SimpleObjectPool<T> : ObjectPool<T> where T : class, new() {
-		/// <summary>
-		/// Creates an instance of the <see cref="SimpleObjectPool{T}" /> class.
-		/// </summary>
-		/// <param name="capacity">The capacity of the pool.</param>
-		public SimpleObjectPool(int capacity) : base(capacity) { }
-		protected override T Construct() {
-			return new T();
-		}
-	}
-}

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

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

Assets/Cryville/Common/Buffers/TargetString.cs

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

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

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

Assets/Cryville/Common/Collections/Generic/IPairList.cs

@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common.Collections.Generic {
-	public interface IPairList<TKey, TValue> : IList<KeyValuePair<TKey, TValue>> {
-		void Add(TKey key, TValue value);
-		void Insert(int index, TKey key, TValue value);
-	}
-}

Assets/Cryville/Common/Collections/Generic/IPairList.cs.meta

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

Assets/Cryville/Common/Collections/Generic/PairCollection.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections.Generic {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairCollectionDebugView<,>))]
-	public struct PairCollection<TKey, TValue> : IDisposable {
-		public void Dispose() { }
-		readonly IPairList<TKey, TValue> _pairList;
-		readonly IDictionary<TKey, TValue> _dictionary;
-		public PairCollection(object collection) : this() {
-			var type = collection.GetType();
-			if (typeof(IPairList<TKey, TValue>).IsAssignableFrom(type)) _pairList = (IPairList<TKey, TValue>)collection;
-			else if (typeof(IDictionary<TKey, TValue>).IsAssignableFrom(type)) _dictionary = (IDictionary<TKey, TValue>)collection;
-			else throw new ArgumentException("Parameter is not a pair collection");
-		}
-		public int Count {
-			get {
-				if (_pairList != null) return _pairList.Count;
-				else return _dictionary.Count;
-			}
-		}
-		public void Add(TKey key, TValue value) {
-			if (_pairList != null) _pairList.Add(key, value);
-			else _dictionary.Add(key, value);
-		}
-		public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) {
-			if (_pairList != null) _pairList.CopyTo(array, index);
-			else _dictionary.CopyTo(array, index);
-		}
-	}
-	internal class PairCollectionDebugView<TKey, TValue> {
-		readonly PairCollection<TKey, TValue> _self;
-		public PairCollectionDebugView(PairCollection<TKey, TValue> self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<TKey, TValue>[] Items {
-			get {
-				KeyValuePair<TKey, TValue>[] array = new KeyValuePair<TKey, TValue>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/Generic/PairCollection.cs.meta

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

Assets/Cryville/Common/Collections/Generic/PairList.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections.Generic {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairListDebugView<,>))]
-	public class PairList<TKey, TValue> : List<KeyValuePair<TKey, TValue>>, IPairList<TKey, TValue>, IPairList {
-		public void Add(TKey key, TValue value) {
-			Add(new KeyValuePair<TKey, TValue>(key, value));
-		}
-
-		public void Add(object key, object value) {
-			try {
-				Add((TKey)key, (TValue)value);
-			}
-			catch (InvalidCastException) {
-				throw new ArgumentException("Wrong key type or value type");
-			}
-		}
-
-		public void Insert(int index, TKey key, TValue value) {
-			Insert(index, new KeyValuePair<TKey, TValue>(key, value));
-		}
-
-		public void Insert(int index, object key, object value) {
-			try {
-				Insert(index, (TKey)key, (TValue)value);
-			}
-			catch (InvalidCastException) {
-				throw new ArgumentException("Wrong key type or value type");
-			}
-		}
-	}
-	internal class PairListDebugView<TKey, TValue> {
-		readonly PairList<TKey, TValue> _self;
-		public PairListDebugView(PairList<TKey, TValue> self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<TKey, TValue>[] Items {
-			get {
-				KeyValuePair<TKey, TValue>[] array = new KeyValuePair<TKey, TValue>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/Generic/PairList.cs.meta

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

Assets/Cryville/Common/Collections/IPairList.cs

@@ -1,8 +0,0 @@
-using System.Collections;
-
-namespace Cryville.Common.Collections {
-	public interface IPairList : IList {
-		void Add(object key, object value);
-		void Insert(int index, object key, object value);
-	}
-}

Assets/Cryville/Common/Collections/IPairList.cs.meta

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

Assets/Cryville/Common/Collections/PairCollection.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairCollectionDebugView))]
-	public struct PairCollection : IDisposable {
-		public void Dispose() { }
-		readonly IPairList _pairList;
-		readonly IDictionary _dictionary;
-		public PairCollection(object collection) : this() {
-			var type = collection.GetType();
-			if (typeof(IPairList).IsAssignableFrom(type)) _pairList = (IPairList)collection;
-			else if (typeof(IDictionary).IsAssignableFrom(type)) _dictionary = (IDictionary)collection;
-			else throw new ArgumentException("Parameter is not a pair collection");
-		}
-		public int Count {
-			get {
-				if (_pairList != null) return _pairList.Count;
-				else return _dictionary.Count;
-			}
-		}
-		public void Add(object key, object value) {
-			if (_pairList != null) _pairList.Add(key, value);
-			else _dictionary.Add(key, value);
-		}
-		public void CopyTo(KeyValuePair<object, object>[] array, int index) {
-			if (_pairList != null) _pairList.CopyTo(array, index);
-			else _dictionary.CopyTo(array, index);
-		}
-	}
-	internal class PairCollectionDebugView {
-		readonly PairCollection _self;
-		public PairCollectionDebugView(PairCollection self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<object, object>[] Items {
-			get {
-				KeyValuePair<object, object>[] array = new KeyValuePair<object, object>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/PairCollection.cs.meta

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

Assets/Cryville/Common/Collections/PairList.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairListDebugView))]
-	public class PairList : List<KeyValuePair<object, object>>, IPairList {
-		public void Add(object key, object value) {
-			Add(new KeyValuePair<object, object>(key, value));
-		}
-
-		public void Insert(int index, object key, object value) {
-			Insert(index, new KeyValuePair<object, object>(key, value));
-		}
-	}
-	internal class PairListDebugView {
-		readonly PairList _self;
-		public PairListDebugView(PairList self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<object, object>[] Items {
-			get {
-				KeyValuePair<object, object>[] array = new KeyValuePair<object, object>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/PairList.cs.meta

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

Assets/Cryville/Common/ComponentModel/LogarithmicScaleAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]

Assets/Cryville/Common/ComponentModel/PrecisionAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, Inherited = false)]

Assets/Cryville/Common/ComponentModel/RangeAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]

Assets/Cryville/Common/ComponentModel/StepAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]

Assets/Cryville/Common/Coroutine.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Cryville.Common {
+	public class Coroutine {
+		readonly IEnumerator<float> _enumerator;
+		readonly Stopwatch _stopwatch = new Stopwatch();
+		public float Progress { get; private set; }
+		public Coroutine(IEnumerator<float> enumerator) {
+			_enumerator = enumerator;
+		}
+		public bool TickOnce() {
+			if (!_enumerator.MoveNext()) return false;
+			Progress = _enumerator.Current;
+			return true;
+		}
+		public bool Tick(double minTime) {
+			_stopwatch.Restart();
+			while (_stopwatch.Elapsed.TotalSeconds < minTime) {
+				if (!_enumerator.MoveNext()) return false;
+				Progress = _enumerator.Current;
+			}
+			return true;
+		}
+	}
+}

Assets/Cryville/Common/Coroutine.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2745c44c3cc32be4ab3a43888c14b9a1
+guid: 387adc7d494be0147b7cb930bc2e726b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Culture/ScriptUtils.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 

Assets/Cryville/Common/FileStringAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	public class FileStringAttribute : Attribute {

Assets/Cryville/Common/Font/FontFile.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.IO;
+using Cryville.Common.IO;
 using System;
 using System.Collections;
 using System.Collections.Generic;

Assets/Cryville/Common/Font/FontManager.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 

Assets/Cryville/Common/Font/FontMatcher.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.Culture;
+using Cryville.Common.Culture;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Assets/Cryville/Common/Font/FontTable.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

Assets/Cryville/Common/Font/Typeface.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 
 namespace Cryville.Common.Font {

Assets/Cryville/Common/IO/BinaryReaderBE.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 

Assets/Cryville/Common/Identifier.cs

@@ -1,15 +1,15 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	public struct Identifier : IEquatable<Identifier> {
 		public static Identifier Empty = new Identifier(0);
 		public int Key { get; private set; }
-		public object Name { get { return IdentifierManager.SharedInstance.Retrieve(Key); } }
+		public object Name { get { return IdentifierManager.Shared.Retrieve(Key); } }
 		public Identifier(int key) {
 			Key = key;
 		}
 		public Identifier(object name) {
-			Key = IdentifierManager.SharedInstance.Request(name);
+			Key = IdentifierManager.Shared.Request(name);
 		}
 		public override bool Equals(object obj) {
 			if (obj == null || !(obj is Identifier)) return false;

Assets/Cryville/Common/IdentifierManager.cs

@@ -1,52 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common {
-	/// <summary>
-	/// A manager that assigns each given identifiers a unique integer ID.
-	/// </summary>
-	public class IdentifierManager {
-		/// <summary>
-		/// A shared instance of the <see cref="IdentifierManager" /> class.
-		/// </summary>
-		public static IdentifierManager SharedInstance = new IdentifierManager();
-
-		readonly Dictionary<object, int> _idents = new Dictionary<object, int>();
-		readonly List<object> _ids = new List<object>();
-
-		readonly object _syncRoot = new object();
-
-		/// <summary>
-		/// Creates an instance of the <see cref="IdentifierManager" /> class.
-		/// </summary>
-		public IdentifierManager() {
-			Request(this);
-		}
-
-		/// <summary>
-		/// Requests an integer ID for an identifier.
-		/// </summary>
-		/// <param name="ident">The identifier.</param>
-		/// <returns>The integer ID.</returns>
-		public int Request(object ident) {
-			lock (_syncRoot) {
-				int id;
-				if (!_idents.TryGetValue(ident, out id)) {
-					_idents.Add(ident, id = _idents.Count);
-					_ids.Add(ident);
-				}
-				return id;
-			}
-		}
-
-		/// <summary>
-		/// Retrieves the identifier assigned with an integer ID.
-		/// </summary>
-		/// <param name="id">The integer ID.</param>
-		/// <returns>The identifier.</returns>
-		public object Retrieve(int id) {
-			lock (_syncRoot) {
-				return _ids[id];
-			}
-		}
-	}
-}

Assets/Cryville/Common/IdentifierManager.cs.meta

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

Assets/Cryville/Common/Logger.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-
-namespace Cryville.Common {
-	/// <summary>
-	/// A logger.
-	/// </summary>
-	public abstract class Logger {
-		static readonly Dictionary<string, Logger> Instances = new Dictionary<string, Logger>();
-		static readonly Dictionary<string, StreamWriter> Files = new Dictionary<string, StreamWriter>();
-		static string logPath = null;
-		/// <summary>
-		/// Sets the path where the log files shall be stored.
-		/// </summary>
-		/// <param name="path">The path.</param>
-		public static void SetLogPath(string path) {
-			logPath = path;
-			var dir = new DirectoryInfo(path);
-			if (!dir.Exists) dir.Create();
-		}
-		/// <summary>
-		/// Logs to the specified logger.
-		/// </summary>
-		/// <param name="key">The key of the logger.</param>
-		/// <param name="level">The severity level.</param>
-		/// <param name="module">The module that is logging.</param>
-		/// <param name="format">The format string.</param>
-		/// <param name="args">The arguments for formatting.</param>
-		public static void Log(string key, int level, string module, string format, params object[] args) {
-			if (!Instances.ContainsKey(key)) return;
-			Instances[key].Log(level, module, string.Format(format, args));
-			if (Files.ContainsKey(key)) Files[key].WriteLine("[{0:O}] [{1}] <{2}> {3}", DateTime.UtcNow, level, module, string.Format(format, args));
-		}
-		/// <summary>
-		/// Adds a created logger to the shared logger manager.
-		/// </summary>
-		/// <param name="key">The key of the logger.</param>
-		/// <param name="logger">The logger.</param>
-		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(CultureInfo.InvariantCulture) + "-" + key + ".log") {
-					AutoFlush = true
-				};
-			}
-		}
-		/// <summary>
-		/// Closes all loggers and related file streams.
-		/// </summary>
-		public static void Close() {
-			Instances.Clear();
-			foreach (var f in Files) f.Value.Dispose();
-			Files.Clear();
-		}
-		/// <summary>
-		/// Logs to the logger.
-		/// </summary>
-		/// <param name="level">The severity level.</param>
-		/// <param name="module">The module that is logging.</param>
-		/// <param name="msg">The message.</param>
-		public virtual void Log(int level, string module, string msg) { }
-	}
-
-	/// <summary>
-	/// A <see cref="Logger" /> that calls a callback function on log.
-	/// </summary>
-	public class InstantLogger : Logger {
-		readonly Action<int, string, string> callback;
-		/// <summary>
-		/// Creates an instance of the <see cref="InstantLogger" /> class.
-		/// </summary>
-		/// <param name="callback">The callback function.</param>
-		/// <exception cref="ArgumentNullException"><paramref name="callback" /> is <see langword="null" />.</exception>
-		public InstantLogger(Action<int, string, string> callback) {
-			if (callback == null)
-				throw new ArgumentNullException("callback");
-			this.callback = callback;
-		}
-		/// <inheritdoc />
-		public override void Log(int level, string module, string msg) {
-			base.Log(level, module, msg);
-			callback(level, module, msg);
-		}
-	}
-
-	/// <summary>
-	/// A <see cref="Logger" /> that buffers the logs for enumeration.
-	/// </summary>
-	public class BufferedLogger : Logger {
-		readonly List<LogEntry> buffer = new List<LogEntry>();
-		/// <summary>
-		/// Creates an instance of the <see cref="BufferedLogger" /> class.
-		/// </summary>
-		public BufferedLogger() { }
-		/// <inheritdoc />
-		public override void Log(int level, string module, string msg) {
-			base.Log(level, module, msg);
-			lock (buffer) {
-				buffer.Add(new LogEntry(level, module, msg));
-			}
-		}
-		/// <summary>
-		/// Enumerates the buffered logs.
-		/// </summary>
-		/// <param name="callback">The callback function to receive the logs.</param>
-		public void Enumerate(Action<int, string, string> callback) {
-			lock (buffer) {
-				foreach (var i in buffer) {
-					callback(i.level, i.module, i.msg);
-				}
-			}
-			buffer.Clear();
-		}
-	}
-
-	struct LogEntry {
-		public int level;
-		public string module;
-		public string msg;
-		public LogEntry(int level, string module, string msg) {
-			this.level = level;
-			this.module = module;
-			this.msg = msg;
-		}
-	}
-}

Assets/Cryville/Common/Logger.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 1c1729cfde78f1c479c9f7eb166e0107
-timeCreated: 1611126212
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Math/CubicBezier.cs

@@ -1,44 +1,27 @@
-using SMath = System.Math;
+using SMath = System.Math;
 
 namespace Cryville.Common.Math {
 	// Ported from https://github.com/arian/cubic-bezier/blob/master/index.js
 	public static class CubicBezier {
 		public static float Evaluate(float t, float x1, float y1, float x2, float y2, float epsilon) {
-			float x = t, t0, t1, t2, tx, d2, i;
-			for (t2 = x, i = 0; i < 8; i++) {
-				tx = CurveX(t2, x1, x2) - x;
-				if (SMath.Abs(tx) < epsilon) return CurveY(t2, y1, y2);
-				d2 = DerivativeCurveX(t2, x1, x2);
-				if (SMath.Abs(d2) < 1e-6) break;
-				t2 -= tx / d2;
-			}
+			float x = t, t0 = 0, t1 = 1, t2 = x;
 
-			t0 = 0; t1 = 1; t2 = x;
-
-			if (t2 < t0) return CurveY(t0, y1, y2);
-			if (t2 > t1) return CurveY(t1, y1, y2);
+			if (t2 < t0) return Curve(t0, y1, y2);
+			if (t2 > t1) return Curve(t1, y1, y2);
 
 			while (t0 < t1) {
-				tx = CurveX(t2, x1, x2);
-				if (SMath.Abs(tx - x) < epsilon) return CurveY(t2, y1, y2);
+				float tx = Curve(t2, x1, x2);
+				if (SMath.Abs(tx - x) < epsilon) return Curve(t2, y1, y2);
 				if (x > tx) t0 = t2;
 				else t1 = t2;
 				t2 = (t1 - t0) * .5f + t0;
 			}
 
-			return CurveY(t2, y1, y2);
+			return Curve(t2, y1, y2);
 		}
-		static float CurveX(float t, float x1, float x2) {
+		static float Curve(float t, float p1, float p2) {
 			float v = 1 - t;
-			return 3 * v * v * t * x1 + 3 * v * t * t * x2 + t * t * t;
-		}
-		static float CurveY(float t, float y1, float y2) {
-			float v = 1 - t;
-			return 3 * v * v * t * y1 + 3 * v * t * t * y2 + t * t * t;
-		}
-		static float DerivativeCurveX(float t, float x1, float x2) {
-			float v = 1 - t;
-			return 3 * (2 * (t - 1) * t + v * v) * x1 + 3 * (-t * t * t + 2 * v * t) * x2;
+			return 3 * v * v * t * p1 + 3 * v * t * t * p2 + t * t * t;
 		}
 	}
 }

Assets/Cryville/Common/Math/FractionUtils.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.Math {
 	/// <summary>

Assets/Cryville/Common/Math/SquareMatrix.cs

@@ -1,4 +1,4 @@
-using UnsafeIL;
+using UnsafeIL;
 
 namespace Cryville.Common.Math {
 	/// <summary>

Assets/Cryville/Common/Network/HttpClient.cs

@@ -1,3 +1,4 @@
+using Cryville.Common.Logging;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;

Assets/Cryville/Common/Network/HttpResponse.cs

@@ -1,3 +1,4 @@
+using Cryville.Common.Logging;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

Assets/Cryville/Common/Network/HttpResponseStream.cs

@@ -1,4 +1,5 @@
-using System;
+using Cryville.Common.Logging;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -130,4 +131,4 @@ namespace Cryville.Common.Network {
 			}
 		}
 	}
-}
+}

Assets/Cryville/Common/Network/TlsClient.cs

@@ -1,3 +1,4 @@
+using Cryville.Common.Logging;
 using Org.BouncyCastle.Security;
 using Org.BouncyCastle.Tls;
 using Org.BouncyCastle.Tls.Crypto;

Assets/Cryville/Common/Pdt/PdtAttributes.cs

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

Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
@@ -17,32 +17,28 @@ namespace Cryville.Common.Pdt {
 		readonly StackFrame[] _stack = new StackFrame[256];
 		readonly byte[] _mem = new byte[0x100000];
 		bool _revokepttconst;
-		LinkedListNode<PdtInstruction> _rip;
 		/// <summary>
 		/// Evaluates an expression and passes the result to a target operator.
 		/// </summary>
 		/// <param name="target">The target operator.</param>
 		/// <param name="exp">The expression to evaluate.</param>
-		public void Evaluate(PdtOperator target, PdtExpression exp) {
-			_framecount = 0;
-			_goffset = 0;
-			_revokepttconst = false;
-			for (_rip = exp.Instructions.First; _rip != null; _rip = _rip.Next)
-				_rip.Value.Execute(this);
-			Operate(target, _framecount, true);
-			if (exp.IsPotentialConstant) {
-				exp.IsConstant = exp.IsPotentialConstant = !_revokepttconst;
+		/// <returns>Whether the evaluaton succeeded.</returns>
+		public bool Evaluate(PdtOperator target, PdtExpression exp) {
+			try {
+				var prevFrameCount = _framecount;
+				_revokepttconst = false;
+				for (var ip = exp.Instructions.First; ip != null; ip = ip.Next)
+					ip.Value.Execute(this, ref ip);
+				if (exp.IsPotentialConstant) {
+					exp.IsConstant = exp.IsPotentialConstant = !_revokepttconst;
+				}
+				var ret = Operate(target, _framecount - prevFrameCount, true);
+				for (var i = prevFrameCount; i < _framecount; i++) DiscardStack();
+				return ret;
+			}
+			catch (Exception ex) {
+				throw new EvaluationFailureException(exp, ex);
 			}
-		}
-		/// <summary>
-		/// Patches an expression with a lefthand variable and a compound operator.
-		/// </summary>
-		/// <param name="target">The name of the lefthand variable.</param>
-		/// <param name="op">The name of the compound operator.</param>
-		/// <param name="exp">The expression.</param>
-		public void PatchCompound(int target, int op, PdtExpression exp) {
-			exp.Instructions.AddFirst(new PdtInstruction.PushVariable(target));
-			exp.Instructions.AddLast(new PdtInstruction.Operate(op, 2));
 		}
 		/// <summary>
 		/// Optimizes an expression by merging its instructions.
@@ -54,12 +50,14 @@ namespace Cryville.Common.Pdt {
 			List<PdtInstruction.Collapse> ct;
 			var cols = new Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>>();
 			var il = exp.Instructions;
-			for (_rip = il.First; _rip != null; _rip = _rip == null ? il.First : _rip.Next) {
-				var i = _rip.Value;
+			var ip = il.First;
+			while (ip != null) {
+				bool nextFlag = false;
+				var i = ip.Value;
 				if (i is PdtInstruction.Operate) {
 					int fc0 = _framecount;
 					int fc1 = ((PdtInstruction.Operate)i).Signature.ParamCount;
-					try { i.Execute(this); } catch (Exception) { }
+					try { i.Execute(this, ref ip); } catch (Exception) { }
 					if (fc0 - _framecount == fc1) {
 						unsafe {
 							fixed (StackFrame* frame = &_stack[_framecount++]) {
@@ -71,29 +69,38 @@ namespace Cryville.Common.Pdt {
 					}
 					else {
 						var frame = _stack[_framecount - 1];
-						_rip = il.AddAfter(_rip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length));
-						for (var j = 0; j <= fc1; j++) il.Remove(_rip.Previous);
+						if (frame.Type != PdtInternalType.Error) {
+							ReplaceIP(il, ref ip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length), cols);
+							for (var j = 0; j < fc1; j++) il.Remove(ip.Previous);
+						}
 					}
 				}
 				else if (i is PdtInstruction.Collapse) {
 					var t = (PdtInstruction.Collapse)i;
 					try {
-						var pins = _rip;
-						i.Execute(this);
-						if (_rip == pins) {
-							_rip = _rip.Next;
-							il.Remove(_rip.Previous);
-							il.Remove(_rip.Previous);
-							_rip = _rip.Previous;
+						var pins = ip;
+						i.Execute(this, ref ip);
+						if (_stack[_framecount - 1].Type == PdtInternalType.Error) {
+							throw new EvaluationFailureException();
+						}
+						if (ip == pins) {
+							ip = ip.Next;
+							il.Remove(ip.Previous);
+							il.Remove(ip.Previous);
+							ip = ip.Previous;
+							if (ip == null) {
+								ip = il.First;
+								nextFlag = true;
+							}
 						}
 						else {
-							_rip = pins.Previous;
-							while (_rip.Next != t.Target) il.Remove(_rip.Next);
-							il.Remove(_rip.Next);
+							ip = pins.Previous;
+							while (ip.Next != t.Target) il.Remove(ip.Next);
+							il.Remove(ip.Next);
 							if (cols.TryGetValue(t.Target, out ct)) {
-								foreach (var u in ct) u.Target = _rip;
+								foreach (var u in ct) u.Target = ip;
 								cols.Remove(t.Target);
-								cols.Add(_rip, ct);
+								cols.Add(ip, ct);
 							}
 						}
 					}
@@ -103,15 +110,14 @@ namespace Cryville.Common.Pdt {
 					}
 				}
 				else if (i is PdtInstruction.PushVariable) {
-					i.Execute(this);
+					i.Execute(this, ref ip);
 					var frame = _stack[_framecount - 1];
 					if (frame.Type != PdtInternalType.Undefined && frame.Type != PdtInternalType.Error) {
-						_rip = il.AddAfter(_rip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length));
-						il.Remove(_rip.Previous);
+						ReplaceIP(il, ref ip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length), cols);
 					}
 				}
-				else i.Execute(this);
-				if (_rip != null && cols.TryGetValue(_rip, out ct)) {
+				else i.Execute(this, ref ip);
+				if (ip != null && cols.TryGetValue(ip, out ct)) {
 					unsafe {
 						fixed (StackFrame* frame = &_stack[_framecount - 1]) {
 							frame->Type = PdtInternalType.Error;
@@ -120,6 +126,7 @@ namespace Cryville.Common.Pdt {
 						}
 					}
 				}
+				if (!nextFlag) ip = ip.Next;
 			}
 			exp.IsConstant = true;
 			exp.IsPotentialConstant = true;
@@ -133,6 +140,13 @@ namespace Cryville.Common.Pdt {
 				}
 			}
 		}
+		void ReplaceIP(LinkedList<PdtInstruction> il, ref LinkedListNode<PdtInstruction> ip, PdtInstruction ins, Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>> cols) {
+			List<PdtInstruction.Collapse> cins;
+			if (cols.TryGetValue(ip, out cins)) cols.Remove(ip);
+			ip = il.AddAfter(ip, ins);
+			il.Remove(ip.Previous);
+			if (cins != null) cols.Add(ip, cins);
+		}
 		/// <summary>
 		/// Revokes the potential constant mark of the current expression.
 		/// </summary>
@@ -184,23 +198,34 @@ namespace Cryville.Common.Pdt {
 		/// <returns>An operator of the specific name.</returns>
 		/// <remarks>The parameter count of the returned operator does not necessarily equal to <paramref name="pc" />.</remarks>
 		protected abstract PdtOperator GetOperator(PdtOperatorSignature sig);
-		unsafe void Operate(PdtOperator op, int pc, bool noset = false) {
+		unsafe bool Operate(PdtOperator op, int pc, bool noset = false) {
 			fixed (byte* pmem = _mem) {
 				op.Begin(this, pc);
 				for (int i = 0; i < pc; i++) {
 					var frame = _stack[--_framecount];
+					if (frame.Type == PdtInternalType.Error) {
+						_framecount -= pc - i - 1;
+						_stack[_framecount++] = new StackFrame { Type = PdtInternalType.Error, Offset = _goffset, Length = 0 };
+						return false;
+					}
 					op.LoadOperand(new PdtVariableMemory(frame.Type, pmem + frame.Offset, frame.Length));
 					_goffset -= frame.Length;
 				}
 				op.Call(pmem + _goffset, noset);
+				return true;
 			}
 		}
-		internal unsafe void Collapse(int name, LinkedListNode<PdtInstruction> target) {
+		internal unsafe void Collapse(int name, ref LinkedListNode<PdtInstruction> self, LinkedListNode<PdtInstruction> target) {
 			fixed (byte* pmem = _mem) {
 				var frame = _stack[--_framecount];
+				if (frame.Type == PdtInternalType.Error) {
+					_stack[_framecount++] = new StackFrame { Type = PdtInternalType.Error, Offset = _goffset, Length = 0 };
+					self = target;
+					return;
+				}
 				if (Collapse(name, new PdtVariableMemory(frame.Type, pmem + frame.Offset, frame.Length))) {
 					_framecount++;
-					_rip = target;
+					self = target;
 				}
 			}
 		}
@@ -226,7 +251,7 @@ namespace Cryville.Common.Pdt {
 	}
 
 	/// <summary>
-	/// The exception that is thrown when the evalution of a <see cref="PdtExpression" /> fails.
+	/// The exception that is thrown when the evaluation of a <see cref="PdtExpression" /> fails.
 	/// </summary>
 	public class EvaluationFailureException : Exception {
 		/// <inheritdoc />
@@ -237,5 +262,16 @@ namespace Cryville.Common.Pdt {
 		public EvaluationFailureException(string message, Exception innerException) : base(message, innerException) { }
 		/// <inheritdoc />
 		protected EvaluationFailureException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+		/// <summary>
+		/// Creates an instance of the <see cref="EvaluationFailureException" /> class with the failing expression.
+		/// </summary>
+		/// <param name="exp">The failing expression.</param>
+		public EvaluationFailureException(PdtExpression exp) : base("Evaluation failed for the expression: " + exp.ToString()) { }
+		/// <summary>
+		/// Creates an instance of the <see cref="EvaluationFailureException" /> class with the failing expression and the inner exception.
+		/// </summary>
+		/// <param name="exp">The failing expression.</param>
+		/// <param name="innerException">The inner exception.</param>
+		public EvaluationFailureException(PdtExpression exp, Exception innerException) : base("Evaluation failed for the expression: " + exp.ToString(), innerException) { }
 	}
 }

Assets/Cryville/Common/Pdt/PdtExpression.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -7,6 +7,18 @@ namespace Cryville.Common.Pdt {
 	/// PDT expression.
 	/// </summary>
 	public class PdtExpression {
+		/// <summary>
+		/// The empty expression.
+		/// </summary>
+		public static readonly PdtExpression Empty;
+		static PdtExpression() {
+			var ins = new LinkedList<PdtInstruction>();
+			ins.AddLast(new PdtInstruction.PushConstant(
+				PdtInternalType.Number, BitConverter.GetBytes(1f)
+			));
+			Empty = new PdtExpression(ins);
+		}
+
 		internal LinkedList<PdtInstruction> Instructions;
 		/// <summary>
 		/// Whether the value of this expression is constant.
@@ -27,9 +39,19 @@ namespace Cryville.Common.Pdt {
 			}
 			return r;
 		}
+		/// <summary>
+		/// Patches an expression with a lefthand variable and a compound operator.
+		/// </summary>
+		/// <param name="target">The name of the lefthand variable.</param>
+		/// <param name="op">The name of the compound operator.</param>
+		/// <param name="exp">The expression.</param>
+		public static void PatchCompound(int target, int op, PdtExpression exp) {
+			exp.Instructions.AddFirst(new PdtInstruction.PushVariable(target));
+			exp.Instructions.AddLast(new PdtInstruction.Operate(op, 2));
+		}
 	}
 	internal abstract class PdtInstruction {
-		internal abstract void Execute(PdtEvaluatorBase etor);
+		internal abstract void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self);
 		public class PushConstant : PdtInstruction {
 			public int Type { get; private set; }
 			public byte[] Value { get; private set; }
@@ -42,7 +64,7 @@ namespace Cryville.Common.Pdt {
 				Value = new byte[len];
 				Array.Copy(buffer, offset, Value, 0, len);
 			}
-			internal override void Execute(PdtEvaluatorBase etor) {
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
 				etor.PushConstant(Type, Value);
 			}
 			public override string ToString() {
@@ -53,12 +75,12 @@ namespace Cryville.Common.Pdt {
 			public int Name { get; private set; }
 			public bool Forced { get; private set; }
 			public PushVariable(int name, bool forced = false) { Name = name; Forced = forced; }
-			public PushVariable(string name, bool forced = false) : this(IdentifierManager.SharedInstance.Request(name)) { Forced = forced; }
-			internal override void Execute(PdtEvaluatorBase etor) {
+			public PushVariable(string name, bool forced = false) : this(IdentifierManager.Shared.Request(name)) { Forced = forced; }
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
 				etor.PushVariable(Name, Forced);
 			}
 			public override string ToString() {
-				return string.Format(Forced ? "pushv ?{0}" : "pushv {0}", IdentifierManager.SharedInstance.Retrieve(Name));
+				return string.Format(Forced ? "pushv ?{0}" : "pushv {0}", IdentifierManager.Shared.Retrieve(Name));
 			}
 		}
 		public class Operate : PdtInstruction {
@@ -69,7 +91,7 @@ namespace Cryville.Common.Pdt {
 			public Operate(string name, int paramCount) {
 				Signature = new PdtOperatorSignature(name, paramCount);
 			}
-			internal override void Execute(PdtEvaluatorBase etor) {
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
 				etor.Operate(Signature);
 			}
 			public override string ToString() {
@@ -80,14 +102,14 @@ namespace Cryville.Common.Pdt {
 			public int Name { get; private set; }
 			public LinkedListNode<PdtInstruction> Target { get; internal set; }
 			public Collapse(string name, LinkedListNode<PdtInstruction> target) {
-				Name = IdentifierManager.SharedInstance.Request(name);
+				Name = IdentifierManager.Shared.Request(name);
 				Target = target;
 			}
-			internal override void Execute(PdtEvaluatorBase etor) {
-				etor.Collapse(Name, Target);
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
+				etor.Collapse(Name, ref self, Target);
 			}
 			public override string ToString() {
-				return string.Format("col {0}{{{1}}}", IdentifierManager.SharedInstance.Retrieve(Name), Target.Value);
+				return string.Format("col {0}{{{1}}}", IdentifierManager.Shared.Retrieve(Name), Target.Value);
 			}
 		}
 	}
@@ -115,15 +137,6 @@ namespace Cryville.Common.Pdt {
 			{ '$', -1 },
 		};
 
-		static readonly PdtExpression _emptyexp;
-		static PdtInterpreter() {
-			var ins = new LinkedList<PdtInstruction>();
-			ins.AddLast(new PdtInstruction.PushConstant(
-				PdtInternalType.Number, BitConverter.GetBytes(1f)
-			));
-			_emptyexp = new PdtExpression(ins);
-		}
-
 		PdtExpToken GetToken() {
 			ws();
 			var result = new PdtExpToken {
@@ -195,7 +208,7 @@ namespace Cryville.Common.Pdt {
 								default: pc++; break;
 							}
 						}
-						else if (OP_TYPE[t2.Value[0]] == 1) {
+						if (OP_TYPE[t2.Value[0]] == 1) {
 							colp = new Dictionary<LinkedListNode<PdtInstruction>, string> { { ins.Last, t2.Value } };
 						}
 						t1 = t2;

Assets/Cryville/Common/Pdt/PdtFragmentInterpreter.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Reflection;
+
+namespace Cryville.Common.Pdt {
+	/// <summary>
+	/// Interpreter for fragments in Property Definition Tree (PDT) file format.
+	/// </summary>
+	public class PdtFragmentInterpreter : PdtInterpreter {
+		public PdtFragmentInterpreter() : base(null, new EmptyBinder()) { }
+
+		/// <summary>
+		/// Sets the new source string for the fragment interpreter and resets the position.
+		/// </summary>
+		/// <param name="value">The new source string.</param>
+		public void SetSource(string value) {
+			Source = value;
+			Position = 0;
+		}
+
+		/// <summary>
+		/// The binder.
+		/// </summary>
+		public Binder Binder {
+			get { return _binder; }
+			set { _binder = value; }
+		}
+
+		/// <summary>
+		/// Reads the current character and increments the position.
+		/// </summary>
+		/// <returns>The current character.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new char GetChar() { return base.GetChar(); }
+		/// <summary>
+		/// Reads an identifier.
+		/// </summary>
+		/// <returns>An identifier.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new string GetIdentifier() { return base.GetIdentifier(); }
+		/// <summary>
+		/// Reads a number.
+		/// </summary>
+		/// <returns>A number.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new string GetNumber() { return base.GetNumber(); }
+		/// <summary>
+		/// Reads a string.
+		/// </summary>
+		/// <returns>A string.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new string GetString() { return base.GetString(); }
+		/// <summary>
+		/// Reads an expression.
+		/// </summary>
+		/// <returns>An expression.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new PdtExpression GetExp() { return base.GetExp(); }
+	}
+}

Assets/Cryville/Common/Pdt/PdtFragmentInterpreter.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec18f22479042d747b88c093aa90c5c0
+guid: f7088ba23ed4b424eadaf664be48e376
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Pdt/PdtInternalType.cs

@@ -1,4 +1,4 @@
-namespace Cryville.Common.Pdt {
+namespace Cryville.Common.Pdt {
 	/// <summary>
 	/// The identifiers of the internal types of PDT.
 	/// </summary>

Assets/Cryville/Common/Pdt/PdtInterpreter.cs

@@ -1,10 +1,12 @@
-using Cryville.Common.Collections;
+using Cryville.Common.Collections;
+using Cryville.Common.Logging;
+using Cryville.Common.Reflection;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using CMath = System.Math;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
@@ -61,12 +63,12 @@ namespace Cryville.Common.Pdt {
 		/// <summary>
 		/// The source string.
 		/// </summary>
-		public string Source { get; private set; }
-		Binder _binder;
+		public string Source { get; protected set; }
+		protected Binder _binder;
 		/// <summary>
 		/// The current position in the string being parsed by the interpreter.
 		/// </summary>
-		public int Position { get; private set; }
+		public int Position { get; protected set; }
 #pragma warning disable IDE1006
 		/// <summary>
 		/// The character at the current position.
@@ -228,8 +230,8 @@ namespace Cryville.Common.Pdt {
 			if (!flag) throw new FormatException("Format directive not found");
 		}
 		object InterpretObject(Type type) {
-			var result = ReflectionHelper.InvokeEmptyConstructor(type);
-			bool dictflag = typeof(IDictionary).IsAssignableFrom(type);
+			var result = Activator.CreateInstance(type);
+			bool pcflag = PairCollection.IsPairCollection(type);
 			while (true) {
 				try { ws(); }
 				catch (IndexOutOfRangeException) { return result; }
@@ -241,69 +243,54 @@ namespace Cryville.Common.Pdt {
 				char c = GetChar();
 				switch (c) {
 					case '{':
-						if (dictflag) {
-							var ktype = type.GetGenericArguments()[0];
-							var ptype = type.GetGenericArguments()[1];
-							object key = _binder.ChangeType(pkey, ktype, null);
-							object value = InterpretObject(ptype);
-							((IDictionary)result).Add(key, value);
-						}
-						else {
-							MemberInfo prop = null;
-							bool flag = false;
-							if (pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
-							if (prop == null) flag = ReflectionHelper.TryFindMemberWithAttribute<ElementListAttribute>(type, out prop);
-							if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
-							Type ptype = ReflectionHelper.GetMemberType(prop);
-							if (flag) {
-								using (var collection = new PairCollection(ReflectionHelper.GetValue(prop, result))) {
-									var ktype = ptype.GetGenericArguments()[0];
-									var vtype = ptype.GetGenericArguments()[1];
-									object key = _binder.ChangeType(pkey, ktype, null);
-									object value = InterpretObject(vtype);
-									collection.Add(key, value);
-								}
-							}
-							else ReflectionHelper.SetValue(prop, result, InterpretObject(ptype));
-						}
+						InterpretObjectInternal<ElementListAttribute>(pcflag, type, pkey, result, type => InterpretObject(type));
 						break;
 					case ':':
 					case ';':
-						var exp = c == ';' ? _emptyexp : GetExp();
-						if (dictflag) {
-							var ktype = type.GetGenericArguments()[0];
-							var vtype = type.GetGenericArguments()[1];
-							object key = _binder.ChangeType(pkey, ktype, null);
-							object value = _binder.ChangeType(exp, vtype, null);
-							((IDictionary)result).Add(key, value);
-						}
-						else {
-							MemberInfo prop = null;
-							bool flag = false;
-							if (pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
-							if (prop == null) flag = ReflectionHelper.TryFindMemberWithAttribute<PropertyListAttribute>(type, out prop);
-							if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
-							var ptype = ReflectionHelper.GetMemberType(prop);
-							if (flag) {
-								using (var collection = new PairCollection(ReflectionHelper.GetValue(prop, result))) {
-									var ktype = ptype.GetGenericArguments()[0];
-									var vtype = ptype.GetGenericArguments()[1];
-									object key = _binder.ChangeType(pkey, ktype, null);
-									object value = _binder.ChangeType(exp, vtype, null);
-									collection.Add(key, value);
-								}
-							}
-							else {
-								object value = _binder.ChangeType(exp, ptype, null);
-								ReflectionHelper.SetValue(prop, result, value, _binder);
-							}
-						}
+						var exp = c == ';' ? PdtExpression.Empty : GetExp();
+						InterpretObjectInternal<PropertyListAttribute>(pcflag, type, pkey, result, type => _binder.ChangeType(exp, type, null));
 						break;
 					default:
 						throw new InvalidOperationException("Internal error: Invalid key interpretation");
 				}
 			}
 		}
+		void InterpretObjectInternal<T>(bool pcflag, Type type, object pkey, object result, Func<Type, object> vfunc) where T : Attribute {
+			if (pcflag) {
+				using (var collection = new PairCollection(result)) {
+					var ktype = type.GetGenericArguments()[0];
+					var ptype = type.GetGenericArguments()[1];
+					object key = _binder.ChangeType(pkey, ktype, null);
+					object value = vfunc(ptype);
+					collection.Add(key, value);
+				}
+			}
+			else {
+				MemberInfo prop = null;
+				bool flag = false;
+				if (pkey is string) prop = FieldLikeHelper.GetMember(type, (string)pkey);
+				if (prop == null) {
+					prop = FieldLikeHelper.FindMemberWithAttribute<T>(type);
+					flag = true;
+				}
+				if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
+				Type ptype = FieldLikeHelper.GetMemberType(prop);
+				if (flag) {
+					var origCollection = FieldLikeHelper.GetValue(prop, result);
+					if (origCollection == null) {
+						FieldLikeHelper.SetValue(prop, result, origCollection = Activator.CreateInstance(ptype));
+					}
+					using (var collection = new PairCollection(origCollection)) {
+						var ktype = ptype.GetGenericArguments()[0];
+						var vtype = ptype.GetGenericArguments()[1];
+						object key = _binder.ChangeType(pkey, ktype, null);
+						object value = vfunc(vtype);
+						collection.Add(key, value);
+					}
+				}
+				else FieldLikeHelper.SetValue(prop, result, vfunc(ptype), _binder);
+			}
+		}
 		/// <summary>
 		/// Interprets a key from the current position.
 		/// </summary>
@@ -324,13 +311,13 @@ namespace Cryville.Common.Pdt {
 			int pos = interpreter.Position;
 			if (pos >= src.Length) return "Failed to interpret the PDT: There are some missing or redundant tokens";
 			int lineStartPos = src.LastIndexOf('\n', pos) + 1;
-			int previewStartPos = src.LastIndexOf('\n', pos, 64);
+			int previewStartPos = src.LastIndexOf('\n', pos, CMath.Min(64, pos));
 			if (previewStartPos == -1) {
 				previewStartPos = pos - 64;
 				if (previewStartPos < 0) previewStartPos = 0;
 			}
 			else previewStartPos++;
-			int previewEndPos = src.IndexOf('\n', pos, 64);
+			int previewEndPos = src.IndexOf('\n', pos, CMath.Min(64, src.Length - pos));
 			if (previewEndPos == -1) {
 				previewEndPos = pos + 64;
 				if (previewEndPos > src.Length) previewEndPos = src.Length;

Assets/Cryville/Common/Pdt/PdtOperator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
@@ -91,7 +91,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="name">The name of the operator.</param>
 		/// <param name="paramCount">The parameter count.</param>
 		public PdtOperatorSignature(string name, int paramCount)
-			: this(IdentifierManager.SharedInstance.Request(name), paramCount) { }
+			: this(IdentifierManager.Shared.Request(name), paramCount) { }
 		/// <summary>
 		/// Creates an operator signature.
 		/// </summary>
@@ -113,7 +113,7 @@ namespace Cryville.Common.Pdt {
 			return _hash;
 		}
 		public override string ToString() {
-			return string.Format("{0}({1})", IdentifierManager.SharedInstance.Retrieve(Name), ParamCount);
+			return string.Format("{0}({1})", IdentifierManager.Shared.Retrieve(Name), ParamCount);
 		}
 	}
-}
+}

Assets/Cryville/Common/Pdt/PdtVariableMemory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnsafeIL;
 
 namespace Cryville.Common.Pdt {

Assets/Cryville/Common/ReflectionHelper.cs

@@ -1,186 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace Cryville.Common {
-	/// <summary>
-	/// Provides a set of <see langword="static" /> methods for refletion.
-	/// </summary>
-	public static class ReflectionHelper {
-		static readonly Type[] emptyTypeArray = {};
-		/// <summary>
-		/// Gets the parameterless constructor of a type.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>The parameterless constructor of the type.</returns>
-		public static ConstructorInfo GetEmptyConstructor(Type type) {
-			return type.GetConstructor(emptyTypeArray);
-		}
-		static readonly object[] emptyObjectArray = {};
-		/// <summary>
-		/// Invokes the parameterless constructor of a type and returns the result.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>The created instance.</returns>
-		public static object InvokeEmptyConstructor(Type type) {
-			return GetEmptyConstructor(type).Invoke(emptyObjectArray);
-		}
-		
-		/// <summary>
-		/// Tries to find a member with the specified attribute type in a type.
-		/// </summary>
-		/// <typeparam name="T">The attribute type.</typeparam>
-		/// <param name="t">The type containing the member with the specified attribute type.</param>
-		/// <param name="mi">The member.</param>
-		/// <returns>Whether the member is found.</returns>
-		public static bool TryFindMemberWithAttribute<T>(Type t, out MemberInfo mi) where T : Attribute {
-			try {
-				mi = FindMemberWithAttribute<T>(t);
-				return true;
-			}
-			catch (MissingMemberException) {
-				mi = null;
-				return false;
-			}
-		}
-		/// <summary>
-		/// Finds a member with the specified attribute type in a type.
-		/// </summary>
-		/// <typeparam name="T">The attribute type.</typeparam>
-		/// <param name="type">The type containing the member with the specified attribute type.</param>
-		/// <returns></returns>
-		/// <exception cref="MissingMemberException">The member is not found or multiple members are found.</exception>
-		public static MemberInfo FindMemberWithAttribute<T>(Type type) where T : Attribute {
-			var mil = type.FindMembers(
-				MemberTypes.Field | MemberTypes.Property,
-				BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static,
-				(m, o) => m.GetCustomAttributes(typeof(T), true).Length != 0,
-				null
-			);
-			if (mil.Length != 1)
-				throw new MissingMemberException(type.Name, typeof(T).Name);
-			return mil[0];
-		}
-
-		/// <summary>
-		/// Gets whether a type is a <see cref="Dictionary{TKey, TValue}" />.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>Whether the type is a <see cref="Dictionary{TKey, TValue}" />.</returns>
-		public static bool IsGenericDictionary(Type type) {
-			return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Dictionary<,>);
-		}
-
-		/// <summary>
-		/// Gets the member from a type with the specified name.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <param name="name">The name of the member.</param>
-		/// <returns>The member.</returns>
-		/// <exception cref="MissingMemberException">The member is not found or multiple members are found.</exception>
-		public static MemberInfo GetMember(Type type, string name) {
-			var mil = type.GetMember(
-				name,
-				MemberTypes.Field | MemberTypes.Property,
-				BindingFlags.Public | BindingFlags.Instance
-			);
-			if (mil.Length != 1)
-				throw new MissingMemberException(type.Name, name);
-			return mil[0];
-		}
-
-		/// <summary>
-		/// Gets the type of a member.
-		/// </summary>
-		/// <param name="mi">The member.</param>
-		/// <returns>The type of the member.</returns>
-		/// <exception cref="ArgumentException"><paramref name="mi" /> is not a field or a property.</exception>
-		public static Type GetMemberType(MemberInfo mi) {
-			if (mi is FieldInfo)
-				return ((FieldInfo)mi).FieldType;
-			if (mi is PropertyInfo)
-				return ((PropertyInfo)mi).PropertyType;
-			else
-				throw new ArgumentException("Member is not field or property.");
-		}
-
-		/// <summary>
-		/// Gets the value of a member of an object.
-		/// </summary>
-		/// <param name="mi">The member.</param>
-		/// <param name="obj">The object.</param>
-		/// <returns>The value.</returns>
-		/// <exception cref="ArgumentException"><paramref name="mi" /> is not a field or a property.</exception>
-		public static object GetValue(MemberInfo mi, object obj) {
-			if (mi is FieldInfo)
-				return ((FieldInfo)mi).GetValue(obj);
-			else if (mi is PropertyInfo)
-				return ((PropertyInfo)mi).GetValue(obj, new object[]{});
-			else
-				throw new ArgumentException();
-		}
-
-		/// <summary>
-		/// Sets the value of a member of an object.
-		/// </summary>
-		/// <param name="mi">The member.</param>
-		/// <param name="obj">The object.</param>
-		/// <param name="value">The value.</param>
-		/// <param name="binder">An optional binder to convert the value.</param>
-		/// <exception cref="ArgumentException"><paramref name="mi" /> is not a field or a property.</exception>
-		public static void SetValue(MemberInfo mi, object obj, object value, Binder binder = null) {
-			if (mi is FieldInfo)
-				((FieldInfo)mi).SetValue(obj, value, BindingFlags.Default, binder, null);
-			else if (mi is PropertyInfo)
-				((PropertyInfo)mi).SetValue(obj, value, BindingFlags.Default, binder, emptyObjectArray, null);
-			else
-				throw new ArgumentException();
-		}
-
-		/// <summary>
-		/// Gets all the subclasses of a type in the current app domain.
-		/// </summary>
-		/// <typeparam name="T">The type.</typeparam>
-		/// <returns>An array containing all the subclasses of the type in the current app domain.</returns>
-		public static Type[] GetSubclassesOf<T>() where T : class {
-			var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-			IEnumerable<Type> r = Enumerable.Empty<Type>();
-			foreach (var a in assemblies)
-				r = r.Concat(a.GetTypes().Where(
-					t => t.IsClass
-					&& !t.IsAbstract
-					&& t.IsSubclassOf(typeof(T))
-				));
-			return r.ToArray();
-		}
-
-		/// <summary>
-		/// Gets a simple name of a type.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>A simple name of the class.</returns>
-		public static string GetSimpleName(Type type) {
-			string result = type.Name;
-			var typeargs = type.GetGenericArguments();
-			if (typeargs.Length > 0) {
-				result = string.Format("{0}[{1}]", result, string.Join(",", from a in typeargs select GetSimpleName(a)));
-			}
-			return result;
-		}
-
-		/// <summary>
-		/// Gets the namespace qualified name of a type.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>The namespace qualified name of the class.</returns>
-		public static string GetNamespaceQualifiedName(Type type) {
-			string result = type.Namespace + "." + type.Name;
-			var typeargs = type.GetGenericArguments();
-			if (typeargs.Length > 0) {
-				result = string.Format("{0}[{1}]", result, string.Join(",", from a in typeargs select GetNamespaceQualifiedName(a)));
-			}
-			return result;
-		}
-	}
-}

Assets/Cryville/Common/ReflectionHelper.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 16857d076fc8d534788424e6c6d180e0
-timeCreated: 1608801352
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/StringUtils.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Text.RegularExpressions;
 

Assets/Cryville/Common/Unity/CallHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace Cryville.Common.Unity {

Assets/Cryville/Common/Unity/FileDialog.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
@@ -28,8 +28,8 @@ namespace Cryville.Common.Unity {
 			set { m_filter = value; }
 		}
 
-		public Dictionary<string, string> m_presetPaths = new Dictionary<string, string>();
-		public Dictionary<string, string> PresetPaths {
+		public IReadOnlyDictionary<string, string> m_presetPaths = new Dictionary<string, string>();
+		public IReadOnlyDictionary<string, string> PresetPaths {
 			get { return m_presetPaths; }
 			set { m_presetPaths = value; }
 		}

Assets/Cryville/Common/Unity/Input.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 7548d5a078795b04b8c54524389ba0fe
-folderAsset: yes
-timeCreated: 1611035780
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,109 +0,0 @@
-using System;
-using UnityEngine;
-
-namespace Cryville.Common.Unity.Input {
-	public delegate void InputEventDelegate(InputIdentifier id, InputVector vec);
-	public abstract class InputHandler : IDisposable {
-		InputEventDelegate m_onInput;
-		public event InputEventDelegate OnInput {
-			add {
-				if (m_onInput == null) Activate();
-				m_onInput -= value;
-				m_onInput += value;
-			}
-			remove {
-				if (m_onInput == null) return;
-				m_onInput -= value;
-				if (m_onInput == null) Deactivate();
-			}
-		}
-
-		~InputHandler() {
-			Dispose(false);
-		}
-		public void Dispose() {
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		protected abstract void Activate();
-		protected abstract void Deactivate();
-		public abstract void Dispose(bool disposing);
-		public abstract bool IsNullable(int type);
-		public abstract byte GetDimension(int type);
-		public abstract string GetTypeName(int type);
-		public abstract double GetCurrentTimestamp();
-		protected void Feed(int type, int id, InputVector vec) {
-			var del = m_onInput;
-			if (del != null) del(new InputIdentifier { Source = new InputSource { Handler = this, Type = type }, Id = id }, vec);
-		}
-	}
-
-	public struct InputSource : IEquatable<InputSource> {
-		public InputHandler Handler { get; set; }
-		public int Type { get; set; }
-		public override bool Equals(object obj) {
-			if (obj == null || !(obj is InputSource)) return false;
-			return Equals((InputSource)obj);
-		}
-		public bool Equals(InputSource other) {
-			return Handler == other.Handler && Type == other.Type;
-		}
-		public override int GetHashCode() {
-			return Handler.GetHashCode() ^ Type;
-		}
-		public override string ToString() {
-			return string.Format("{0}:{1}", ReflectionHelper.GetSimpleName(Handler.GetType()), Handler.GetTypeName(Type));
-		}
-		public static bool operator ==(InputSource lhs, InputSource rhs) {
-			return lhs.Equals(rhs);
-		}
-		public static bool operator !=(InputSource lhs, InputSource rhs) {
-			return !lhs.Equals(rhs);
-		}
-	}
-
-	public struct InputIdentifier : IEquatable<InputIdentifier> {
-		public InputSource Source { get; set; }
-		public int Id { get; set; }
-		public override bool Equals(object obj) {
-			if (obj == null || !(obj is InputIdentifier)) return false;
-			return Equals((InputIdentifier)obj);
-		}
-		public bool Equals(InputIdentifier other) {
-			return Source == other.Source && Id == other.Id;
-		}
-		public override int GetHashCode() {
-			return Source.GetHashCode() ^ ((Id << 16) | (Id >> 16));
-		}
-		public override string ToString() {
-			return string.Format("{0},{1}", Source, Id);
-		}
-		public static bool operator ==(InputIdentifier lhs, InputIdentifier rhs) {
-			return lhs.Equals(rhs);
-		}
-		public static bool operator !=(InputIdentifier lhs, InputIdentifier rhs) {
-			return !lhs.Equals(rhs);
-		}
-	}
-
-	public struct InputVector {
-		public double Time { get; set; }
-		public bool IsNull { get; set; }
-		public Vector3 Vector { get; set; }
-		public InputVector(double time) {
-			Time = time;
-			IsNull = true;
-			Vector = default(Vector3);
-		}
-		public InputVector(double time, Vector3 vector) {
-			Time = time;
-			IsNull = false;
-			Vector = vector;
-		}
-		public override string ToString() {
-			if (IsNull) return string.Format("null@{0}", Time);
-			else return string.Format("{0}@{1}", Vector.ToString("G9"), Time);
-		}
-	}
-}

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

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

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

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Cryville.Common.Unity.Input {
-	public class InputManager {
-		static readonly HashSet<Type> HandlerRegistries = new HashSet<Type> {
-			typeof(WindowsPointerHandler),
-			typeof(UnityKeyHandler<UnityKeyboardReceiver>),
-			typeof(UnityKeyHandler<UnityMouseButtonReceiver>),
-			typeof(UnityMouseHandler),
-			typeof(UnityTouchHandler),
-		};
-		readonly HashSet<InputHandler> _handlers = new HashSet<InputHandler>();
-		readonly Dictionary<Type, InputHandler> _typemap = new Dictionary<Type, InputHandler>();
-		public InputManager() {
-			foreach (var t in HandlerRegistries) {
-				try {
-					if (!typeof(InputHandler).IsAssignableFrom(t)) continue;
-					var h = (InputHandler)ReflectionHelper.InvokeEmptyConstructor(t);
-					_typemap.Add(t, h);
-					_handlers.Add(h);
-					Logger.Log("main", 1, "Input", "Initialized {0}", ReflectionHelper.GetSimpleName(t));
-				}
-				catch (TargetInvocationException ex) {
-					Logger.Log("main", 1, "Input", "Cannot initialize {0}: {1}", ReflectionHelper.GetSimpleName(t), ex.InnerException.Message);
-				}
-			}
-		}
-		public InputHandler GetHandler(string name) {
-			return _typemap[Type.GetType(name)];
-		}
-		public void EnumerateHandlers(Action<InputHandler> cb) {
-			foreach (var h in _handlers) cb(h);
-		}
-	}
-
-	public struct InputEvent {
-		public InputIdentifier Id { get; set; }
-		public InputVector From { get; set; }
-		public InputVector To { get; set; }
-		public override string ToString() {
-			return string.Format("[{0}] {1} -> {2}", Id, From, To);
-		}
-	}
-}

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

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: aaf7daeaf7afb3146b3eea2a07f88055
-timeCreated: 1611035810
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,528 +0,0 @@
-namespace Cryville.Common.Unity.Input {
-	public enum WindowMessages : uint {
-		WM_NULL                       = 0x0000,
-		WM_CREATE                     = 0x0001,
-		WM_DESTROY                    = 0x0002,
-		WM_MOVE                       = 0x0003,
-		WM_SIZE                       = 0x0005,
-
-		WM_ACTIVATE                   = 0x0006,
-/*
- * WM_ACTIVATE state values
- */
-	    WA_INACTIVE    = 0,
-	    WA_ACTIVE      = 1,
-	    WA_CLICKACTIVE = 2,
-
-		WM_SETFOCUS                   = 0x0007,
-		WM_KILLFOCUS                  = 0x0008,
-		WM_ENABLE                     = 0x000A,
-		WM_SETREDRAW                  = 0x000B,
-		WM_SETTEXT                    = 0x000C,
-		WM_GETTEXT                    = 0x000D,
-		WM_GETTEXTLENGTH              = 0x000E,
-		WM_PAINT                      = 0x000F,
-		WM_CLOSE                      = 0x0010,
-//#ifndef _WIN32_WCE
-		WM_QUERYENDSESSION            = 0x0011,
-		WM_QUERYOPEN                  = 0x0013,
-		WM_ENDSESSION                 = 0x0016,
-//#endif
-		WM_QUIT                       = 0x0012,
-		WM_ERASEBKGND                 = 0x0014,
-		WM_SYSCOLORCHANGE             = 0x0015,
-		WM_SHOWWINDOW                 = 0x0018,
-		WM_WININICHANGE               = 0x001A,
-//#if(WINVER >= 0x0400)
-		WM_SETTINGCHANGE              = WM_WININICHANGE,
-//#endif /* WINVER >= 0x0400 */
-
-
-		WM_DEVMODECHANGE              = 0x001B,
-		WM_ACTIVATEAPP                = 0x001C,
-		WM_FONTCHANGE                 = 0x001D,
-		WM_TIMECHANGE                 = 0x001E,
-		WM_CANCELMODE                 = 0x001F,
-		WM_SETCURSOR                  = 0x0020,
-		WM_MOUSEACTIVATE              = 0x0021,
-		WM_CHILDACTIVATE              = 0x0022,
-		WM_QUEUESYNC                  = 0x0023,
-
-		WM_GETMINMAXINFO              = 0x0024,
-		WM_PAINTICON                  = 0x0026,
-		WM_ICONERASEBKGND             = 0x0027,
-		WM_NEXTDLGCTL                 = 0x0028,
-		WM_SPOOLERSTATUS              = 0x002A,
-		WM_DRAWITEM                   = 0x002B,
-		WM_MEASUREITEM                = 0x002C,
-		WM_DELETEITEM                 = 0x002D,
-		WM_VKEYTOITEM                 = 0x002E,
-		WM_CHARTOITEM                 = 0x002F,
-		WM_SETFONT                    = 0x0030,
-		WM_GETFONT                    = 0x0031,
-		WM_SETHOTKEY                  = 0x0032,
-		WM_GETHOTKEY                  = 0x0033,
-		WM_QUERYDRAGICON              = 0x0037,
-		WM_COMPAREITEM                = 0x0039,
-//#if(WINVER >= 0x0500)
-//#ifndef _WIN32_WCE
-		WM_GETOBJECT                  = 0x003D,
-//#endif
-//#endif /* WINVER >= 0x0500 */
-		WM_COMPACTING                 = 0x0041,
-		WM_COMMNOTIFY                 = 0x0044,  /* no longer suported */
-		WM_WINDOWPOSCHANGING          = 0x0046,
-		WM_WINDOWPOSCHANGED           = 0x0047,
-
-		WM_POWER                      = 0x0048,
-/*
- * wParam for WM_POWER window message and DRV_POWER driver notification
- */
-		/*PWR_OK             = 1,
-		PWR_FAIL           = (-1),
-		PWR_SUSPENDREQUEST = 1,
-		PWR_SUSPENDRESUME  = 2,
-		PWR_CRITICALRESUME = 3,*/
-
-		WM_COPYDATA                   = 0x004A,
-		WM_CANCELJOURNAL              = 0x004B,
-
-
-//#if(WINVER >= 0x0400)
-		WM_NOTIFY                     = 0x004E,
-		WM_INPUTLANGCHANGEREQUEST     = 0x0050,
-		WM_INPUTLANGCHANGE            = 0x0051,
-		WM_TCARD                      = 0x0052,
-		WM_HELP                       = 0x0053,
-		WM_USERCHANGED                = 0x0054,
-		WM_NOTIFYFORMAT               = 0x0055,
-
-		NFR_ANSI                      =      1,
-		NFR_UNICODE                   =      2,
-		NF_QUERY                      =      3,
-		NF_REQUERY                    =      4,
-
-		WM_CONTEXTMENU                = 0x007B,
-		WM_STYLECHANGING              = 0x007C,
-		WM_STYLECHANGED               = 0x007D,
-		WM_DISPLAYCHANGE              = 0x007E,
-		WM_GETICON                    = 0x007F,
-		WM_SETICON                    = 0x0080,
-//#endif /* WINVER >= 0x0400 */
-
-		WM_NCCREATE                   = 0x0081,
-		WM_NCDESTROY                  = 0x0082,
-		WM_NCCALCSIZE                 = 0x0083,
-		WM_NCHITTEST                  = 0x0084,
-		WM_NCPAINT                    = 0x0085,
-		WM_NCACTIVATE                 = 0x0086,
-		WM_GETDLGCODE                 = 0x0087,
-//#ifndef _WIN32_WCE
-		WM_SYNCPAINT                  = 0x0088,
-//#endif
-		WM_NCMOUSEMOVE                = 0x00A0,
-		WM_NCLBUTTONDOWN              = 0x00A1,
-		WM_NCLBUTTONUP                = 0x00A2,
-		WM_NCLBUTTONDBLCLK            = 0x00A3,
-		WM_NCRBUTTONDOWN              = 0x00A4,
-		WM_NCRBUTTONUP                = 0x00A5,
-		WM_NCRBUTTONDBLCLK            = 0x00A6,
-		WM_NCMBUTTONDOWN              = 0x00A7,
-		WM_NCMBUTTONUP                = 0x00A8,
-		WM_NCMBUTTONDBLCLK            = 0x00A9,
-
-
-
-//#if(_WIN32_WINNT >= 0x0500)
-		WM_NCXBUTTONDOWN              = 0x00AB,
-		WM_NCXBUTTONUP                = 0x00AC,
-		WM_NCXBUTTONDBLCLK            = 0x00AD,
-//#endif /* _WIN32_WINNT >= 0x0500 */
-
-
-//#if(_WIN32_WINNT >= 0x0501)
-		WM_INPUT_DEVICE_CHANGE        = 0x00FE,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-
-//#if(_WIN32_WINNT >= 0x0501)
-		WM_INPUT                      = 0x00FF,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-
-		WM_KEYFIRST                   = 0x0100,
-		WM_KEYDOWN                    = 0x0100,
-		WM_KEYUP                      = 0x0101,
-		WM_CHAR                       = 0x0102,
-		WM_DEADCHAR                   = 0x0103,
-		WM_SYSKEYDOWN                 = 0x0104,
-		WM_SYSKEYUP                   = 0x0105,
-		WM_SYSCHAR                    = 0x0106,
-		WM_SYSDEADCHAR                = 0x0107,
-//#if(_WIN32_WINNT >= 0x0501)
-		WM_UNICHAR                    = 0x0109,
-		WM_KEYLAST                    = 0x0109,
-		UNICODE_NOCHAR                = 0xFFFF,
-//#else
-		WM_KEYLAST__WIN2000           = 0x0108,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-
-//#if(WINVER >= 0x0400)
-		WM_IME_STARTCOMPOSITION       = 0x010D,
-		WM_IME_ENDCOMPOSITION         = 0x010E,
-		WM_IME_COMPOSITION            = 0x010F,
-		WM_IME_KEYLAST                = 0x010F,
-//#endif /* WINVER >= 0x0400 */
-
-		WM_INITDIALOG                 = 0x0110,
-		WM_COMMAND                    = 0x0111,
-		WM_SYSCOMMAND                 = 0x0112,
-		WM_TIMER                      = 0x0113,
-		WM_HSCROLL                    = 0x0114,
-		WM_VSCROLL                    = 0x0115,
-		WM_INITMENU                   = 0x0116,
-		WM_INITMENUPOPUP              = 0x0117,
-//#if(WINVER >= 0x0601)
-		WM_GESTURE                    = 0x0119,
-		WM_GESTURENOTIFY              = 0x011A,
-//#endif /* WINVER >= 0x0601 */
-		WM_MENUSELECT                 = 0x011F,
-		WM_MENUCHAR                   = 0x0120,
-		WM_ENTERIDLE                  = 0x0121,
-//#if(WINVER >= 0x0500)
-//#ifndef _WIN32_WCE
-		WM_MENURBUTTONUP              = 0x0122,
-		WM_MENUDRAG                   = 0x0123,
-		WM_MENUGETOBJECT              = 0x0124,
-		WM_UNINITMENUPOPUP            = 0x0125,
-		WM_MENUCOMMAND                = 0x0126,
-
-//#ifndef _WIN32_WCE
-//#if(_WIN32_WINNT >= 0x0500)
-		WM_CHANGEUISTATE              = 0x0127,
-		WM_UPDATEUISTATE              = 0x0128,
-		WM_QUERYUISTATE               = 0x0129,
-
-/*
- * LOWORD(wParam) values in WM_*UISTATE*
- */
-		UIS_SET                       = 1,
-		UIS_CLEAR                     = 2,
-		UIS_INITIALIZE                = 3,
-
-/*
- * HIWORD(wParam) values in WM_*UISTATE*
- */
-		UISF_HIDEFOCUS                = 0x1,
-		UISF_HIDEACCEL                = 0x2,
-//#if(_WIN32_WINNT >= 0x0501)
-		UISF_ACTIVE                   = 0x4,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-//#endif /* _WIN32_WINNT >= 0x0500 */
-//#endif
-
-//#endif
-//#endif /* WINVER >= 0x0500 */
-
-		WM_CTLCOLORMSGBOX             = 0x0132,
-		WM_CTLCOLOREDIT               = 0x0133,
-		WM_CTLCOLORLISTBOX            = 0x0134,
-		WM_CTLCOLORBTN                = 0x0135,
-		WM_CTLCOLORDLG                = 0x0136,
-		WM_CTLCOLORSCROLLBAR          = 0x0137,
-		WM_CTLCOLORSTATIC             = 0x0138,
-		MN_GETHMENU                   = 0x01E1,
-
-		WM_MOUSEFIRST                 = 0x0200,
-		WM_MOUSEMOVE                  = 0x0200,
-		WM_LBUTTONDOWN                = 0x0201,
-		WM_LBUTTONUP                  = 0x0202,
-		WM_LBUTTONDBLCLK              = 0x0203,
-		WM_RBUTTONDOWN                = 0x0204,
-		WM_RBUTTONUP                  = 0x0205,
-		WM_RBUTTONDBLCLK              = 0x0206,
-		WM_MBUTTONDOWN                = 0x0207,
-		WM_MBUTTONUP                  = 0x0208,
-		WM_MBUTTONDBLCLK              = 0x0209,
-//#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
-		WM_MOUSEWHEEL                 = 0x020A,
-//#endif
-//#if (_WIN32_WINNT >= 0x0500)
-		WM_XBUTTONDOWN                = 0x020B,
-		WM_XBUTTONUP                  = 0x020C,
-		WM_XBUTTONDBLCLK              = 0x020D,
-//#endif
-//#if (_WIN32_WINNT >= 0x0600)
-		WM_MOUSEHWHEEL                = 0x020E,
-//#endif
-
-//#if (_WIN32_WINNT >= 0x0600)
-		WM_MOUSELAST                  = 0x020E,
-//#elif (_WIN32_WINNT >= 0x0500)
-		WM_MOUSELAST__WIN2000         = 0x020D,
-//#elif (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
-		WM_MOUSELAST__WIN4            = 0x020A,
-//#else
-		WM_MOUSELAST__WIN3            = 0x0209,
-//#endif /* (_WIN32_WINNT >= 0x0600) */
-
-
-//#if(_WIN32_WINNT >= 0x0400)
-/* Value for rolling one detent */
-		WHEEL_DELTA                   = 120,
-		//GET_WHEEL_DELTA_WPARAM(wParam)  ((short)HIWORD(wParam))
-
-/* Setting to scroll one page for SPI_GET/SETWHEELSCROLLLINES */
-		WHEEL_PAGESCROLL              = (uint.MaxValue),
-//#endif /* _WIN32_WINNT >= 0x0400 */
-
-//#if(_WIN32_WINNT >= 0x0500)
-		//GET_KEYSTATE_WPARAM(wParam)     (LOWORD(wParam))
-		//GET_NCHITTEST_WPARAM(wParam)    ((short)LOWORD(wParam))
-		//GET_XBUTTON_WPARAM(wParam)      (HIWORD(wParam))
-
-/* XButton values are WORD flags */
-		XBUTTON1    = 0x0001,
-		XBUTTON2    = 0x0002,
-/* Were there to be an XBUTTON3, its value would be 0x0004 */
-//#endif /* _WIN32_WINNT >= 0x0500 */
-
-		WM_PARENTNOTIFY               = 0x0210,
-		WM_ENTERMENULOOP              = 0x0211,
-		WM_EXITMENULOOP               = 0x0212,
-
-//#if(WINVER >= 0x0400)
-		WM_NEXTMENU                   = 0x0213,
-		WM_SIZING                     = 0x0214,
-		WM_CAPTURECHANGED             = 0x0215,
-		WM_MOVING                     = 0x0216,
-		WM_POWERBROADCAST             = 0x0218,
-//#endif /* WINVER >= 0x0400 */
-//#if(WINVER >= 0x0400)
-		WM_DEVICECHANGE               = 0x0219,
-//#endif /* WINVER >= 0x0400 */
-
-		WM_MDICREATE                  = 0x0220,
-		WM_MDIDESTROY                 = 0x0221,
-		WM_MDIACTIVATE                = 0x0222,
-		WM_MDIRESTORE                 = 0x0223,
-		WM_MDINEXT                    = 0x0224,
-		WM_MDIMAXIMIZE                = 0x0225,
-		WM_MDITILE                    = 0x0226,
-		WM_MDICASCADE                 = 0x0227,
-		WM_MDIICONARRANGE             = 0x0228,
-		WM_MDIGETACTIVE               = 0x0229,
-
-
-		WM_MDISETMENU                 = 0x0230,
-		WM_ENTERSIZEMOVE              = 0x0231,
-		WM_EXITSIZEMOVE               = 0x0232,
-		WM_DROPFILES                  = 0x0233,
-		WM_MDIREFRESHMENU             = 0x0234,
-
-//#if(WINVER >= 0x0602)
-		WM_POINTERDEVICECHANGE        = 0x238,
-		WM_POINTERDEVICEINRANGE       = 0x239,
-		WM_POINTERDEVICEOUTOFRANGE    = 0x23A,
-//#endif /* WINVER >= 0x0602 */
-
-
-//#if(WINVER >= 0x0601)
-		WM_TOUCH                      = 0x0240,
-//#endif /* WINVER >= 0x0601 */
-
-//#if(WINVER >= 0x0602)
-		WM_NCPOINTERUPDATE            = 0x0241,
-		WM_NCPOINTERDOWN              = 0x0242,
-		WM_NCPOINTERUP                = 0x0243,
-		WM_POINTERUPDATE              = 0x0245,
-		WM_POINTERDOWN                = 0x0246,
-		WM_POINTERUP                  = 0x0247,
-		WM_POINTERENTER               = 0x0249,
-		WM_POINTERLEAVE               = 0x024A,
-		WM_POINTERACTIVATE            = 0x024B,
-		WM_POINTERCAPTURECHANGED      = 0x024C,
-		WM_TOUCHHITTESTING            = 0x024D,
-		WM_POINTERWHEEL               = 0x024E,
-		WM_POINTERHWHEEL              = 0x024F,
-		DM_POINTERHITTEST             = 0x0250,
-		WM_POINTERROUTEDTO            = 0x0251,
-		WM_POINTERROUTEDAWAY          = 0x0252,
-		WM_POINTERROUTEDRELEASED      = 0x0253,
-//#endif /* WINVER >= 0x0602 */
-
-
-//#if(WINVER >= 0x0400)
-		WM_IME_SETCONTEXT             = 0x0281,
-		WM_IME_NOTIFY                 = 0x0282,
-		WM_IME_CONTROL                = 0x0283,
-		WM_IME_COMPOSITIONFULL        = 0x0284,
-		WM_IME_SELECT                 = 0x0285,
-		WM_IME_CHAR                   = 0x0286,
-//#endif /* WINVER >= 0x0400 */
-//#if(WINVER >= 0x0500)
-		WM_IME_REQUEST                = 0x0288,
-//#endif /* WINVER >= 0x0500 */
-//#if(WINVER >= 0x0400)
-		WM_IME_KEYDOWN                = 0x0290,
-		WM_IME_KEYUP                  = 0x0291,
-//#endif /* WINVER >= 0x0400 */
-
-//#if((_WIN32_WINNT >= 0x0400) || (WINVER >= 0x0500))
-		WM_MOUSEHOVER                 = 0x02A1,
-		WM_MOUSELEAVE                 = 0x02A3,
-//#endif
-//#if(WINVER >= 0x0500)
-		WM_NCMOUSEHOVER               = 0x02A0,
-		WM_NCMOUSELEAVE               = 0x02A2,
-//#endif /* WINVER >= 0x0500 */
-
-//#if(_WIN32_WINNT >= 0x0501)
-		WM_WTSSESSION_CHANGE          = 0x02B1,
-
-		WM_TABLET_FIRST               = 0x02c0,
-		WM_TABLET_LAST                = 0x02df,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-
-//#if(WINVER >= 0x0601)
-		WM_DPICHANGED                 = 0x02E0,
-//#endif /* WINVER >= 0x0601 */
-//#if(WINVER >= 0x0605)
-		WM_DPICHANGED_BEFOREPARENT    = 0x02E2,
-		WM_DPICHANGED_AFTERPARENT     = 0x02E3,
-		WM_GETDPISCALEDSIZE           = 0x02E4,
-//#endif /* WINVER >= 0x0605 */
-
-
-		WM_CUT                        = 0x0300,
-		WM_COPY                       = 0x0301,
-		WM_PASTE                      = 0x0302,
-		WM_CLEAR                      = 0x0303,
-		WM_UNDO                       = 0x0304,
-		WM_RENDERFORMAT               = 0x0305,
-		WM_RENDERALLFORMATS           = 0x0306,
-		WM_DESTROYCLIPBOARD           = 0x0307,
-		WM_DRAWCLIPBOARD              = 0x0308,
-		WM_PAINTCLIPBOARD             = 0x0309,
-		WM_VSCROLLCLIPBOARD           = 0x030A,
-		WM_SIZECLIPBOARD              = 0x030B,
-		WM_ASKCBFORMATNAME            = 0x030C,
-		WM_CHANGECBCHAIN              = 0x030D,
-		WM_HSCROLLCLIPBOARD           = 0x030E,
-		WM_QUERYNEWPALETTE            = 0x030F,
-		WM_PALETTEISCHANGING          = 0x0310,
-		WM_PALETTECHANGED             = 0x0311,
-		WM_HOTKEY                     = 0x0312,
-
-//#if(WINVER >= 0x0400)
-		WM_PRINT                      = 0x0317,
-		WM_PRINTCLIENT                = 0x0318,
-//#endif /* WINVER >= 0x0400 */
-
-//#if(_WIN32_WINNT >= 0x0500)
-		WM_APPCOMMAND                 = 0x0319,
-//#endif /* _WIN32_WINNT >= 0x0500 */
-
-//#if(_WIN32_WINNT >= 0x0501)
-		WM_THEMECHANGED               = 0x031A,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-
-
-//#if(_WIN32_WINNT >= 0x0501)
-		WM_CLIPBOARDUPDATE            = 0x031D,
-//#endif /* _WIN32_WINNT >= 0x0501 */
-
-//#if(_WIN32_WINNT >= 0x0600)
-		WM_DWMCOMPOSITIONCHANGED      = 0x031E,
-		WM_DWMNCRENDERINGCHANGED      = 0x031F,
-		WM_DWMCOLORIZATIONCOLORCHANGED= 0x0320,
-		WM_DWMWINDOWMAXIMIZEDCHANGE   = 0x0321,
-//#endif /* _WIN32_WINNT >= 0x0600 */
-
-//#if(_WIN32_WINNT >= 0x0601)
-		WM_DWMSENDICONICTHUMBNAIL         = 0x0323,
-		WM_DWMSENDICONICLIVEPREVIEWBITMAP = 0x0326,
-//#endif /* _WIN32_WINNT >= 0x0601 */
-
-
-//#if(WINVER >= 0x0600)
-		WM_GETTITLEBARINFOEX          = 0x033F,
-//#endif /* WINVER >= 0x0600 */
-
-//#if(WINVER >= 0x0400)
-//#endif /* WINVER >= 0x0400 */
-
-
-//#if(WINVER >= 0x0400)
-		WM_HANDHELDFIRST              = 0x0358,
-		WM_HANDHELDLAST               = 0x035F,
-
-		WM_AFXFIRST                   = 0x0360,
-		WM_AFXLAST                    = 0x037F,
-//#endif /* WINVER >= 0x0400 */
-
-		WM_PENWINFIRST                = 0x0380,
-		WM_PENWINLAST                 = 0x038F,
-
-
-//#if(WINVER >= 0x0400)
-		WM_APP                        = 0x8000,
-//#endif /* WINVER >= 0x0400 */
-
-
-/*
- * NOTE: All Message Numbers below 0x0400 are RESERVED.
- *
- * Private Window Messages Start Here:
- */
-		WM_USER                       = 0x0400,
-
-//#if(WINVER >= 0x0400)
-
-/*  wParam for WM_SIZING message  */
-		WMSZ_LEFT         = 1,
-		WMSZ_RIGHT        = 2,
-		WMSZ_TOP          = 3,
-		WMSZ_TOPLEFT      = 4,
-		WMSZ_TOPRIGHT     = 5,
-		WMSZ_BOTTOM       = 6,
-		WMSZ_BOTTOMLEFT   = 7,
-		WMSZ_BOTTOMRIGHT  = 8,
-//#endif /* WINVER >= 0x0400 */
-
-//#ifndef NONCMESSAGES
-
-/*
- * WM_NCHITTEST and MOUSEHOOKSTRUCT Mouse Position Codes
- */
-		/*HTERROR           = (-2),
-		HTTRANSPARENT     = (-1),
-		HTNOWHERE         = 0,
-		HTCLIENT          = 1,
-		HTCAPTION         = 2,
-		HTSYSMENU         = 3,
-		HTGROWBOX         = 4,
-		HTSIZE            = HTGROWBOX,
-		HTMENU            = 5,
-		HTHSCROLL         = 6,
-		HTVSCROLL         = 7,
-		HTMINBUTTON       = 8,
-		HTMAXBUTTON       = 9,
-		HTLEFT            = 10,
-		HTRIGHT           = 11,
-		HTTOP             = 12,
-		HTTOPLEFT         = 13,
-		HTTOPRIGHT        = 14,
-		HTBOTTOM          = 15,
-		HTBOTTOMLEFT      = 16,
-		HTBOTTOMRIGHT     = 17,
-		HTBORDER          = 18,
-		HTREDUCE          = HTMINBUTTON,
-		HTZOOM            = HTMAXBUTTON,
-		HTSIZEFIRST       = HTLEFT,
-		HTSIZELAST        = HTBOTTOMRIGHT,
-//#if(WINVER >= 0x0400)
-		HTOBJECT          = 19,
-		HTCLOSE           = 20,
-		HTHELP            = 21,
-//#endif /* WINVER >= 0x0400 */
-	}
-}

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

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 466300df0840ba54d95240e3a800a642
-timeCreated: 1611373988
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,252 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace Cryville.Common.Unity.Input {
-	static class NativeMethods {
-		[StructLayout(LayoutKind.Sequential)]
-		public struct MONITORINFO {
-			public int cbSize;
-			public RECT rcMonitor;
-			public RECT rcWork;
-			public uint dwFlags;
-		}
-		
-		[StructLayout(LayoutKind.Sequential)]
-		public struct RECT {
-			public int Left, Top, Right, Bottom;
-			
-			public RECT(int left, int top, int right, int bottom) {
-				Left = left;
-				Top = top;
-				Right = right;
-				Bottom = bottom;
-			}
-			
-			public int X {
-				get { return Left; }
-				set {
-					Right -= (Left - value);
-					Left = value;
-				}
-			}
-			
-			public int Y {
-				get { return Top; }
-				set {
-					Bottom -= (Top - value);
-					Top = value;
-				}
-			}
-			
-			public int Height {
-				get { return Bottom - Top; }
-				set { Bottom = value + Top; }
-			}
-			
-			public int Width {
-				get { return Right - Left; }
-				set { Right = value + Left; }
-			}
-		}
-		
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool GetTouchInputInfo(IntPtr hTouchInput, int cInputs, [Out] TOUCHINPUT[] pInputs, int cbSize);
-		[StructLayout(LayoutKind.Sequential)]
-		public struct TOUCHINPUT {
-			public int x;
-			public int y;
-			public IntPtr hSource;
-			public int dwID;
-			public TOUCHINPUT_Flags dwFlags;
-			public TOUCHINPUT_Mask dwMask;
-			public int dwTime;
-			public IntPtr dwExtraInfo;
-			public int cxContact;
-			public int cyContact;
-		}
-		[Flags]
-		public enum TOUCHINPUT_Flags : int {
-			TOUCHEVENTF_MOVE       = 0x0001,
-			TOUCHEVENTF_DOWN       = 0x0002,
-			TOUCHEVENTF_UP         = 0x0004,
-			TOUCHEVENTF_INRANGE    = 0x0008,
-			TOUCHEVENTF_PRIMARY    = 0x0010,
-			TOUCHEVENTF_NOCOALESCE = 0x0020,
-			TOUCHEVENTF_PEN        = 0x0040,
-			TOUCHEVENTF_PALM       = 0x0080,
-		}
-		[Flags]
-		public enum TOUCHINPUT_Mask : int {
-			TOUCHINPUTMASKF_CONTACTAREA    = 0x0004,
-			TOUCHINPUTMASKF_EXTRAINFO      = 0x0002,
-			TOUCHINPUTMASKF_TIMEFROMSYSTEM = 0x0001,
-		}
-
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool GetPointerInfo(int pointerID, ref POINTER_INFO pPointerInfo);
-		[StructLayout(LayoutKind.Sequential, Pack = 1)]
-		public struct POINTER_INFO {
-			public POINTER_INPUT_TYPE pointerType;
-			public UInt32 pointerId;
-			public UInt32 frameId;
-			public POINTER_FLAGS pointerFlags;
-			public IntPtr sourceDevice;
-			public IntPtr hwndTarget;
-			public POINT ptPixelLocation;
-			public POINT ptHimetricLocation;
-			public POINT ptPixelLocationRaw;
-			public POINT ptHimetricLocationRaw;
-			public UInt32 dwTime;
-			public UInt32 historyCount;
-			public Int32 inputData;
-			public UInt32 dwKeyStates;
-			public UInt64 PerformanceCount;
-			public POINTER_BUTTON_CHANGE_TYPE ButtonChangeType;
-		}
-		public enum POINTER_INPUT_TYPE {
-			PT_POINTER  = 0x00000001,
-			PT_TOUCH    = 0x00000002,
-			PT_PEN      = 0x00000003,
-			PT_MOUSE    = 0x00000004,
-			PT_TOUCHPAD = 0x00000005,
-		}
-		[Flags]
-		public enum POINTER_FLAGS {
-			POINTER_FLAG_NONE           = 0x00000000,
-			POINTER_FLAG_NEW            = 0x00000001,
-			POINTER_FLAG_INRANGE        = 0x00000002,
-			POINTER_FLAG_INCONTACT      = 0x00000004,
-			POINTER_FLAG_FIRSTBUTTON    = 0x00000010,
-			POINTER_FLAG_SECONDBUTTON   = 0x00000020,
-			POINTER_FLAG_THIRDBUTTON    = 0x00000040,
-			POINTER_FLAG_FOURTHBUTTON   = 0x00000080,
-			POINTER_FLAG_FIFTHBUTTON    = 0x00000100,
-			POINTER_FLAG_PRIMARY        = 0x00002000,
-			POINTER_FLAG_CONFIDENCE     = 0x00004000,
-			POINTER_FLAG_CANCELED       = 0x00008000,
-			POINTER_FLAG_DOWN           = 0x00010000,
-			POINTER_FLAG_UPDATE         = 0x00020000,
-			POINTER_FLAG_UP             = 0x00040000,
-			POINTER_FLAG_WHEEL          = 0x00080000,
-			POINTER_FLAG_HWHEEL         = 0x00100000,
-			POINTER_FLAG_CAPTURECHANGED = 0x00200000,
-			POINTER_FLAG_HASTRANSFORM   = 0x00400000,
-		}
-		public enum POINTER_BUTTON_CHANGE_TYPE {
-			POINTER_CHANGE_NONE,
-			POINTER_CHANGE_FIRSTBUTTON_DOWN,
-			POINTER_CHANGE_FIRSTBUTTON_UP,
-			POINTER_CHANGE_SECONDBUTTON_DOWN,
-			POINTER_CHANGE_SECONDBUTTON_UP,
-			POINTER_CHANGE_THIRDBUTTON_DOWN,
-			POINTER_CHANGE_THIRDBUTTON_UP,
-			POINTER_CHANGE_FOURTHBUTTON_DOWN,
-			POINTER_CHANGE_FOURTHBUTTON_UP,
-			POINTER_CHANGE_FIFTHBUTTON_DOWN,
-			POINTER_CHANGE_FIFTHBUTTON_UP,
-		}
-		
-		[StructLayout(LayoutKind.Sequential)]
-		public struct POINT {
-			public int X;
-			public int Y;
-		}
-		
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool GetPointerTouchInfo(int pointerId, ref POINTER_TOUCH_INFO touchInfo);
-		[StructLayout(LayoutKind.Sequential)]
-		public struct POINTER_TOUCH_INFO {
-			public POINTER_INFO pointerInfo;
-			public TOUCH_FLAGS  touchFlags;
-			public TOUCH_MASK   touchMask;
-			public RECT         rcContact;
-			public RECT         rcContactRaw;
-			public uint         orientation;
-			public uint         pressure;
-		}
-		[Flags]
-		public enum TOUCH_FLAGS {
-			TOUCH_FLAG_NONE = 0x00000000,
-		}
-		[Flags]
-		public enum TOUCH_MASK {
-			TOUCH_MASK_NONE = 0x00000000,
-			TOUCH_MASK_CONTACTAREA = 0x00000001,
-			TOUCH_MASK_ORIENTATION = 0x00000002,
-			TOUCH_MASK_PRESSURE = 0x00000004,
-		}
-		
-		[DllImport("user32.dll")]
-		public static extern IntPtr EnableMouseInPointer(bool value);
-
-		[DllImport("kernel32.dll")]
-		public static extern uint GetCurrentThreadId();
-		[DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-		public static extern int GetClassName(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-		public delegate bool EnumWindowsProc(IntPtr hWnd,IntPtr lParam);
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool EnumThreadWindows(uint dwThreadId, EnumWindowsProc lpEnumFunc, IntPtr lParam);
-		
-		[DllImport("user32.dll")]
-		public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
-		
-		[DllImport("user32.dll")]
-		public static extern bool GetMonitorInfo(IntPtr hMonitor, ref MONITORINFO lpmi);
-		
-		[DllImport("user32.dll", EntryPoint = "SetWindowLong")]
-		public static extern int SetWindowLong32(IntPtr hWnd, int nIndex, int dwNewLong);
-		
-		[DllImport("user32.dll", EntryPoint = "SetWindowLongPtr")]
-		public static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
-		
-		[DllImport("user32.dll")]
-		public static extern IntPtr CallWindowProc(IntPtr lpPrevWndFunc, IntPtr hWnd, uint msg, IntPtr wParam,
-		                                           IntPtr lParam);
-		
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool RegisterTouchWindow(IntPtr hWnd, TOUCH_WINDOW_FLAGS ulFlags);
-		[Flags]
-		public enum TOUCH_WINDOW_FLAGS {
-			TWF_FINETOUCH = 1,
-			TWF_WANTPALM  = 2,
-		}
-		
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool UnregisterTouchWindow(IntPtr hWnd);
-
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern void CloseTouchInputHandle(IntPtr lParam);
-		
-		[DllImport("user32.dll")]
-		public static extern bool ScreenToClient(IntPtr hWnd, ref POINT lpPoint);
-
-		[DllImport("Kernel32.dll", CharSet = CharSet.Unicode)]
-		public static extern ushort GlobalAddAtom(string lpString);
-		
-		[DllImport("Kernel32.dll")]
-		public static extern ushort GlobalDeleteAtom(ushort nAtom);
-
-		[DllImport("user32.dll", CharSet = CharSet.Unicode)]
-		public static extern int SetProp(IntPtr hWnd, string lpString, int hData);
-
-		[DllImport("user32.dll", CharSet = CharSet.Unicode)]
-		public static extern int RemoveProp(IntPtr hWnd, string lpString);
-		
-		[DllImport("user32.dll", CharSet = CharSet.Auto)]
-		public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, IntPtr lParam);
-
-		[DllImport("kernel32.dll")]
-		public static extern uint QueryPerformanceFrequency(out Int64 lpFrequency);
-
-		[DllImport("kernel32.dll")]
-		public static extern uint QueryPerformanceCounter(out Int64 lpPerformanceCount);
-	}
-}

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

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: a6ff72ea2b7f71345aa19940faf026e8
-timeCreated: 1622589747
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

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

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

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

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

@@ -1,12 +0,0 @@
-using UnityEngine;
-
-namespace Cryville.Common.Unity.Input {
-	public static class UnityCameraUtils {
-		public static Vector2 ScreenToWorldPoint(Vector2 pos) {
-			Vector3 i = pos;
-			i.z = -Camera.main.transform.localPosition.z;
-			i = Camera.main.ScreenToWorldPoint(i);
-			return i;
-		}
-	}
-}

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

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

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

@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Cryville.Common.Unity.Input {
-	public class UnityKeyHandler<T> : InputHandler where T : UnityKeyReceiver<T> {
-		GameObject receiver;
-		T recvcomp;
-
-		public UnityKeyHandler() { }
-
-		protected override void Activate() {
-			receiver = new GameObject("__keyrecv__");
-			recvcomp = receiver.AddComponent<T>();
-			recvcomp.SetCallback(Feed);
-		}
-
-		protected override void Deactivate() {
-			if (receiver) GameObject.Destroy(receiver);
-		}
-
-		public override void Dispose(bool disposing) {
-			if (disposing) {
-				Deactivate();
-			}
-		}
-
-		public override bool IsNullable(int type) {
-			return false;
-		}
-
-		public override byte GetDimension(int type) {
-			return 0;
-		}
-
-		public override string GetTypeName(int type) {
-			return recvcomp.GetKeyName(type);
-		}
-
-		public override double GetCurrentTimestamp() {
-			return Time.realtimeSinceStartupAsDouble;
-		}
-	}
-
-	public abstract class UnityKeyReceiver<T> : MonoBehaviour where T : UnityKeyReceiver<T> {
-		protected Action<int, int, InputVector> Callback;
-		protected readonly HashSet<int> Keys = new HashSet<int>();
-		public void SetCallback(Action<int, int, InputVector> h) {
-			Callback = h;
-		}
-		public abstract string GetKeyName(int type);
-		void Awake() {
-			useGUILayout = false;
-		}
-		void Update() {
-			double time = Time.realtimeSinceStartupAsDouble;
-			foreach (var k in Keys) {
-				Callback(k, 0, new InputVector(time, Vector3.zero));
-			}
-		}
-	}
-
-	public class UnityKeyboardReceiver : UnityKeyReceiver<UnityKeyboardReceiver> {
-		public override string GetKeyName(int type) {
-			return Enum.GetName(typeof(KeyCode), type);
-		}
-		void OnGUI() {
-			var e = Event.current;
-			if (e.keyCode == KeyCode.None) return;
-			double time = Time.realtimeSinceStartupAsDouble;
-			var key = (int)e.keyCode;
-			switch (e.type) {
-				case EventType.KeyDown:
-					if (!Keys.Contains(key)) {
-						Callback(key, 0, new InputVector(time, Vector3.zero));
-						Keys.Add(key);
-					}
-					break;
-				case EventType.KeyUp:
-					Keys.Remove(key);
-					Callback(key, 0, new InputVector(time));
-					break;
-			}
-		}
-	}
-
-	public class UnityMouseButtonReceiver : UnityKeyReceiver<UnityMouseButtonReceiver> {
-		public override string GetKeyName(int type) {
-			switch (type) {
-				case 0: return "Mouse Left";
-				case 1: return "Mouse Right";
-				case 2: return "Mouse Middle";
-				default: return string.Format("Mouse Button {0}", type);
-			}
-		}
-		void OnGUI() {
-			var e = Event.current;
-			double time = Time.realtimeSinceStartupAsDouble;
-			var key = e.button;
-			switch (e.type) {
-				case EventType.MouseDown:
-					if (!Keys.Contains(key)) {
-						Callback(key, 0, new InputVector(time, Vector3.zero));
-						Keys.Add(key);
-					}
-					break;
-				case EventType.MouseUp:
-					Keys.Remove(key);
-					Callback(key, 0, new InputVector(time));
-					break;
-			}
-		}
-	}
-}

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

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

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

@@ -1,63 +0,0 @@
-using System;
-using UnityEngine;
-using unity = UnityEngine;
-
-namespace Cryville.Common.Unity.Input {
-	public class UnityMouseHandler : InputHandler {
-		GameObject receiver;
-
-		public UnityMouseHandler() {
-			if (!unity::Input.mousePresent) {
-				throw new NotSupportedException("Unity mouse is not supported on this device");
-			}
-		}
-
-		protected override void Activate() {
-			receiver = new GameObject("__mouserecv__");
-			receiver.AddComponent<UnityMouseReceiver>().SetHandler(this);
-		}
-
-		protected override void Deactivate() {
-			if (receiver) GameObject.Destroy(receiver);
-		}
-
-		public override void Dispose(bool disposing) {
-			if (disposing) {
-				Deactivate();
-			}
-		}
-
-		public override bool IsNullable(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException("type");
-			return false;
-		}
-
-		public override byte GetDimension(int 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("type");
-			}
-		}
-
-		public override double GetCurrentTimestamp() {
-			return Time.realtimeSinceStartupAsDouble;
-		}
-
-		public class UnityMouseReceiver : MonoBehaviour {
-			UnityMouseHandler handler;
-			public void SetHandler(UnityMouseHandler h) {
-				handler = h;
-			}
-			void Update() {
-				double time = Time.realtimeSinceStartupAsDouble;
-				Vector3 pos = UnityCameraUtils.ScreenToWorldPoint(unity::Input.mousePosition);
-				handler.Feed(0, 0, new InputVector(time, pos));
-			}
-		}
-	}
-}

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

@@ -1,73 +0,0 @@
-using System;
-using UnityEngine;
-using unity = UnityEngine;
-
-namespace Cryville.Common.Unity.Input {
-	public class UnityTouchHandler : InputHandler {
-		GameObject receiver;
-
-		public UnityTouchHandler() {
-			if (!unity::Input.touchSupported) {
-				throw new NotSupportedException("Unity touch is not supported on this device");
-			}
-		}
-
-		protected override void Activate() {
-			receiver = new GameObject("__touchrecv__");
-			receiver.AddComponent<UnityPointerReceiver>().SetHandler(this);
-		}
-
-		protected override void Deactivate() {
-			if (receiver) GameObject.Destroy(receiver);
-		}
-
-		public override void Dispose(bool disposing) {
-			if (disposing) {
-				Deactivate();
-			}
-		}
-
-		public override bool IsNullable(int type) {
-			if (type != 0) throw new ArgumentOutOfRangeException("type");
-			return true;
-		}
-
-		public override byte GetDimension(int 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("type");
-			}
-		}
-
-		public override double GetCurrentTimestamp() {
-			return Time.realtimeSinceStartupAsDouble;
-		}
-
-		public class UnityPointerReceiver : MonoBehaviour {
-			UnityTouchHandler handler;
-			public void SetHandler(UnityTouchHandler h) {
-				handler = h;
-			}
-			void Update() {
-				double time = Time.realtimeSinceStartupAsDouble;
-				for (int i = 0; i < unity::Input.touchCount; i++) {
-					var t = unity::Input.GetTouch(i);
-					Vector2 pos = UnityCameraUtils.ScreenToWorldPoint(t.position);
-					var vec = new InputVector(time, pos);
-					if (t.phase == TouchPhase.Began || t.phase == TouchPhase.Stationary || t.phase == TouchPhase.Moved) {
-						handler.Feed(0, t.fingerId, vec);
-					}
-					else if (t.phase == TouchPhase.Ended || t.phase == TouchPhase.Canceled) {
-						handler.Feed(0, t.fingerId, vec);
-						handler.Feed(0, t.fingerId, new InputVector(time));
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 93f60577ebaa5824dba5f322bbd1ad26
-timeCreated: 1618910605
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,348 +0,0 @@
-/*
- * @author Valentin Simonov / http://va.lent.in/
- * @author Valentin Frolov
- * @author Andrew David Griffiths
- * @author Cryville:Lime
- */
-using AOT;
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-using UnityEngine;
-
-namespace Cryville.Common.Unity.Input {
-	public class WindowsPointerHandler : InputHandler {
-		static WindowsPointerHandler Instance;
-
-		const string PRESS_AND_HOLD_ATOM = "MicrosoftTabletPenServiceProperty";
-		delegate IntPtr WndProcDelegate(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
-
-		public const int MONITOR_DEFAULTTONEAREST = 2;
-		readonly IntPtr hMainWindow;
-		IntPtr oldWndProcPtr;
-		IntPtr newWndProcPtr;
-		WndProcDelegate newWndProc;
-		ushort pressAndHoldAtomID;
-
-		readonly int touchInputSize;
-		readonly long freq;
-		static bool usePointerMessage;
-
-		public WindowsPointerHandler() {
-			if (Instance != null)
-				throw new InvalidOperationException("WindowsPointerHandler already created");
-			if (Environment.OSVersion.Platform != PlatformID.Win32NT)
-				throw new NotSupportedException("Windows pointer is not supported on this device");
-			Instance = this;
-			usePointerMessage = true;
-
-			hMainWindow = GetUnityWindowHandle();
-			if (hMainWindow == IntPtr.Zero) {
-				throw new InvalidOperationException("Cannot find the game window");
-			}
-			NativeMethods.QueryPerformanceFrequency(out freq);
-		retry:
-			if (usePointerMessage) {
-				try {
-					NativeMethods.EnableMouseInPointer(true);
-					Logger.Log("main", 0, "Input", "Touch input frequency: {0}", freq);
-				}
-				catch (TypeLoadException) {
-					usePointerMessage = false;
-					Logger.Log("main", 2, "Input", "Advanced touch handling not supported");
-					goto retry;
-				}
-			}
-			else {
-				touchInputSize = Marshal.SizeOf(typeof(NativeMethods.TOUCHINPUT));
-			}
-		}
-
-		public const int TABLET_DISABLE_PRESSANDHOLD = 0x00000001;
-		public const int TABLET_DISABLE_PENTAPFEEDBACK = 0x00000008;
-		public const int TABLET_DISABLE_PENBARRELFEEDBACK = 0x00000010;
-		public const int TABLET_DISABLE_FLICKS = 0x00010000;
-
-		protected override void Activate() {
-			newWndProc = WndProc;
-			newWndProcPtr = Marshal.GetFunctionPointerForDelegate(newWndProc);
-			oldWndProcPtr = SetWindowLongPtr(hMainWindow, -4, newWndProcPtr);
-			if (!NativeMethods.RegisterTouchWindow(hMainWindow, NativeMethods.TOUCH_WINDOW_FLAGS.TWF_WANTPALM)) {
-				throw new InvalidOperationException("Failed to register touch window");
-			}
-			pressAndHoldAtomID = NativeMethods.GlobalAddAtom(PRESS_AND_HOLD_ATOM);
-			NativeMethods.SetProp(hMainWindow, PRESS_AND_HOLD_ATOM,
-				TABLET_DISABLE_PRESSANDHOLD | // disables press and hold (right-click) gesture
-				TABLET_DISABLE_PENTAPFEEDBACK | // disables UI feedback on pen up (waves)
-				TABLET_DISABLE_PENBARRELFEEDBACK | // disables UI feedback on pen button down (circle)
-				TABLET_DISABLE_FLICKS // disables pen flicks (back, forward, drag down, drag up);
-			);
-		}
-
-		protected override void Deactivate() {
-			if (pressAndHoldAtomID != 0) {
-				NativeMethods.RemoveProp(hMainWindow, PRESS_AND_HOLD_ATOM);
-				NativeMethods.GlobalDeleteAtom(pressAndHoldAtomID);
-			}
-			if (!NativeMethods.UnregisterTouchWindow(hMainWindow)) {
-				throw new InvalidOperationException("Failed to unregister touch window");
-			}
-			SetWindowLongPtr(hMainWindow, -4, oldWndProcPtr);
-			newWndProcPtr = IntPtr.Zero;
-			newWndProc = null;
-		}
-
-		const string UnityWindowClassName = "UnityWndClass";
-
-		static IntPtr _windowHandle;
-		public static IntPtr GetUnityWindowHandle() {
-			uint threadId = NativeMethods.GetCurrentThreadId();
-			NativeMethods.EnumThreadWindows(
-				threadId,
-				UnityWindowFilter,
-				IntPtr.Zero
-			);
-			return _windowHandle;
-		}
-
-		[MonoPInvokeCallback(typeof(NativeMethods.EnumWindowsProc))]
-		public static bool UnityWindowFilter(IntPtr hWnd, IntPtr lParam) {
-			var classText = new StringBuilder(UnityWindowClassName.Length + 1);
-			NativeMethods.GetClassName(hWnd, classText, classText.Capacity);
-			if (classText.ToString() == UnityWindowClassName) {
-				_windowHandle = hWnd;
-				return false;
-			}
-			return true;
-		}
-
-		public override bool IsNullable(int type) {
-			return true;
-		}
-
-		public override byte GetDimension(int type) {
-			return 2;
-		}
-
-		public override string GetTypeName(int type) {
-			switch (type) {
-				case 0: return "Windows Pointer Unknown";
-				case 1: return "Windows Pointer Pointer";
-				case 2: return "Windows Pointer Touch";
-				case 3: return "Windows Pointer Pen";
-				case 4: return "Windows Pointer Mouse";
-				case 5: return "Windows Pointer Touch Pad";
-				case 255: return "Windows Touch";
-				default: throw new ArgumentOutOfRangeException(nameof(type));
-			}
-		}
-
-		public override double GetCurrentTimestamp() {
-			long tick;
-			NativeMethods.QueryPerformanceCounter(out tick);
-			return (double)tick / freq;
-		}
-
-		public override void Dispose(bool disposing) {
-			if (disposing) {
-				Deactivate();
-				if (usePointerMessage)
-					NativeMethods.EnableMouseInPointer(false);
-			}
-			Instance = null;
-		}
-
-		[MonoPInvokeCallback(typeof(WndProcDelegate))]
-		static IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam) {
-			try {
-				var m = (WindowMessages)msg;
-				/*if (m >= WindowMessages.WM_MOUSEFIRST && m <= WindowMessages.WM_MOUSELAST) {
-					if (!usePointerMessage)
-						Instance.handleMouseMsg(msg, wParam, lParam);
-				}
-				else*/
-				switch (m) {
-					case WindowMessages.WM_TOUCH:
-						if (usePointerMessage)
-							NativeMethods.CloseTouchInputHandle(lParam);
-						else
-							Instance.HandleTouchMsg(wParam, lParam);
-						break;
-					case WindowMessages.WM_POINTERDOWN:
-					case WindowMessages.WM_POINTERUP:
-					case WindowMessages.WM_POINTERUPDATE:
-						if (usePointerMessage)
-							Instance.HandlePointerMsg(msg, wParam, lParam);
-						break;
-					case WindowMessages.WM_CLOSE:
-						Instance.Dispose();
-						// Calling oldWndProcPtr here would crash the application
-						Application.Quit();
-						return IntPtr.Zero;
-				}
-				return NativeMethods.CallWindowProc(Instance.oldWndProcPtr, hWnd, msg, wParam, lParam);
-			}
-			catch (Exception ex) {
-				Logger.Log("main", 4, "Input", "An error occured while handling pointer:\n{0}", ex);
-				return IntPtr.Zero;
-			}
-		}
-
-		void HandlePointerMsg(uint msg, IntPtr wParam, IntPtr lParam) {
-			int id = LOWORD(wParam.ToInt32());
-
-			var rawpinfo = new NativeMethods.POINTER_INFO();
-			if (!NativeMethods.GetPointerInfo(id, ref rawpinfo))
-				throw new InvalidOperationException("Failed to get pointer info");
-
-			/*
-			Vector2? _cs = null;
-			uint? orientation = null;
-			uint? pressure = null;
-			if (pointerInfo.pointerType == NativeMethods.POINTER_INPUT_TYPE.PT_TOUCH) {
-				var pointerTouchInfo = new NativeMethods.POINTER_TOUCH_INFO();
-				NativeMethods.GetPointerTouchInfo(pointerId, ref pointerTouchInfo);
-				if (pointerTouchInfo.touchMask.HasFlag(NativeMethods.TOUCH_MASK.TOUCH_MASK_CONTACTAREA)) {
-					Vector2 cs;
-					cs.x = pointerTouchInfo.rcContact.Width;
-					cs.y = pointerTouchInfo.rcContact.Height;
-					_cs = cs;
-				}
-				if (pointerTouchInfo.touchMask.HasFlag(NativeMethods.TOUCH_MASK.TOUCH_MASK_ORIENTATION)) {
-					orientation = pointerTouchInfo.orientation;
-				}
-				if (pointerTouchInfo.touchMask.HasFlag(NativeMethods.TOUCH_MASK.TOUCH_MASK_PRESSURE)) {
-					pressure = pointerTouchInfo.pressure;
-				}
-			}*/
-
-			NativeMethods.POINT p = rawpinfo.ptPixelLocation;
-			NativeMethods.ScreenToClient(hMainWindow, ref p);
-			Vector2 _p = UnityCameraUtils.ScreenToWorldPoint(new Vector2(p.X, Screen.height - p.Y));
-
-			double time = (double)rawpinfo.PerformanceCount / freq;
-
-			int type;
-			switch (rawpinfo.pointerType) {
-				case NativeMethods.POINTER_INPUT_TYPE.PT_POINTER : type = 1; break;
-				case NativeMethods.POINTER_INPUT_TYPE.PT_TOUCH   : type = 2; break;
-				case NativeMethods.POINTER_INPUT_TYPE.PT_PEN     : type = 3; break;
-				case NativeMethods.POINTER_INPUT_TYPE.PT_MOUSE   : type = 4; break;
-				case NativeMethods.POINTER_INPUT_TYPE.PT_TOUCHPAD: type = 5; break;
-				default: type = 0; break;
-			}
-			if (rawpinfo.pointerFlags.HasFlag(NativeMethods.POINTER_FLAGS.POINTER_FLAG_CANCELED)) {
-				Feed(type, id, new InputVector(time));
-				return;
-			}
-
-			InputVector vec = new InputVector(time, _p);
-
-			switch ((WindowMessages)msg) {
-				case WindowMessages.WM_POINTERDOWN:
-				case WindowMessages.WM_POINTERUPDATE:
-					Feed(type, id, vec);
-					break;
-				case WindowMessages.WM_POINTERUP:
-					Feed(type, id, vec);
-					Feed(type, id, new InputVector(time));
-					break;
-			}
-		}
-
-		/*void handleMouseMsg(uint msg, IntPtr wParam, IntPtr lParam) {
-			int id = mouseId;
-			double procTime = diag::Stopwatch.GetTimestamp()
-				/ (double)diag::Stopwatch.Frequency;
-			Vector2 _p;
-			_p.x = ((int)(short)LOWORD(lParam.ToInt32()));
-			_p.y = ((int)(short)HIWORD(lParam.ToInt32()));
-			PointerPhase phase;
-			switch ((WindowMessages)msg) {
-				case WindowMessages.WM_LBUTTONDOWN:
-				case WindowMessages.WM_LBUTTONDBLCLK:
-					phase = PointerPhase.Begin;
-					id = mouseId = newIdCallback();
-					break;
-				case WindowMessages.WM_MOUSEMOVE:
-					if (mouseId == 0)
-						return;
-					phase = PointerPhase.Update;
-					break;
-				case WindowMessages.WM_LBUTTONUP:
-					phase = PointerPhase.End;
-					mouseId = 0;
-					break;
-				case WindowMessages.WM_MOUSELEAVE:
-					phase = PointerPhase.Cancel;
-					mouseId = 0;
-					break;
-				default:
-					return;
-			}
-			callback(id, new PointerInfo() {
-				Id = id,
-				ProcessTime = procTime,
-				Phase = phase,
-				Type = PointerType.Mouse,
-				Position = _p,
-			});
-		}*/
-
-		void HandleTouchMsg(IntPtr wParam, IntPtr lParam) {
-			int inputCount = LOWORD(wParam.ToInt32());
-			NativeMethods.TOUCHINPUT[] inputs = new NativeMethods.TOUCHINPUT[inputCount];
-
-			if (!NativeMethods.GetTouchInputInfo(lParam, inputCount, inputs, touchInputSize))
-				throw new InvalidOperationException("Failed to get touch input info");
-
-			for (int i = 0; i < inputCount; i++) {
-				NativeMethods.TOUCHINPUT touch = inputs[i];
-
-				NativeMethods.POINT p = new NativeMethods.POINT {
-					X = touch.x / 100,
-					Y = touch.y / 100
-				};
-				NativeMethods.ScreenToClient(hMainWindow, ref p);
-				Vector2 _p = UnityCameraUtils.ScreenToWorldPoint(new Vector2(p.X, Screen.height - p.Y));
-
-				/*Vector2? _cs = null;
-				if (touch.dwMask.HasFlag(NativeMethods.TOUCHINPUT_Mask.TOUCHINPUTMASKF_CONTACTAREA)) {
-					Vector2 cs;
-					cs.x = touch.cxContact / 100;
-					cs.y = touch.cyContact / 100;
-					_cs = cs;
-				}*/
-
-				int id = touch.dwID;
-				double time = touch.dwTime / 1000.0;
-				InputVector vec = new InputVector(time, _p);
-
-				if (touch.dwFlags.HasFlag(NativeMethods.TOUCHINPUT_Flags.TOUCHEVENTF_MOVE) ||
-					touch.dwFlags.HasFlag(NativeMethods.TOUCHINPUT_Flags.TOUCHEVENTF_DOWN)) {
-					Feed(255, id, vec);
-				}
-				else if (touch.dwFlags.HasFlag(NativeMethods.TOUCHINPUT_Flags.TOUCHEVENTF_UP)) {
-					Feed(255, id, vec);
-					Feed(255, id, new InputVector(time));
-				}
-			}
-
-			NativeMethods.CloseTouchInputHandle(lParam);
-		}
-
-		public static int LOWORD(int value) {
-			return value & 0xffff;
-		}
-
-		public static int HIWORD(int value) {
-			return (value & (0xffff << 16)) >> 16;
-		}
-
-		public static IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong) {
-			if (IntPtr.Size == 8)
-				return NativeMethods.SetWindowLongPtr64(hWnd, nIndex, dwNewLong);
-			return new IntPtr(NativeMethods.SetWindowLong32(hWnd, nIndex, dwNewLong.ToInt32()));
-		}
-	}
-}

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

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: d1b353deb73c51b409b15e54c54a6bb1
-timeCreated: 1611282071
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Unity/NetworkTaskWorker.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 #if UNITY_5_4_OR_NEWER
@@ -179,7 +179,7 @@ namespace Cryville.Common.Unity {
 			if (!www.isDone) return false;
 			if (handler.isDone && handler.texture != null) {
 				var buffer = handler.texture;
-				/*var result = new Texture2D(buffer.width, buffer.height, buffer.format, true);
+				var result = new Texture2D(buffer.width, buffer.height, buffer.format, true);
 				if (SystemInfo.copyTextureSupport.HasFlag(CopyTextureSupport.Basic)) {
 					Graphics.CopyTexture(buffer, 0, 0, result, 0, 0);
 				}
@@ -188,8 +188,8 @@ namespace Cryville.Common.Unity {
 				}
 				result.Apply(true, true);
 				Texture2D.Destroy(buffer);
-				Callback(true, result);*/
-				Callback(true, buffer);
+				Callback(true, result);
+				// Callback(true, buffer);
 			}
 			else {
 				Callback(false, null);

Assets/Cryville/Common/Unity/PropItem.cs

@@ -1,145 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-namespace Cryville.Common.Unity {
-	public class PropItem : MonoBehaviour {
-		public object Target;
-		public PropertyEditor editor;
-		public DirectoryInfo ContextPath;
-
-		public string PropertyName = "";
-		InputField valueObj;
-		string value;
-		string desc = "";
-		PropertyInfo prop;
-		Type bindToType;
-		TypeConverter converter;
-
-		bool mustExpand = false;
-		bool readOnly = false;
-		string[] filter = null;
-		FileDialog fdialog;
-
-#pragma warning disable IDE0051
-		void Awake() {
-			transform.Find("Value").GetComponent<InputField>().onEndEdit.AddListener(s => OnValueChanged(s));
-			var entry = new EventTrigger.Entry(){
-				eventID = EventTriggerType.PointerClick,
-				callback = new EventTrigger.TriggerEvent()
-			};
-			entry.callback.AddListener(e => OnClick(e));
-			transform.Find("Value").GetComponent<EventTrigger>().triggers.Add(entry);
-		}
-
-		void Start() {
-			transform.Find("Name").GetComponent<Text>().text = PropertyName;
-			valueObj = transform.Find("Value").GetComponent<InputField>();
-			prop = Target.GetType().GetProperty(PropertyName);
-			bindToType = prop.PropertyType;
-			converter = TypeDescriptor.GetConverter(bindToType);
-			
-			var descattr = (DescriptionAttribute[])prop.GetCustomAttributes(typeof(DescriptionAttribute), true);
-			if (descattr.Length > 0) desc = descattr[0].Description;
-			
-			var roattr = (ReadOnlyAttribute[])prop.GetCustomAttributes(typeof(ReadOnlyAttribute), true);
-			if (roattr.Length > 0) if (roattr[0].IsReadOnly == true) {
-				readOnly = true;
-				valueObj.enabled = false;
-				valueObj.transform.Find("ValueString").GetComponent<Text>().color = Color.gray;
-			}
-
-			if (converter == null || !converter.CanConvertFrom(typeof(string)) || converter.GetPropertiesSupported()){
-				mustExpand = true;
-				valueObj.enabled = false;
-			}
-			
-			var fsattr = (FileStringAttribute[])prop.GetCustomAttributes(typeof(FileStringAttribute), true);
-			if (fsattr.Length > 0) {
-				valueObj.enabled = false;
-				filter = fsattr[0].Filter;
-			}
-
-			UpdateValue();
-		}
-#pragma warning restore IDE0051
-
-		void OnFileDialogClosed() {
-			var file = fdialog.GetComponent<FileDialog>().FileName;
-			if (file != "") {
-				var f = new FileInfo(file);
-				if (f.Directory.FullName != ContextPath.FullName) {
-					string targetFile = ContextPath.FullName + "\\" + f.Name;
-					f.CopyTo(targetFile, true);
-				}
-				OnValueChanged(f.Name);
-			}
-		}
-		
-		void UpdateValue() {
-			object v;
-			valueObj.placeholder.GetComponent<Text>().text = "";
-			v = prop.GetValue(Target, new object[]{ });
-			if (v == null) {
-				DefaultValueAttribute[] defvattr = (DefaultValueAttribute[])prop.GetCustomAttributes(typeof(DefaultValueAttribute), true);
-				if (defvattr.Length > 0) {
-					v = defvattr[0].Value;
-					if (v == null) {
-						v = "";
-						valueObj.placeholder.GetComponent<Text>().text = "null";
-					}
-				}
-				else {
-					v = "";
-					valueObj.placeholder.GetComponent<Text>().text = "null";
-				}
-			}
-			
-			if (mustExpand || readOnly || filter != null) {
-				valueObj.transform.Find("ValueString").GetComponent<Text>().text = v.ToString();
-			}
-			else {
-				valueObj.text = v.ToString();
-			}
-			value = valueObj.text;
-		}
-		
-		void OnClick(BaseEventData e) {
-			if (mustExpand && !readOnly) {
-				GameObject subeditor = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/PropertyEditor"));
-				object obj = prop.GetValue(Target, new object[]{ });
-				subeditor.GetComponent<PropertyEditor>().TargetObject = obj;
-			}
-			else if (filter != null && !readOnly) {
-				fdialog = GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/FileDialog")).GetComponent<FileDialog>();
-				fdialog.Filter = filter;
-				fdialog.CurrentDirectory = ContextPath;
-				fdialog.OnClose += OnFileDialogClosed;
-			}
-			editor.SetDescription(PropertyName, desc);
-			UpdateValue();
-		}
-		
-		void OnValueChanged(string s) {
-			if (s == value) return;
-			object v = null;
-			if (!(mustExpand || readOnly)) {
-				try {
-					v = converter.ConvertFrom(s);
-					prop.SetValue(Target, v, new object[]{ });
-				}
-				catch (TargetInvocationException ex) {
-					// CallHelper.ShowMessageBox(ex.InnerException.Message);
-				}
-				catch (Exception ex) {
-					// CallHelper.ShowMessageBox(ex.Message);
-				}
-			}
-			UpdateValue();
-		}
-	}
-}

Assets/Cryville/Common/Unity/PropItem.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 499dc47d3f108de4eb80b2d73e5851c5
-timeCreated: 1608801352
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: