Code structure cleanup.

Assets/Cryville/Crtr/Anchor.cs

@@ -1,4 +1,5 @@
 using Cryville.Common.Collections.Specialized;
+using Cryville.Crtr.Skin;
 using UnityEngine;
 
 namespace Cryville.Crtr {

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

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

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

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

Assets/Cryville/Crtr/Browsing/ChartDetail.cs

@@ -0,0 +1,10 @@
+using Cryville.Common;
+using Cryville.Crtr.Extension;
+using UnityEngine;
+
+namespace Cryville.Crtr.Browsing {
+	public struct ChartDetail {
+		public AsyncDelivery<Texture2D> Cover { get; set; }
+		public ChartMeta Meta { get; set; }
+	}
+}

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

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

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

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

Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs

@@ -3,6 +3,7 @@ using Cryville.Common.Unity;
 using Cryville.Crtr.Extension;
 using Cryville.Crtr.Extensions;
 using Cryville.Crtr.Extensions.Umg;
+using Cryville.Crtr.UI;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;

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

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

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

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

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

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

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

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

Assets/Cryville/Crtr/Browsing/ResourceItemMeta.cs

@@ -2,15 +2,6 @@ using Cryville.Common;
 using UnityEngine;
 
 namespace Cryville.Crtr.Browsing {
-	internal abstract class BrowserItem : MonoBehaviour {
-		public int? Id { get; private set; }
-		protected ResourceItemMeta meta;
-		internal virtual void Load(int id, ResourceItemMeta item) {
-			Id = id;
-			meta = item;
-		}
-	}
-
 	public struct ResourceItemMeta {
 		public bool IsDirectory { get; set; }
 		public AsyncDelivery<Texture2D> Icon { get; set; }

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

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

Assets/Cryville/Crtr/BuiltinResources.cs

@@ -1,10 +1,10 @@
-using Cryville.Crtr.Components;
+using Cryville.Crtr.Skin.Components;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 
 namespace Cryville.Crtr {
-	public static class GenericResources {
+	public static class BuiltinResources {
 		public static Dictionary<string, Type> Components
 			= new Dictionary<string, Type>();
 		public static Dictionary<string, Shader> Shaders

Assets/Cryville/Crtr/Chart.cs

@@ -1,6 +1,7 @@
 using Cryville.Common;
 using Cryville.Common.Collections.Specialized;
 using Cryville.Common.Pdt;
+using Cryville.Crtr.Ruleset;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -2,6 +2,9 @@ using Cryville.Common;
 using Cryville.Common.Buffers;
 using Cryville.Crtr.Config;
 using Cryville.Crtr.Event;
+using Cryville.Crtr.Ruleset;
+using Cryville.Crtr.Skin;
+using Cryville.Crtr.UI;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -22,9 +25,9 @@ namespace Cryville.Crtr {
 	public class ChartPlayer : MonoBehaviour {
 		#region Fields
 		Chart chart;
-		Skin skin;
+		SkinDefinition skin;
 		public static PdtSkin pskin;
-		Ruleset ruleset;
+		RulesetDefinition ruleset;
 		PdtRuleset pruleset;
 		Dictionary<string, Texture2D> texs;
 		public static Dictionary<string, SpriteFrame> frames;
@@ -71,7 +74,7 @@ namespace Cryville.Crtr {
 				logs = logobj.GetComponent<TextMeshProUGUI>();
 			if (!initialized) {
 				Game.Init();
-				GenericResources.LoadDefault();
+				BuiltinResources.LoadDefault();
 				initialized = true;
 			}
 			OnSettingsUpdate();
@@ -417,10 +420,10 @@ namespace Cryville.Crtr {
 			);
 			if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
 			using (StreamReader reader = new StreamReader(skinFile.FullName, Encoding.UTF8)) {
-				skin = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd(), new JsonSerializerSettings() {
+				skin = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
-				if (skin.format != Skin.CURRENT_FORMAT) throw new FormatException("Invalid skin file version");
+				if (skin.format != SkinDefinition.CURRENT_FORMAT) throw new FormatException("Invalid skin file version");
 			}
 
 			loadThread = new Thread(new ParameterizedThreadStart(Load));
@@ -682,10 +685,10 @@ namespace Cryville.Crtr {
 			DirectoryInfo dir = file.Directory;
 			Logger.Log("main", 0, "Load/WorkerThread", "Loading ruleset: {0}", file);
 			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
+				ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
-				if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
+				if (ruleset.format != RulesetDefinition.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
 				ruleset.LoadPdt(dir);
 				pruleset = ruleset.Root;
 				pruleset.Optimize(PdtEvaluator.Instance);

Assets/Cryville/Crtr/Config/ConfigPanelMaster.cs

@@ -1,3 +1,5 @@
+using Cryville.Crtr.Ruleset;
+using Cryville.Crtr.UI;
 using Newtonsoft.Json;
 using System;
 using System.IO;
@@ -22,7 +24,7 @@ namespace Cryville.Crtr.Config {
 		[SerializeField]
 		InputConfigPanel m_inputConfigPanel;
 
-		public Ruleset ruleset;
+		public RulesetDefinition ruleset;
 		RulesetConfig _rscfg;
 
 		bool _loaded;
@@ -38,10 +40,10 @@ namespace Cryville.Crtr.Config {
 				}
 				DirectoryInfo dir = file.Directory;
 				using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-					ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
+					ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
 						MissingMemberHandling = MissingMemberHandling.Error
 					});
-					if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
+					if (ruleset.format != RulesetDefinition.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
 					ruleset.LoadPdt(dir);
 				}
 				FileInfo cfgfile = new FileInfo(

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Unity;
+using Cryville.Crtr.Ruleset;
 using Cryville.Input;
 using System;
 using System.Collections.Generic;

Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs

@@ -1,4 +1,5 @@
 using Cryville.Common;
+using Cryville.Crtr.Ruleset;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;

Assets/Cryville/Crtr/Config/RulesetConfigPropertyAdapter.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Pdt;
+using Cryville.Crtr.Ruleset;
 using System;
 using System.Collections.Generic;
 

Assets/Cryville/Crtr/Config/RulesetConfigStore.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Collections.Specialized;
+using Cryville.Crtr.Ruleset;
 using System;
 using System.Collections.Generic;
 

Assets/Cryville/Crtr/Event/ChartHandler.cs

@@ -1,9 +1,8 @@
 using Cryville.Audio.Source;
-using Cryville.Crtr.Event;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	public class ChartHandler : TransformHandler {
 		protected override TransformHandler Parent { get { return null; } }
 

Assets/Cryville/Crtr/Event/ChartHandler.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: d8339b62359a4eb428e5d7939a0e8fe4
+guid: 59e25dacd9b4d1f45b1da3a381187560
-timeCreated: 1593870951
-licenseType: Pro
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -1,7 +1,9 @@
 using Cryville.Common;
 using Cryville.Common.Buffers;
 using Cryville.Common.Collections.Specialized;
-using Cryville.Crtr.Components;
+using Cryville.Crtr.Ruleset;
+using Cryville.Crtr.Skin;
+using Cryville.Crtr.Skin.Components;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -2,6 +2,8 @@ using Cryville.Common;
 using Cryville.Common.Buffers;
 using Cryville.Common.Collections.Specialized;
 using Cryville.Common.Pdt;
+using Cryville.Crtr.Ruleset;
+using Cryville.Crtr.Skin;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;

Assets/Cryville/Crtr/Event/EventBus.cs

@@ -1,3 +1,5 @@
+using Cryville.Crtr.Ruleset;
+using Cryville.Crtr.Skin;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;

Assets/Cryville/Crtr/Event/GroupHandler.cs

@@ -1,9 +1,8 @@
 using Cryville.Common.Math;
-using Cryville.Crtr.Event;
 using System;
 using UnityEngine;
 
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	public class GroupHandler : TransformHandler {
 		protected override TransformHandler Parent { get { return _ch; } }
 		public ChartHandler _ch;

Assets/Cryville/Crtr/Event/GroupHandler.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 1d6ad7170a6c76248a8ec305e98a75b2
+guid: a254d6c958ea6c5409991bde44e67635
-timeCreated: 1599459182
-licenseType: Pro
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Crtr/Event/NoteHandler.cs

@@ -1,16 +1,16 @@
 using Cryville.Common;
-using Cryville.Crtr.Components;
+using Cryville.Crtr.Ruleset;
-using Cryville.Crtr.Event;
+using Cryville.Crtr.Skin.Components;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	public class NoteHandler : ContainerHandler {
 		readonly GroupHandler gh;
-		public readonly Chart.Note Event;
+		readonly Chart.Note _note;
 		public NoteHandler(Chart.Note ev, GroupHandler gh) : base() {
-			Event = ev;
+			_note = ev;
 			this.gh = gh;
 		}
 		
@@ -43,7 +43,7 @@ namespace Cryville.Crtr {
 
 		public override void PreInit() {
 			base.PreInit();
-			foreach (var j in Event.judges) {
+			foreach (var j in _note.judges) {
 				judges.Add(j, new JudgeState(this, j.Id.Key));
 			}
 		}
@@ -63,7 +63,7 @@ namespace Cryville.Crtr {
 			base.StartGraphicalUpdate(s);
 			TransformAwake(s);
 			if (RootTransform) {
-				if (Event.IsLong) {
+				if (_note.IsLong) {
 					foreach (var i in sgos) {
 						i.Reset();
 						i.AppendPoint(Position, Rotation);
@@ -88,7 +88,7 @@ namespace Cryville.Crtr {
 			if (s.CloneType <= 2) {
 				Position = GetFramePoint(s.Parent, s.Track);
 				Rotation = GetFrameRotation(s.Parent, s.Track);
-				if (s.CloneType == 2 && RootTransform && Event.IsLong) {
+				if (s.CloneType == 2 && RootTransform && _note.IsLong) {
 					foreach (var i in sgos)
 						i.AppendPoint(Position, Rotation);
 				}
@@ -131,7 +131,7 @@ namespace Cryville.Crtr {
 		}
 
 		Quaternion GetFrameRotation(ContainerState state, float track) {
-			var r = GetFrame(state, track, th => Quaternion.Euler(th.Direction) * Vector3.forward);
+			var r = GetFrame(state, track, th => th.Handler.Rotation * Vector3.forward);
 			return Quaternion.LookRotation(r, state.Normal);
 		}
 

Assets/Cryville/Crtr/Event/NoteHandler.cs.meta

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

Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs

@@ -0,0 +1,78 @@
+using Cryville.Common.Collections.Specialized;
+using System;
+
+namespace Cryville.Crtr.Event {
+	public class RealtimeMotionValue {
+		Type _type;
+		public Vector AbsoluteValue;
+		public Vector RelativeValue;
+		public IntKeyedDictionary<MotionNode> RelativeNodes;
+		internal byte CloneTypeFlag;
+
+		public RealtimeMotionValue Init(Vector init) {
+			_type = init.GetType();
+			RelativeNodes = new IntKeyedDictionary<MotionNode>();
+			AbsoluteValue = init;
+			RelativeValue = (Vector)Activator.CreateInstance(_type);
+			return this;
+		}
+
+		public RealtimeMotionValue Clone() {
+			return new RealtimeMotionValue() {
+				_type = _type,
+				AbsoluteValue = AbsoluteValue.Clone(),
+				RelativeValue = RelativeValue.Clone(),
+				RelativeNodes = RelativeNodes,
+			};
+		}
+
+		public void CopyTo(RealtimeMotionValue dest, bool cloneNodes) {
+			AbsoluteValue.CopyTo(dest.AbsoluteValue);
+			RelativeValue.CopyTo(dest.RelativeValue);
+			if (cloneNodes) {
+				dest.ReturnAllRelativeNodes();
+				foreach (var node in RelativeNodes) {
+					var dnode = MotionNodePool.Shared.Rent(_type);
+					node.Value.CopyTo(dnode);
+					dest.RelativeNodes.Add(node.Key, dnode);
+				}
+			}
+			else dest.RelativeNodes = RelativeNodes;
+		}
+
+		public void ReturnAllRelativeNodes() {
+			foreach (var node in RelativeNodes) {
+				MotionNodePool.Shared.Return(_type, node.Value);
+			}
+			RelativeNodes.Clear();
+		}
+
+		public MotionNode GetRelativeNode(short id) {
+			MotionNode result;
+			RelativeNodes.TryGetValue(id, out result);
+			return result;
+		}
+
+		public void SetRelativeNode(MotionNode node) {
+			MotionNode cnode;
+			if (!RelativeNodes.TryGetValue(node.Id, out cnode)) {
+				cnode = MotionNodePool.Shared.Rent(_type);
+				cnode.Id = node.Id;
+				RelativeNodes.Add(node.Id, cnode);
+			}
+			if (node.Time != null) node.Time.CopyTo(cnode.Time);
+			if (node.EndTime != null) node.EndTime.CopyTo(cnode.EndTime);
+			if (node.Value != null) node.Value.CopyTo(cnode.Value);
+		}
+
+		/// <summary>
+		/// Computes the motion value.
+		/// </summary>
+		/// <typeparam name="T">The vector type of the value.</typeparam>
+		/// <param name="result">The result.</param>
+		public void Compute<T>(ref T result) where T : Vector {
+			AbsoluteValue.CopyTo(result);
+			result.ApplyFrom(RelativeValue);
+		}
+	}
+}

Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs.meta

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

Assets/Cryville/Crtr/Event/StampedEvent.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using CAnchor = Cryville.Crtr.Anchor;
 
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	public class StampedEvent : IComparable<StampedEvent> {
 		public double Time;
 		public ChartEvent Unstamped;

Assets/Cryville/Crtr/Event/StampedEvent.cs.meta

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

Assets/Cryville/Crtr/Event/StateBase.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	/// <summary>
 	/// A time-forward handler of a sequence of events.
 	/// </summary>

Assets/Cryville/Crtr/Event/StateBase.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 116c345bd51b98740aa99a3e08442e5f
+guid: 5ea84a1810568034e96c8d3837b3ca2f
-timeCreated: 1594732377
-licenseType: Pro
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Crtr/Event/TrackHandler.cs

@@ -1,4 +1,4 @@
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	public class TrackHandler : TransformHandler {
 		protected override TransformHandler Parent { get { return _gh; } }
 		readonly GroupHandler _gh;

Assets/Cryville/Crtr/Event/TrackHandler.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: e1e306e8a7b15c7458de2e0b03551c86
+guid: f9a4d5fe2d0dc5d4d869d91670cc1aab
-timeCreated: 1593349834
-licenseType: Pro
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Crtr/Event/TransformHandler.cs

@@ -1,9 +1,8 @@
-using Cryville.Crtr.Components;
+using Cryville.Crtr.Skin.Components;
-using Cryville.Crtr.Event;
 using System.Linq;
 using UnityEngine;
 
-namespace Cryville.Crtr {
+namespace Cryville.Crtr.Event {
 	public abstract class TransformHandler : ContainerHandler {
 		protected abstract TransformHandler Parent { get; }
 		public override void Init() {

Assets/Cryville/Crtr/Event/TransformHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cd92dc120682e174cb42752bd304e12a
+guid: b6f66c022b25fe344908a0e34ef40615
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Crtr/Extensions/Umg/RulesetResourceImporter.cs

@@ -1,4 +1,5 @@
 using Cryville.Crtr.Extension;
+using Cryville.Crtr.Ruleset;
 using Newtonsoft.Json;
 using System.IO;
 using System.Text;
@@ -12,7 +13,7 @@ namespace Cryville.Crtr.Extensions.Umg {
 
 		public override void Convert(FileInfo file, ConversionSession ses) {
 			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				var data = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd());
+				var data = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd());
 				ses.AddResource(new RulesetResource(data.name, file));
 			}
 		}
@@ -20,7 +21,7 @@ namespace Cryville.Crtr.Extensions.Umg {
 	public class RulesetResource : FileResource {
 		public RulesetResource(string name, FileInfo master) : base(name, master) {
 			using (var reader = new StreamReader(master.FullName)) {
-				var meta = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd());
+				var meta = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd());
 				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
 			}
 		}

Assets/Cryville/Crtr/Extensions/Umg/SkinResourceImporter.cs

@@ -1,4 +1,5 @@
 using Cryville.Crtr.Extension;
+using Cryville.Crtr.Skin;
 using Newtonsoft.Json;
 using System.IO;
 using System.Text;
@@ -12,7 +13,7 @@ namespace Cryville.Crtr.Extensions.Umg {
 
 		public override void Convert(FileInfo file, ConversionSession ses) {
 			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				var data = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd());
+				var data = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd());
 				ses.AddResource(new SkinResource(data.name, file));
 			}
 		}
@@ -21,7 +22,7 @@ namespace Cryville.Crtr.Extensions.Umg {
 		public string RulesetName { get; private set; }
 		public SkinResource(string name, FileInfo master) : base(name, master) {
 			using (var reader = new StreamReader(master.FullName)) {
-				var meta = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd());
+				var meta = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd());
 				RulesetName = meta.ruleset;
 				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
 				foreach (var frame in meta.frames) {

Assets/Cryville/Crtr/Game.cs

@@ -4,6 +4,7 @@ using Cryville.Common.Font;
 using Cryville.Common.Logging;
 using Cryville.Common.Unity;
 using Cryville.Common.Unity.UI;
+using Cryville.Crtr.UI;
 using Cryville.Input;
 using Cryville.Input.Unity;
 #if UNITY_ANDROID && !UNITY_EDITOR

Assets/Cryville/Crtr/Judge.cs.meta

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

Assets/Cryville/Crtr/Motion.cs

@@ -1,5 +1,4 @@
 using Cryville.Common.Buffers;
-using Cryville.Common.Collections.Specialized;
 using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
@@ -35,80 +34,6 @@ namespace Cryville.Crtr {
 		}
 	}
 
-	public class RealtimeMotionValue {
-		Type _type;
-		public Vector AbsoluteValue;
-		public Vector RelativeValue;
-		public IntKeyedDictionary<MotionNode> RelativeNodes;
-		internal byte CloneTypeFlag;
-
-		public RealtimeMotionValue Init(Vector init) {
-			_type = init.GetType();
-			RelativeNodes = new IntKeyedDictionary<MotionNode>();
-			AbsoluteValue = init;
-			RelativeValue = (Vector)Activator.CreateInstance(_type);
-			return this;
-		}
-
-		public RealtimeMotionValue Clone() {
-			return new RealtimeMotionValue() {
-				_type = _type,
-				AbsoluteValue = AbsoluteValue.Clone(),
-				RelativeValue = RelativeValue.Clone(),
-				RelativeNodes = RelativeNodes,
-			};
-		}
-
-		public void CopyTo(RealtimeMotionValue dest, bool cloneNodes) {
-			AbsoluteValue.CopyTo(dest.AbsoluteValue);
-			RelativeValue.CopyTo(dest.RelativeValue);
-			if (cloneNodes) {
-				dest.ReturnAllRelativeNodes();
-				foreach (var node in RelativeNodes) {
-					var dnode = MotionNodePool.Shared.Rent(_type);
-					node.Value.CopyTo(dnode);
-					dest.RelativeNodes.Add(node.Key, dnode);
-				}
-			}
-			else dest.RelativeNodes = RelativeNodes;
-		}
-
-		public void ReturnAllRelativeNodes() {
-			foreach (var node in RelativeNodes) {
-				MotionNodePool.Shared.Return(_type, node.Value);
-			}
-			RelativeNodes.Clear();
-		}
-
-		public MotionNode GetRelativeNode(short id) {
-			MotionNode result;
-			RelativeNodes.TryGetValue(id, out result);
-			return result;
-		}
-
-		public void SetRelativeNode(MotionNode node) {
-			MotionNode cnode;
-			if (!RelativeNodes.TryGetValue(node.Id, out cnode)) {
-				cnode = MotionNodePool.Shared.Rent(_type);
-				cnode.Id = node.Id;
-				RelativeNodes.Add(node.Id, cnode);
-			}
-			if (node.Time != null) node.Time.CopyTo(cnode.Time);
-			if (node.EndTime != null) node.EndTime.CopyTo(cnode.EndTime);
-			if (node.Value != null) node.Value.CopyTo(cnode.Value);
-		}
-
-		/// <summary>
-		/// Computes the motion value.
-		/// </summary>
-		/// <typeparam name="T">The vector type of the value.</typeparam>
-		/// <param name="result">The result.</param>
-		public void Compute<T>(ref T result) where T : Vector {
-			AbsoluteValue.CopyTo(result);
-			result.ApplyFrom(RelativeValue);
-		}
-	}
-
 	public class MotionNode {
 		public short Id = -1;
 		public bool Reset;

Assets/Cryville/Crtr/Network/UpdateChecker.cs

@@ -1,6 +1,7 @@
 using Cryville.Common;
 using Cryville.Common.Network.Http11;
 using Cryville.Common.Unity;
+using Cryville.Crtr.UI;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;

Assets/Cryville/Crtr/NoteHandler.cs.meta

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

Assets/Cryville/Crtr/PdtBinder.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Pdt;
+using Cryville.Crtr.Ruleset;
 using System;
 using System.Globalization;
 using SIdentifier = Cryville.Common.Identifier;

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -4,6 +4,8 @@ using Cryville.Common.Math;
 using Cryville.Common.Pdt;
 using Cryville.Crtr.Config;
 using Cryville.Crtr.Event;
+using Cryville.Crtr.Ruleset;
+using Cryville.Crtr.Skin;
 using System;
 using System.Collections.Generic;
 using System.Globalization;