From 1f5839029896af118a20f2ba0189ab3d06766647 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Thu, 24 Aug 2023 15:47:34 +0800 Subject: [PATCH] Code structure cleanup. --- Assets/Cryville/Crtr/Anchor.cs | 1 + .../Crtr/Browsing/BrowserItem.cs.meta | 12 --- .../Crtr/Browsing/BrowserItemTile.cs.meta | 12 --- Assets/Cryville/Crtr/Browsing/ChartDetail.cs | 10 +++ .../Crtr/Browsing/ChartDetail.cs.meta | 11 +++ .../Crtr/Browsing/DetailPanel.cs.meta | 12 --- .../Crtr/Browsing/LegacyResourceManager.cs | 1 + .../Cryville/Crtr/Browsing/PathPart.cs.meta | 12 --- .../Crtr/Browsing/ResourceBrowser.cs.meta | 12 --- .../Browsing/ResourceBrowserMaster.cs.meta | 12 --- .../Crtr/Browsing/ResourceBrowserUnit.cs.meta | 12 --- .../{BrowserItem.cs => ResourceItemMeta.cs} | 9 --- .../Crtr/Browsing/ResourceItemMeta.cs.meta | 11 +++ ...enericResources.cs => BuiltinResources.cs} | 4 +- ...urces.cs.meta => BuiltinResources.cs.meta} | 0 Assets/Cryville/Crtr/Chart.cs | 1 + Assets/Cryville/Crtr/ChartPlayer.cs | 17 ++-- .../Cryville/Crtr/Config/ConfigPanelMaster.cs | 8 +- .../Cryville/Crtr/Config/InputConfigPanel.cs | 1 + .../Crtr/Config/InputConfigPanelEntry.cs | 1 + .../Config/RulesetConfigPropertyAdapter.cs | 1 + .../Crtr/Config/RulesetConfigStore.cs | 1 + .../Cryville/Crtr/{ => Event}/ChartHandler.cs | 3 +- .../Crtr/{ => Event}/ChartHandler.cs.meta | 5 +- .../Cryville/Crtr/Event/ContainerHandler.cs | 4 +- Assets/Cryville/Crtr/Event/ContainerState.cs | 2 + Assets/Cryville/Crtr/Event/EventBus.cs | 2 + .../Cryville/Crtr/{ => Event}/GroupHandler.cs | 3 +- .../Crtr/{ => Event}/GroupHandler.cs.meta | 5 +- .../Cryville/Crtr/{ => Event}/NoteHandler.cs | 18 ++--- .../Cryville/Crtr/Event/NoteHandler.cs.meta | 11 +++ .../Crtr/Event/RealtimeMotionValue.cs | 78 +++++++++++++++++++ .../Crtr/Event/RealtimeMotionValue.cs.meta | 11 +++ .../Cryville/Crtr/{ => Event}/StampedEvent.cs | 2 +- .../Cryville/Crtr/Event/StampedEvent.cs.meta | 11 +++ Assets/Cryville/Crtr/{ => Event}/StateBase.cs | 2 +- .../Crtr/{ => Event}/StateBase.cs.meta | 5 +- .../Cryville/Crtr/{ => Event}/TrackHandler.cs | 2 +- .../Crtr/{ => Event}/TrackHandler.cs.meta | 5 +- .../Crtr/{ => Event}/TransformHandler.cs | 5 +- .../Crtr/{ => Event}/TransformHandler.cs.meta | 2 +- .../Extensions/Umg/RulesetResourceImporter.cs | 5 +- .../Extensions/Umg/SkinResourceImporter.cs | 5 +- Assets/Cryville/Crtr/Game.cs | 1 + Assets/Cryville/Crtr/Judge.cs.meta | 12 --- Assets/Cryville/Crtr/Motion.cs | 75 ------------------ Assets/Cryville/Crtr/Network/UpdateChecker.cs | 1 + Assets/Cryville/Crtr/NoteHandler.cs.meta | 12 --- Assets/Cryville/Crtr/PdtBinder.cs | 1 + Assets/Cryville/Crtr/PdtEvaluator.cs | 2 + Assets/Cryville/Crtr/Ruleset.cs.meta | 12 --- Assets/Cryville/Crtr/Ruleset.meta | 8 ++ .../Cryville/Crtr/{ => Ruleset}/InputProxy.cs | 2 +- .../Crtr/{ => Ruleset}/InputProxy.cs.meta | 2 +- Assets/Cryville/Crtr/{ => Ruleset}/Judge.cs | 3 +- Assets/Cryville/Crtr/Ruleset/Judge.cs.meta | 11 +++ .../Crtr/{ => Ruleset}/JudgeAction.cs | 2 +- .../Crtr/{ => Ruleset}/JudgeAction.cs.meta | 2 +- .../RulesetDefinition.cs} | 4 +- .../Crtr/Ruleset/RulesetDefinition.cs.meta | 11 +++ .../Crtr/{ => Ruleset}/RulesetInterpreter.cs | 2 +- .../{ => Ruleset}/RulesetInterpreter.cs.meta | 2 +- .../Crtr/{ => Ruleset}/RulesetSelectors.cs | 2 +- .../{ => Ruleset}/RulesetSelectors.cs.meta | 2 +- Assets/Cryville/Crtr/Skin.cs.meta | 12 --- Assets/Cryville/Crtr/Skin.meta | 8 ++ .../Cryville/Crtr/{ => Skin}/Components.meta | 0 .../Crtr/{ => Skin}/Components/MeshBase.cs | 2 +- .../{ => Skin}/Components/MeshBase.cs.meta | 0 .../Crtr/{ => Skin/Components}/MeshWrapper.cs | 4 +- .../{ => Skin/Components}/MeshWrapper.cs.meta | 0 .../Crtr/{ => Skin}/Components/PolygonSGO.cs | 2 +- .../{ => Skin}/Components/PolygonSGO.cs.meta | 0 .../Components/SectionalGameObject.cs | 2 +- .../Components/SectionalGameObject.cs.meta | 0 .../{ => Skin}/Components/SkinAnimation.cs | 2 +- .../Components/SkinAnimation.cs.meta | 0 .../{ => Skin}/Components/SkinComponent.cs | 2 +- .../Components/SkinComponent.cs.meta | 0 .../Crtr/{ => Skin}/Components/SpriteBase.cs | 4 +- .../{ => Skin}/Components/SpriteBase.cs.meta | 0 .../Crtr/{ => Skin}/Components/SpritePlane.cs | 8 +- .../{ => Skin}/Components/SpritePlane.cs.meta | 0 .../Crtr/{ => Skin}/Components/SpriteRect.cs | 2 +- .../{ => Skin}/Components/SpriteRect.cs.meta | 0 .../{ => Skin}/Components/SpriteScale3.cs | 4 +- .../Components/SpriteScale3.cs.meta | 0 .../Crtr/{ => Skin}/Components/SpriteText.cs | 2 +- .../{ => Skin}/Components/SpriteText.cs.meta | 0 .../Crtr/{ => Skin}/Components/TrackLine.cs | 2 +- .../{ => Skin}/Components/TrackLine.cs.meta | 0 .../Components/TransformInterface.cs | 2 +- .../Components/TransformInterface.cs.meta | 0 .../Cryville/Crtr/{ => Skin}/EffectGroup.cs | 2 +- .../Crtr/{ => Skin}/EffectGroup.cs.meta | 2 +- .../Crtr/{ => Skin}/EffectInstance.cs | 4 +- .../Crtr/{ => Skin}/EffectInstance.cs.meta | 2 +- .../Cryville/Crtr/{ => Skin}/EffectManager.cs | 2 +- .../Crtr/{ => Skin}/EffectManager.cs.meta | 2 +- .../Cryville/Crtr/{ => Skin}/SkinContainer.cs | 2 +- .../Crtr/{ => Skin}/SkinContainer.cs.meta | 2 +- .../Crtr/{Skin.cs => Skin/SkinDefinition.cs} | 4 +- .../Cryville/Crtr/Skin/SkinDefinition.cs.meta | 11 +++ .../Crtr/{ => Skin}/SkinInterpreter.cs | 2 +- .../Crtr/{ => Skin}/SkinInterpreter.cs.meta | 2 +- .../Crtr/{ => Skin}/SkinPropertyKey.cs | 6 +- .../Crtr/{ => Skin}/SkinPropertyKey.cs.meta | 2 +- .../Cryville/Crtr/{ => Skin}/SkinSelectors.cs | 4 +- .../Cryville/Crtr/Skin/SkinSelectors.cs.meta | 11 +++ Assets/Cryville/Crtr/SkinSelectors.cs.meta | 12 --- Assets/Cryville/Crtr/StampedEvent.cs.meta | 12 --- Assets/Cryville/Crtr/UI.meta | 8 ++ Assets/Cryville/Crtr/UI/BrowserItem.cs | 13 ++++ Assets/Cryville/Crtr/UI/BrowserItem.cs.meta | 11 +++ .../Crtr/{Browsing => UI}/BrowserItemTile.cs | 5 +- .../Cryville/Crtr/UI/BrowserItemTile.cs.meta | 11 +++ .../Crtr/{Browsing => UI}/DetailPanel.cs | 3 +- Assets/Cryville/Crtr/UI/DetailPanel.cs.meta | 11 +++ Assets/Cryville/Crtr/{ => UI}/Dialog.cs | 2 +- Assets/Cryville/Crtr/{ => UI}/Dialog.cs.meta | 0 Assets/Cryville/Crtr/{ => UI}/Master.cs | 2 +- Assets/Cryville/Crtr/{ => UI}/Master.cs.meta | 0 Assets/Cryville/Crtr/{ => UI}/Menu.cs | 4 +- Assets/Cryville/Crtr/{ => UI}/Menu.cs.meta | 0 .../Crtr/{Browsing => UI}/PathPart.cs | 2 +- Assets/Cryville/Crtr/UI/PathPart.cs.meta | 11 +++ Assets/Cryville/Crtr/{ => UI}/Popup.cs | 2 +- Assets/Cryville/Crtr/{ => UI}/Popup.cs.meta | 0 .../Crtr/{Browsing => UI}/ResourceBrowser.cs | 3 +- .../Cryville/Crtr/UI/ResourceBrowser.cs.meta | 11 +++ .../{Browsing => UI}/ResourceBrowserMaster.cs | 10 +-- .../Crtr/UI/ResourceBrowserMaster.cs.meta | 11 +++ .../{Browsing => UI}/ResourceBrowserUnit.cs | 2 +- .../Crtr/UI/ResourceBrowserUnit.cs.meta | 11 +++ Assets/Menu.unity | 6 +- Assets/Prefabs/BrowserTile.prefab | 2 +- Assets/Prefabs/PathPart.prefab | 2 +- 137 files changed, 439 insertions(+), 362 deletions(-) delete mode 100644 Assets/Cryville/Crtr/Browsing/BrowserItem.cs.meta delete mode 100644 Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs.meta create mode 100644 Assets/Cryville/Crtr/Browsing/ChartDetail.cs create mode 100644 Assets/Cryville/Crtr/Browsing/ChartDetail.cs.meta delete mode 100644 Assets/Cryville/Crtr/Browsing/DetailPanel.cs.meta delete mode 100644 Assets/Cryville/Crtr/Browsing/PathPart.cs.meta delete mode 100644 Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs.meta delete mode 100644 Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs.meta delete mode 100644 Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs.meta rename Assets/Cryville/Crtr/Browsing/{BrowserItem.cs => ResourceItemMeta.cs} (59%) create mode 100644 Assets/Cryville/Crtr/Browsing/ResourceItemMeta.cs.meta rename Assets/Cryville/Crtr/{GenericResources.cs => BuiltinResources.cs} (94%) rename Assets/Cryville/Crtr/{GenericResources.cs.meta => BuiltinResources.cs.meta} (100%) rename Assets/Cryville/Crtr/{ => Event}/ChartHandler.cs (96%) rename Assets/Cryville/Crtr/{ => Event}/ChartHandler.cs.meta (69%) rename Assets/Cryville/Crtr/{ => Event}/GroupHandler.cs (96%) rename Assets/Cryville/Crtr/{ => Event}/GroupHandler.cs.meta (69%) rename Assets/Cryville/Crtr/{ => Event}/NoteHandler.cs (93%) create mode 100644 Assets/Cryville/Crtr/Event/NoteHandler.cs.meta create mode 100644 Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs create mode 100644 Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs.meta rename Assets/Cryville/Crtr/{ => Event}/StampedEvent.cs (98%) create mode 100644 Assets/Cryville/Crtr/Event/StampedEvent.cs.meta rename Assets/Cryville/Crtr/{ => Event}/StateBase.cs (99%) rename Assets/Cryville/Crtr/{ => Event}/StateBase.cs.meta (69%) rename Assets/Cryville/Crtr/{ => Event}/TrackHandler.cs (91%) rename Assets/Cryville/Crtr/{ => Event}/TrackHandler.cs.meta (69%) rename Assets/Cryville/Crtr/{ => Event}/TransformHandler.cs (97%) rename Assets/Cryville/Crtr/{ => Event}/TransformHandler.cs.meta (83%) delete mode 100644 Assets/Cryville/Crtr/Judge.cs.meta delete mode 100644 Assets/Cryville/Crtr/NoteHandler.cs.meta delete mode 100644 Assets/Cryville/Crtr/Ruleset.cs.meta create mode 100644 Assets/Cryville/Crtr/Ruleset.meta rename Assets/Cryville/Crtr/{ => Ruleset}/InputProxy.cs (99%) rename Assets/Cryville/Crtr/{ => Ruleset}/InputProxy.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Ruleset}/Judge.cs (99%) create mode 100644 Assets/Cryville/Crtr/Ruleset/Judge.cs.meta rename Assets/Cryville/Crtr/{ => Ruleset}/JudgeAction.cs (98%) rename Assets/Cryville/Crtr/{ => Ruleset}/JudgeAction.cs.meta (83%) rename Assets/Cryville/Crtr/{Ruleset.cs => Ruleset/RulesetDefinition.cs} (98%) create mode 100644 Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs.meta rename Assets/Cryville/Crtr/{ => Ruleset}/RulesetInterpreter.cs (98%) rename Assets/Cryville/Crtr/{ => Ruleset}/RulesetInterpreter.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Ruleset}/RulesetSelectors.cs (98%) rename Assets/Cryville/Crtr/{ => Ruleset}/RulesetSelectors.cs.meta (83%) delete mode 100644 Assets/Cryville/Crtr/Skin.cs.meta create mode 100644 Assets/Cryville/Crtr/Skin.meta rename Assets/Cryville/Crtr/{ => Skin}/Components.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/MeshBase.cs (97%) rename Assets/Cryville/Crtr/{ => Skin}/Components/MeshBase.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin/Components}/MeshWrapper.cs (91%) rename Assets/Cryville/Crtr/{ => Skin/Components}/MeshWrapper.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/PolygonSGO.cs (99%) rename Assets/Cryville/Crtr/{ => Skin}/Components/PolygonSGO.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SectionalGameObject.cs (96%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SectionalGameObject.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SkinAnimation.cs (98%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SkinAnimation.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SkinComponent.cs (96%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SkinComponent.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteBase.cs (95%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteBase.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpritePlane.cs (95%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpritePlane.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteRect.cs (84%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteRect.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteScale3.cs (95%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteScale3.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteText.cs (99%) rename Assets/Cryville/Crtr/{ => Skin}/Components/SpriteText.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/TrackLine.cs (96%) rename Assets/Cryville/Crtr/{ => Skin}/Components/TrackLine.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/Components/TransformInterface.cs (90%) rename Assets/Cryville/Crtr/{ => Skin}/Components/TransformInterface.cs.meta (100%) rename Assets/Cryville/Crtr/{ => Skin}/EffectGroup.cs (98%) rename Assets/Cryville/Crtr/{ => Skin}/EffectGroup.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Skin}/EffectInstance.cs (98%) rename Assets/Cryville/Crtr/{ => Skin}/EffectInstance.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Skin}/EffectManager.cs (96%) rename Assets/Cryville/Crtr/{ => Skin}/EffectManager.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Skin}/SkinContainer.cs (99%) rename Assets/Cryville/Crtr/{ => Skin}/SkinContainer.cs.meta (83%) rename Assets/Cryville/Crtr/{Skin.cs => Skin/SkinDefinition.cs} (98%) create mode 100644 Assets/Cryville/Crtr/Skin/SkinDefinition.cs.meta rename Assets/Cryville/Crtr/{ => Skin}/SkinInterpreter.cs (99%) rename Assets/Cryville/Crtr/{ => Skin}/SkinInterpreter.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Skin}/SkinPropertyKey.cs (98%) rename Assets/Cryville/Crtr/{ => Skin}/SkinPropertyKey.cs.meta (83%) rename Assets/Cryville/Crtr/{ => Skin}/SkinSelectors.cs (98%) create mode 100644 Assets/Cryville/Crtr/Skin/SkinSelectors.cs.meta delete mode 100644 Assets/Cryville/Crtr/SkinSelectors.cs.meta delete mode 100644 Assets/Cryville/Crtr/StampedEvent.cs.meta create mode 100644 Assets/Cryville/Crtr/UI.meta create mode 100644 Assets/Cryville/Crtr/UI/BrowserItem.cs create mode 100644 Assets/Cryville/Crtr/UI/BrowserItem.cs.meta rename Assets/Cryville/Crtr/{Browsing => UI}/BrowserItemTile.cs (92%) create mode 100644 Assets/Cryville/Crtr/UI/BrowserItemTile.cs.meta rename Assets/Cryville/Crtr/{Browsing => UI}/DetailPanel.cs (97%) create mode 100644 Assets/Cryville/Crtr/UI/DetailPanel.cs.meta rename Assets/Cryville/Crtr/{ => UI}/Dialog.cs (98%) rename Assets/Cryville/Crtr/{ => UI}/Dialog.cs.meta (100%) rename Assets/Cryville/Crtr/{ => UI}/Master.cs (92%) rename Assets/Cryville/Crtr/{ => UI}/Master.cs.meta (100%) rename Assets/Cryville/Crtr/{ => UI}/Menu.cs (97%) rename Assets/Cryville/Crtr/{ => UI}/Menu.cs.meta (100%) rename Assets/Cryville/Crtr/{Browsing => UI}/PathPart.cs (93%) create mode 100644 Assets/Cryville/Crtr/UI/PathPart.cs.meta rename Assets/Cryville/Crtr/{ => UI}/Popup.cs (96%) rename Assets/Cryville/Crtr/{ => UI}/Popup.cs.meta (100%) rename Assets/Cryville/Crtr/{Browsing => UI}/ResourceBrowser.cs (97%) create mode 100644 Assets/Cryville/Crtr/UI/ResourceBrowser.cs.meta rename Assets/Cryville/Crtr/{Browsing => UI}/ResourceBrowserMaster.cs (92%) create mode 100644 Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs.meta rename Assets/Cryville/Crtr/{Browsing => UI}/ResourceBrowserUnit.cs (90%) create mode 100644 Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs.meta diff --git a/Assets/Cryville/Crtr/Anchor.cs b/Assets/Cryville/Crtr/Anchor.cs index dc7d7a5..b315ed7 100644 --- a/Assets/Cryville/Crtr/Anchor.cs +++ b/Assets/Cryville/Crtr/Anchor.cs @@ -1,4 +1,5 @@ using Cryville.Common.Collections.Specialized; +using Cryville.Crtr.Skin; using UnityEngine; namespace Cryville.Crtr { diff --git a/Assets/Cryville/Crtr/Browsing/BrowserItem.cs.meta b/Assets/Cryville/Crtr/Browsing/BrowserItem.cs.meta deleted file mode 100644 index bea17c6..0000000 --- a/Assets/Cryville/Crtr/Browsing/BrowserItem.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: cfa7de3f6f944914d9999fcfda245f97 -timeCreated: 1637552994 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs.meta b/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs.meta deleted file mode 100644 index a400043..0000000 --- a/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b38d66b3e6e5d94438c72f855c4efff9 -timeCreated: 1637554149 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/ChartDetail.cs b/Assets/Cryville/Crtr/Browsing/ChartDetail.cs new file mode 100644 index 0000000..7199b46 --- /dev/null +++ b/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 Cover { get; set; } + public ChartMeta Meta { get; set; } + } +} diff --git a/Assets/Cryville/Crtr/Browsing/ChartDetail.cs.meta b/Assets/Cryville/Crtr/Browsing/ChartDetail.cs.meta new file mode 100644 index 0000000..cc13f9d --- /dev/null +++ b/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: diff --git a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs.meta b/Assets/Cryville/Crtr/Browsing/DetailPanel.cs.meta deleted file mode 100644 index 69f918c..0000000 --- a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 477e04b1ed5b60e48886fb76081245c5 -timeCreated: 1637722157 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs index c311555..a7c3991 100644 --- a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Browsing/PathPart.cs.meta b/Assets/Cryville/Crtr/Browsing/PathPart.cs.meta deleted file mode 100644 index 4c77401..0000000 --- a/Assets/Cryville/Crtr/Browsing/PathPart.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 5d443a346e9a19d4eabbb0fa9ec7016f -timeCreated: 1637566071 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs.meta b/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs.meta deleted file mode 100644 index 565267d..0000000 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: c6b4df13dea0e4a469d7e54e7e8fb428 -timeCreated: 1637234060 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs.meta b/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs.meta deleted file mode 100644 index 0973248..0000000 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 256d7d3efda1f9b4c882eb42e608cc8e -timeCreated: 1638414803 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs.meta b/Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs.meta deleted file mode 100644 index 5d82606..0000000 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a69c80e5f3e7bd04485bc3afc5826584 -timeCreated: 1638415083 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/BrowserItem.cs b/Assets/Cryville/Crtr/Browsing/ResourceItemMeta.cs similarity index 59% rename from Assets/Cryville/Crtr/Browsing/BrowserItem.cs rename to Assets/Cryville/Crtr/Browsing/ResourceItemMeta.cs index 9a02915..2a8f190 100644 --- a/Assets/Cryville/Crtr/Browsing/BrowserItem.cs +++ b/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 Icon { get; set; } diff --git a/Assets/Cryville/Crtr/Browsing/ResourceItemMeta.cs.meta b/Assets/Cryville/Crtr/Browsing/ResourceItemMeta.cs.meta new file mode 100644 index 0000000..affbd2e --- /dev/null +++ b/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: diff --git a/Assets/Cryville/Crtr/GenericResources.cs b/Assets/Cryville/Crtr/BuiltinResources.cs similarity index 94% rename from Assets/Cryville/Crtr/GenericResources.cs rename to Assets/Cryville/Crtr/BuiltinResources.cs index fa35618..d4f8016 100644 --- a/Assets/Cryville/Crtr/GenericResources.cs +++ b/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 Components = new Dictionary(); public static Dictionary Shaders diff --git a/Assets/Cryville/Crtr/GenericResources.cs.meta b/Assets/Cryville/Crtr/BuiltinResources.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/GenericResources.cs.meta rename to Assets/Cryville/Crtr/BuiltinResources.cs.meta diff --git a/Assets/Cryville/Crtr/Chart.cs b/Assets/Cryville/Crtr/Chart.cs index 03b3ddf..4077987 100644 --- a/Assets/Cryville/Crtr/Chart.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/ChartPlayer.cs b/Assets/Cryville/Crtr/ChartPlayer.cs index b2cccbf..3b892ac 100644 --- a/Assets/Cryville/Crtr/ChartPlayer.cs +++ b/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 texs; public static Dictionary frames; @@ -71,7 +74,7 @@ namespace Cryville.Crtr { logs = logobj.GetComponent(); 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(reader.ReadToEnd(), new JsonSerializerSettings() { + skin = JsonConvert.DeserializeObject(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(reader.ReadToEnd(), new JsonSerializerSettings() { + ruleset = JsonConvert.DeserializeObject(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); diff --git a/Assets/Cryville/Crtr/Config/ConfigPanelMaster.cs b/Assets/Cryville/Crtr/Config/ConfigPanelMaster.cs index eeff962..9109084 100644 --- a/Assets/Cryville/Crtr/Config/ConfigPanelMaster.cs +++ b/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(reader.ReadToEnd(), new JsonSerializerSettings() { + ruleset = JsonConvert.DeserializeObject(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( diff --git a/Assets/Cryville/Crtr/Config/InputConfigPanel.cs b/Assets/Cryville/Crtr/Config/InputConfigPanel.cs index 2e40baf..b3a3e89 100644 --- a/Assets/Cryville/Crtr/Config/InputConfigPanel.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs b/Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs index 3363fb6..c7c6a55 100644 --- a/Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Config/RulesetConfigPropertyAdapter.cs b/Assets/Cryville/Crtr/Config/RulesetConfigPropertyAdapter.cs index e982df8..763da65 100644 --- a/Assets/Cryville/Crtr/Config/RulesetConfigPropertyAdapter.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Config/RulesetConfigStore.cs b/Assets/Cryville/Crtr/Config/RulesetConfigStore.cs index f169ee3..7302e93 100644 --- a/Assets/Cryville/Crtr/Config/RulesetConfigStore.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/ChartHandler.cs b/Assets/Cryville/Crtr/Event/ChartHandler.cs similarity index 96% rename from Assets/Cryville/Crtr/ChartHandler.cs rename to Assets/Cryville/Crtr/Event/ChartHandler.cs index 919b56c..4e1bb5e 100644 --- a/Assets/Cryville/Crtr/ChartHandler.cs +++ b/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; } } diff --git a/Assets/Cryville/Crtr/ChartHandler.cs.meta b/Assets/Cryville/Crtr/Event/ChartHandler.cs.meta similarity index 69% rename from Assets/Cryville/Crtr/ChartHandler.cs.meta rename to Assets/Cryville/Crtr/Event/ChartHandler.cs.meta index d2a49b6..b0845f7 100644 --- a/Assets/Cryville/Crtr/ChartHandler.cs.meta +++ b/Assets/Cryville/Crtr/Event/ChartHandler.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: d8339b62359a4eb428e5d7939a0e8fe4 -timeCreated: 1593870951 -licenseType: Pro +guid: 59e25dacd9b4d1f45b1da3a381187560 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Cryville/Crtr/Event/ContainerHandler.cs b/Assets/Cryville/Crtr/Event/ContainerHandler.cs index 8be18ea..4444906 100644 --- a/Assets/Cryville/Crtr/Event/ContainerHandler.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Event/ContainerState.cs b/Assets/Cryville/Crtr/Event/ContainerState.cs index 62c08e4..15c46db 100644 --- a/Assets/Cryville/Crtr/Event/ContainerState.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Event/EventBus.cs b/Assets/Cryville/Crtr/Event/EventBus.cs index 6a4be31..f67e31b 100644 --- a/Assets/Cryville/Crtr/Event/EventBus.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/GroupHandler.cs b/Assets/Cryville/Crtr/Event/GroupHandler.cs similarity index 96% rename from Assets/Cryville/Crtr/GroupHandler.cs rename to Assets/Cryville/Crtr/Event/GroupHandler.cs index f1703f1..a170ed0 100644 --- a/Assets/Cryville/Crtr/GroupHandler.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/GroupHandler.cs.meta b/Assets/Cryville/Crtr/Event/GroupHandler.cs.meta similarity index 69% rename from Assets/Cryville/Crtr/GroupHandler.cs.meta rename to Assets/Cryville/Crtr/Event/GroupHandler.cs.meta index d945c1c..f930c06 100644 --- a/Assets/Cryville/Crtr/GroupHandler.cs.meta +++ b/Assets/Cryville/Crtr/Event/GroupHandler.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 1d6ad7170a6c76248a8ec305e98a75b2 -timeCreated: 1599459182 -licenseType: Pro +guid: a254d6c958ea6c5409991bde44e67635 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Cryville/Crtr/NoteHandler.cs b/Assets/Cryville/Crtr/Event/NoteHandler.cs similarity index 93% rename from Assets/Cryville/Crtr/NoteHandler.cs rename to Assets/Cryville/Crtr/Event/NoteHandler.cs index fd4b67b..ed77eec 100644 --- a/Assets/Cryville/Crtr/NoteHandler.cs +++ b/Assets/Cryville/Crtr/Event/NoteHandler.cs @@ -1,16 +1,16 @@ using Cryville.Common; -using Cryville.Crtr.Components; -using Cryville.Crtr.Event; +using Cryville.Crtr.Ruleset; +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); } diff --git a/Assets/Cryville/Crtr/Event/NoteHandler.cs.meta b/Assets/Cryville/Crtr/Event/NoteHandler.cs.meta new file mode 100644 index 0000000..303dab5 --- /dev/null +++ b/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: diff --git a/Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs b/Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs new file mode 100644 index 0000000..8e9f591 --- /dev/null +++ b/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 RelativeNodes; + internal byte CloneTypeFlag; + + public RealtimeMotionValue Init(Vector init) { + _type = init.GetType(); + RelativeNodes = new IntKeyedDictionary(); + 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); + } + + /// + /// Computes the motion value. + /// + /// The vector type of the value. + /// The result. + public void Compute(ref T result) where T : Vector { + AbsoluteValue.CopyTo(result); + result.ApplyFrom(RelativeValue); + } + } +} diff --git a/Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs.meta b/Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs.meta new file mode 100644 index 0000000..443a76d --- /dev/null +++ b/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: diff --git a/Assets/Cryville/Crtr/StampedEvent.cs b/Assets/Cryville/Crtr/Event/StampedEvent.cs similarity index 98% rename from Assets/Cryville/Crtr/StampedEvent.cs rename to Assets/Cryville/Crtr/Event/StampedEvent.cs index 8fc5861..98df863 100644 --- a/Assets/Cryville/Crtr/StampedEvent.cs +++ b/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 { public double Time; public ChartEvent Unstamped; diff --git a/Assets/Cryville/Crtr/Event/StampedEvent.cs.meta b/Assets/Cryville/Crtr/Event/StampedEvent.cs.meta new file mode 100644 index 0000000..e637ed4 --- /dev/null +++ b/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: diff --git a/Assets/Cryville/Crtr/StateBase.cs b/Assets/Cryville/Crtr/Event/StateBase.cs similarity index 99% rename from Assets/Cryville/Crtr/StateBase.cs rename to Assets/Cryville/Crtr/Event/StateBase.cs index a466fb7..b6fac7e 100644 --- a/Assets/Cryville/Crtr/StateBase.cs +++ b/Assets/Cryville/Crtr/Event/StateBase.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Event { /// /// A time-forward handler of a sequence of events. /// diff --git a/Assets/Cryville/Crtr/StateBase.cs.meta b/Assets/Cryville/Crtr/Event/StateBase.cs.meta similarity index 69% rename from Assets/Cryville/Crtr/StateBase.cs.meta rename to Assets/Cryville/Crtr/Event/StateBase.cs.meta index 9127a01..be91192 100644 --- a/Assets/Cryville/Crtr/StateBase.cs.meta +++ b/Assets/Cryville/Crtr/Event/StateBase.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 116c345bd51b98740aa99a3e08442e5f -timeCreated: 1594732377 -licenseType: Pro +guid: 5ea84a1810568034e96c8d3837b3ca2f MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Cryville/Crtr/TrackHandler.cs b/Assets/Cryville/Crtr/Event/TrackHandler.cs similarity index 91% rename from Assets/Cryville/Crtr/TrackHandler.cs rename to Assets/Cryville/Crtr/Event/TrackHandler.cs index cc22744..fc46c36 100644 --- a/Assets/Cryville/Crtr/TrackHandler.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/TrackHandler.cs.meta b/Assets/Cryville/Crtr/Event/TrackHandler.cs.meta similarity index 69% rename from Assets/Cryville/Crtr/TrackHandler.cs.meta rename to Assets/Cryville/Crtr/Event/TrackHandler.cs.meta index db567b0..61235fa 100644 --- a/Assets/Cryville/Crtr/TrackHandler.cs.meta +++ b/Assets/Cryville/Crtr/Event/TrackHandler.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: e1e306e8a7b15c7458de2e0b03551c86 -timeCreated: 1593349834 -licenseType: Pro +guid: f9a4d5fe2d0dc5d4d869d91670cc1aab MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Cryville/Crtr/TransformHandler.cs b/Assets/Cryville/Crtr/Event/TransformHandler.cs similarity index 97% rename from Assets/Cryville/Crtr/TransformHandler.cs rename to Assets/Cryville/Crtr/Event/TransformHandler.cs index d904feb..10ba7dc 100644 --- a/Assets/Cryville/Crtr/TransformHandler.cs +++ b/Assets/Cryville/Crtr/Event/TransformHandler.cs @@ -1,9 +1,8 @@ -using Cryville.Crtr.Components; -using Cryville.Crtr.Event; +using Cryville.Crtr.Skin.Components; 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() { diff --git a/Assets/Cryville/Crtr/TransformHandler.cs.meta b/Assets/Cryville/Crtr/Event/TransformHandler.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/TransformHandler.cs.meta rename to Assets/Cryville/Crtr/Event/TransformHandler.cs.meta index 9df6107..d8beac8 100644 --- a/Assets/Cryville/Crtr/TransformHandler.cs.meta +++ b/Assets/Cryville/Crtr/Event/TransformHandler.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd92dc120682e174cb42752bd304e12a +guid: b6f66c022b25fe344908a0e34ef40615 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/Extensions/Umg/RulesetResourceImporter.cs b/Assets/Cryville/Crtr/Extensions/Umg/RulesetResourceImporter.cs index d0e3e13..d89b86e 100644 --- a/Assets/Cryville/Crtr/Extensions/Umg/RulesetResourceImporter.cs +++ b/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(reader.ReadToEnd()); + var data = JsonConvert.DeserializeObject(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(reader.ReadToEnd()); + var meta = JsonConvert.DeserializeObject(reader.ReadToEnd()); Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt"))); } } diff --git a/Assets/Cryville/Crtr/Extensions/Umg/SkinResourceImporter.cs b/Assets/Cryville/Crtr/Extensions/Umg/SkinResourceImporter.cs index 3500c77..61fb189 100644 --- a/Assets/Cryville/Crtr/Extensions/Umg/SkinResourceImporter.cs +++ b/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(reader.ReadToEnd()); + var data = JsonConvert.DeserializeObject(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(reader.ReadToEnd()); + var meta = JsonConvert.DeserializeObject(reader.ReadToEnd()); RulesetName = meta.ruleset; Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt"))); foreach (var frame in meta.frames) { diff --git a/Assets/Cryville/Crtr/Game.cs b/Assets/Cryville/Crtr/Game.cs index 4b1f9b7..bc85403 100644 --- a/Assets/Cryville/Crtr/Game.cs +++ b/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 diff --git a/Assets/Cryville/Crtr/Judge.cs.meta b/Assets/Cryville/Crtr/Judge.cs.meta deleted file mode 100644 index 7a8ea38..0000000 --- a/Assets/Cryville/Crtr/Judge.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 1207cc17aa0c9ea469cfcf1508a3d5bb -timeCreated: 1618822453 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Motion.cs b/Assets/Cryville/Crtr/Motion.cs index 5f5af8d..cabb91e 100644 --- a/Assets/Cryville/Crtr/Motion.cs +++ b/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 RelativeNodes; - internal byte CloneTypeFlag; - - public RealtimeMotionValue Init(Vector init) { - _type = init.GetType(); - RelativeNodes = new IntKeyedDictionary(); - 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); - } - - /// - /// Computes the motion value. - /// - /// The vector type of the value. - /// The result. - public void Compute(ref T result) where T : Vector { - AbsoluteValue.CopyTo(result); - result.ApplyFrom(RelativeValue); - } - } - public class MotionNode { public short Id = -1; public bool Reset; diff --git a/Assets/Cryville/Crtr/Network/UpdateChecker.cs b/Assets/Cryville/Crtr/Network/UpdateChecker.cs index 050b84e..c4473fa 100644 --- a/Assets/Cryville/Crtr/Network/UpdateChecker.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/NoteHandler.cs.meta b/Assets/Cryville/Crtr/NoteHandler.cs.meta deleted file mode 100644 index 18b446e..0000000 --- a/Assets/Cryville/Crtr/NoteHandler.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 08f912088c111c54f9f93c0e2909cb08 -timeCreated: 1603439909 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/PdtBinder.cs b/Assets/Cryville/Crtr/PdtBinder.cs index b881146..b3f678d 100644 --- a/Assets/Cryville/Crtr/PdtBinder.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/PdtEvaluator.cs b/Assets/Cryville/Crtr/PdtEvaluator.cs index 2ea0a70..af63f8f 100644 --- a/Assets/Cryville/Crtr/PdtEvaluator.cs +++ b/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; diff --git a/Assets/Cryville/Crtr/Ruleset.cs.meta b/Assets/Cryville/Crtr/Ruleset.cs.meta deleted file mode 100644 index 08b6e5e..0000000 --- a/Assets/Cryville/Crtr/Ruleset.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 944c0595781268243b3c9b005ecbed91 -timeCreated: 1611884196 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Ruleset.meta b/Assets/Cryville/Crtr/Ruleset.meta new file mode 100644 index 0000000..adb10ec --- /dev/null +++ b/Assets/Cryville/Crtr/Ruleset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67b93c294681b73409a52a4d03a36d52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/InputProxy.cs b/Assets/Cryville/Crtr/Ruleset/InputProxy.cs similarity index 99% rename from Assets/Cryville/Crtr/InputProxy.cs rename to Assets/Cryville/Crtr/Ruleset/InputProxy.cs index 1d8afa5..6b82a71 100644 --- a/Assets/Cryville/Crtr/InputProxy.cs +++ b/Assets/Cryville/Crtr/Ruleset/InputProxy.cs @@ -11,7 +11,7 @@ using UnityEngine.Profiling; using Logger = Cryville.Common.Logging.Logger; using RVector4 = UnityEngine.Vector4; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Ruleset { public class InputProxy : IDisposable { readonly PdtEvaluator _etor; readonly PdtRuleset _ruleset; diff --git a/Assets/Cryville/Crtr/InputProxy.cs.meta b/Assets/Cryville/Crtr/Ruleset/InputProxy.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/InputProxy.cs.meta rename to Assets/Cryville/Crtr/Ruleset/InputProxy.cs.meta index 9343588..b167251 100644 --- a/Assets/Cryville/Crtr/InputProxy.cs.meta +++ b/Assets/Cryville/Crtr/Ruleset/InputProxy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 745ed7d8ca6e4ac458c7e008b966aad1 +guid: af16092e83ce23d46b46254e2d9798f9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/Judge.cs b/Assets/Cryville/Crtr/Ruleset/Judge.cs similarity index 99% rename from Assets/Cryville/Crtr/Judge.cs rename to Assets/Cryville/Crtr/Ruleset/Judge.cs index 71c2223..d66a77d 100644 --- a/Assets/Cryville/Crtr/Judge.cs +++ b/Assets/Cryville/Crtr/Ruleset/Judge.cs @@ -3,6 +3,7 @@ using Cryville.Common.Buffers; using Cryville.Common.Collections.Generic; using Cryville.Common.Collections.Specialized; using Cryville.Common.Pdt; +using Cryville.Crtr.Event; using System; using System.Collections.Generic; using System.Globalization; @@ -11,7 +12,7 @@ using System.Text.Formatting; using UnityEngine; using UnsafeIL; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Ruleset { internal struct JudgeResult { public float? Time { get; set; } public Vector4 Vector { get; set; } diff --git a/Assets/Cryville/Crtr/Ruleset/Judge.cs.meta b/Assets/Cryville/Crtr/Ruleset/Judge.cs.meta new file mode 100644 index 0000000..d52492a --- /dev/null +++ b/Assets/Cryville/Crtr/Ruleset/Judge.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c3063149610959f4e853ced6341a9d36 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/JudgeAction.cs b/Assets/Cryville/Crtr/Ruleset/JudgeAction.cs similarity index 98% rename from Assets/Cryville/Crtr/JudgeAction.cs rename to Assets/Cryville/Crtr/Ruleset/JudgeAction.cs index 4e3927f..3981d75 100644 --- a/Assets/Cryville/Crtr/JudgeAction.cs +++ b/Assets/Cryville/Crtr/Ruleset/JudgeAction.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Ruleset { internal struct JudgeActionResult { public bool BreakExecution; public bool PreventRecycle; diff --git a/Assets/Cryville/Crtr/JudgeAction.cs.meta b/Assets/Cryville/Crtr/Ruleset/JudgeAction.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/JudgeAction.cs.meta rename to Assets/Cryville/Crtr/Ruleset/JudgeAction.cs.meta index 4326049..c9c1e0c 100644 --- a/Assets/Cryville/Crtr/JudgeAction.cs.meta +++ b/Assets/Cryville/Crtr/Ruleset/JudgeAction.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7e5a4fc83d8c4a4db15856783b8a145 +guid: 52c6416297266354999ce5ff46a568dc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/Ruleset.cs b/Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs similarity index 98% rename from Assets/Cryville/Crtr/Ruleset.cs rename to Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs index 00749ab..8126dfc 100644 --- a/Assets/Cryville/Crtr/Ruleset.cs +++ b/Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs @@ -10,8 +10,8 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -namespace Cryville.Crtr { - public class Ruleset : MetaInfo { +namespace Cryville.Crtr.Ruleset { + public class RulesetDefinition : MetaInfo { public const long CURRENT_FORMAT = 2; [JsonRequired] diff --git a/Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs.meta b/Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs.meta new file mode 100644 index 0000000..d7ccf90 --- /dev/null +++ b/Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d7a277a6e9217e4591c39d1a220cbcf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/RulesetInterpreter.cs b/Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs similarity index 98% rename from Assets/Cryville/Crtr/RulesetInterpreter.cs rename to Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs index 1461f00..6d74dd2 100644 --- a/Assets/Cryville/Crtr/RulesetInterpreter.cs +++ b/Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Reflection; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Ruleset { internal class RulesetInterpreter : PdtInterpreter { public RulesetInterpreter(string src, Binder binder) : base(src, binder) { } diff --git a/Assets/Cryville/Crtr/RulesetInterpreter.cs.meta b/Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/RulesetInterpreter.cs.meta rename to Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs.meta index cc5c5b4..d34998e 100644 --- a/Assets/Cryville/Crtr/RulesetInterpreter.cs.meta +++ b/Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a62ab15ed019314eb3445e2756c1399 +guid: 78904c737c51e254ab55b6686d964837 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/RulesetSelectors.cs b/Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs similarity index 98% rename from Assets/Cryville/Crtr/RulesetSelectors.cs rename to Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs index 18df9aa..f8da11c 100644 --- a/Assets/Cryville/Crtr/RulesetSelectors.cs +++ b/Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Ruleset { public class RulesetSelectors { readonly RulesetSelector[] selectors; public RulesetSelectors(IEnumerable s) { diff --git a/Assets/Cryville/Crtr/RulesetSelectors.cs.meta b/Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/RulesetSelectors.cs.meta rename to Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs.meta index e73f342..be16a35 100644 --- a/Assets/Cryville/Crtr/RulesetSelectors.cs.meta +++ b/Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 242eb128bac44ae43b43c14363fc656a +guid: 770e66e317b9b3848a16736b68414b43 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/Skin.cs.meta b/Assets/Cryville/Crtr/Skin.cs.meta deleted file mode 100644 index 4d3defb..0000000 --- a/Assets/Cryville/Crtr/Skin.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f6e4d79135377bf49b49a66ddb11a60d -timeCreated: 1605000903 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Skin.meta b/Assets/Cryville/Crtr/Skin.meta new file mode 100644 index 0000000..eade63f --- /dev/null +++ b/Assets/Cryville/Crtr/Skin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 451ec22a54dfa0a488e2e160f1c0911e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Components.meta b/Assets/Cryville/Crtr/Skin/Components.meta similarity index 100% rename from Assets/Cryville/Crtr/Components.meta rename to Assets/Cryville/Crtr/Skin/Components.meta diff --git a/Assets/Cryville/Crtr/Components/MeshBase.cs b/Assets/Cryville/Crtr/Skin/Components/MeshBase.cs similarity index 97% rename from Assets/Cryville/Crtr/Components/MeshBase.cs rename to Assets/Cryville/Crtr/Skin/Components/MeshBase.cs index 92a3c10..466ed83 100644 --- a/Assets/Cryville/Crtr/Components/MeshBase.cs +++ b/Assets/Cryville/Crtr/Skin/Components/MeshBase.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { [DisallowMultipleComponent] public abstract class MeshBase : SkinComponent { public MeshBase() { diff --git a/Assets/Cryville/Crtr/Components/MeshBase.cs.meta b/Assets/Cryville/Crtr/Skin/Components/MeshBase.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/MeshBase.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/MeshBase.cs.meta diff --git a/Assets/Cryville/Crtr/MeshWrapper.cs b/Assets/Cryville/Crtr/Skin/Components/MeshWrapper.cs similarity index 91% rename from Assets/Cryville/Crtr/MeshWrapper.cs rename to Assets/Cryville/Crtr/Skin/Components/MeshWrapper.cs index 7975f2b..fea293b 100644 --- a/Assets/Cryville/Crtr/MeshWrapper.cs +++ b/Assets/Cryville/Crtr/Skin/Components/MeshWrapper.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin.Components { public class MeshWrapper { public GameObject MeshObject { get; @@ -28,7 +28,7 @@ namespace Cryville.Crtr { private set; } public static Material NewMaterial() { - return Material.Instantiate(GenericResources.Materials["-SpriteMat"]); + return Material.Instantiate(BuiltinResources.Materials["-SpriteMat"]); } public void Init(Transform parent) { MeshObject = new GameObject("__mesh__"); diff --git a/Assets/Cryville/Crtr/MeshWrapper.cs.meta b/Assets/Cryville/Crtr/Skin/Components/MeshWrapper.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/MeshWrapper.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/MeshWrapper.cs.meta diff --git a/Assets/Cryville/Crtr/Components/PolygonSGO.cs b/Assets/Cryville/Crtr/Skin/Components/PolygonSGO.cs similarity index 99% rename from Assets/Cryville/Crtr/Components/PolygonSGO.cs rename to Assets/Cryville/Crtr/Skin/Components/PolygonSGO.cs index 582b03e..8784a26 100644 --- a/Assets/Cryville/Crtr/Components/PolygonSGO.cs +++ b/Assets/Cryville/Crtr/Skin/Components/PolygonSGO.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class PolygonSGO : SectionalGameObject { static readonly SimpleObjectPool> _ptPool = new SimpleObjectPool>(1024); static readonly SimpleObjectPool> _lPool = new SimpleObjectPool>(1024); diff --git a/Assets/Cryville/Crtr/Components/PolygonSGO.cs.meta b/Assets/Cryville/Crtr/Skin/Components/PolygonSGO.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/PolygonSGO.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/PolygonSGO.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs b/Assets/Cryville/Crtr/Skin/Components/SectionalGameObject.cs similarity index 96% rename from Assets/Cryville/Crtr/Components/SectionalGameObject.cs rename to Assets/Cryville/Crtr/Skin/Components/SectionalGameObject.cs index 762a075..81aa577 100644 --- a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SectionalGameObject.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public abstract class SectionalGameObject : MeshBase { protected Vector3? prevpt; protected Quaternion? prevrot; diff --git a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SectionalGameObject.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SectionalGameObject.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SectionalGameObject.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SkinAnimation.cs b/Assets/Cryville/Crtr/Skin/Components/SkinAnimation.cs similarity index 98% rename from Assets/Cryville/Crtr/Components/SkinAnimation.cs rename to Assets/Cryville/Crtr/Skin/Components/SkinAnimation.cs index 7a93f0a..1f1906f 100644 --- a/Assets/Cryville/Crtr/Components/SkinAnimation.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SkinAnimation.cs @@ -3,7 +3,7 @@ using System; using UnityEngine; using Logger = Cryville.Common.Logging.Logger; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class SkinAnimation : SkinComponent { public SkinAnimation() { SubmitProperty("name", new PropOp.Identifier(v => Name = v)); diff --git a/Assets/Cryville/Crtr/Components/SkinAnimation.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SkinAnimation.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SkinAnimation.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SkinAnimation.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SkinComponent.cs b/Assets/Cryville/Crtr/Skin/Components/SkinComponent.cs similarity index 96% rename from Assets/Cryville/Crtr/Components/SkinComponent.cs rename to Assets/Cryville/Crtr/Skin/Components/SkinComponent.cs index 7115ce1..005f3ae 100644 --- a/Assets/Cryville/Crtr/Components/SkinComponent.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SkinComponent.cs @@ -3,7 +3,7 @@ using Cryville.Common.Collections.Specialized; using Cryville.Common.Pdt; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public abstract class SkinComponent : MonoBehaviour { /// /// The property operators of the component. diff --git a/Assets/Cryville/Crtr/Components/SkinComponent.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SkinComponent.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SkinComponent.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SkinComponent.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SpriteBase.cs b/Assets/Cryville/Crtr/Skin/Components/SpriteBase.cs similarity index 95% rename from Assets/Cryville/Crtr/Components/SpriteBase.cs rename to Assets/Cryville/Crtr/Skin/Components/SpriteBase.cs index d105c95..0ccb699 100644 --- a/Assets/Cryville/Crtr/Components/SpriteBase.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SpriteBase.cs @@ -1,7 +1,7 @@ using Cryville.Common.Pdt; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public abstract class SpriteBase : MeshBase { public SpriteBase() { SubmitProperty("bound", new op_set_bound(this)); @@ -89,7 +89,7 @@ namespace Cryville.Crtr.Components { protected void InternalInit(string meshName = "quad") { mesh.Init(transform); mesh.Renderer.sharedMaterials = materials = new Material[] { MeshWrapper.NewMaterial() }; - mesh.Mesh = Mesh.Instantiate(GenericResources.Meshes[meshName]); + mesh.Mesh = Mesh.Instantiate(BuiltinResources.Meshes[meshName]); UpdateColor(); UpdateScale(); UpdateZIndex(); diff --git a/Assets/Cryville/Crtr/Components/SpriteBase.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SpriteBase.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SpriteBase.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SpriteBase.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SpritePlane.cs b/Assets/Cryville/Crtr/Skin/Components/SpritePlane.cs similarity index 95% rename from Assets/Cryville/Crtr/Components/SpritePlane.cs rename to Assets/Cryville/Crtr/Skin/Components/SpritePlane.cs index 741fe5d..8d096f7 100644 --- a/Assets/Cryville/Crtr/Components/SpritePlane.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SpritePlane.cs @@ -2,7 +2,7 @@ using System; using UnityEngine; using Logger = Cryville.Common.Logging.Logger; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class SpriteInfo { string m_frameName; public string FrameName { @@ -67,7 +67,7 @@ namespace Cryville.Crtr.Components { protected static Vector2[] OriginalUV { get { if (_origuv == null) { - var m = GenericResources.Meshes["quad"]; + var m = BuiltinResources.Meshes["quad"]; Vector2[] uv = new Vector2[m.vertices.Length]; for (int i = 0; i < uv.Length; i++) { uv[i] = new Vector2( @@ -129,13 +129,13 @@ namespace Cryville.Crtr.Components { Shader m_shader; public string Shader { set { - m_shader = GenericResources.Shaders[value]; + m_shader = BuiltinResources.Shaders[value]; UpdateShader(); } } void UpdateShader() { if (!mesh.Initialized) return; - if (m_shader == null) m_shader = GenericResources.Shaders["default"]; + if (m_shader == null) m_shader = BuiltinResources.Shaders["default"]; mesh.Renderer.sharedMaterial.shader = m_shader; UpdateZIndex(); } diff --git a/Assets/Cryville/Crtr/Components/SpritePlane.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SpritePlane.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SpritePlane.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SpritePlane.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SpriteRect.cs b/Assets/Cryville/Crtr/Skin/Components/SpriteRect.cs similarity index 84% rename from Assets/Cryville/Crtr/Components/SpriteRect.cs rename to Assets/Cryville/Crtr/Skin/Components/SpriteRect.cs index 9c73647..ff193a8 100644 --- a/Assets/Cryville/Crtr/Components/SpriteRect.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SpriteRect.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class SpriteRect : SpriteBase { public SpriteRect() { } diff --git a/Assets/Cryville/Crtr/Components/SpriteRect.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SpriteRect.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SpriteRect.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SpriteRect.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SpriteScale3.cs b/Assets/Cryville/Crtr/Skin/Components/SpriteScale3.cs similarity index 95% rename from Assets/Cryville/Crtr/Components/SpriteScale3.cs rename to Assets/Cryville/Crtr/Skin/Components/SpriteScale3.cs index 0ffa908..73aa384 100644 --- a/Assets/Cryville/Crtr/Components/SpriteScale3.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SpriteScale3.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class SpriteScale3 : SpritePlane { public SpriteScale3() { SubmitProperty("border", new PropOp.Vector2(v => Border = v)); @@ -16,7 +16,7 @@ namespace Cryville.Crtr.Components { protected static new Vector2[] OriginalUV { get { if (_origuv == null) { - var m = GenericResources.Meshes["quad_scale3h"]; + var m = BuiltinResources.Meshes["quad_scale3h"]; Vector2[] uv = new Vector2[m.vertices.Length]; for (int i = 0; i < uv.Length; i++) { uv[i] = new Vector2( diff --git a/Assets/Cryville/Crtr/Components/SpriteScale3.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SpriteScale3.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SpriteScale3.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SpriteScale3.cs.meta diff --git a/Assets/Cryville/Crtr/Components/SpriteText.cs b/Assets/Cryville/Crtr/Skin/Components/SpriteText.cs similarity index 99% rename from Assets/Cryville/Crtr/Components/SpriteText.cs rename to Assets/Cryville/Crtr/Skin/Components/SpriteText.cs index e31aeb0..6e8aad4 100644 --- a/Assets/Cryville/Crtr/Components/SpriteText.cs +++ b/Assets/Cryville/Crtr/Skin/Components/SpriteText.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class SpriteText : SpriteBase { public SpriteText() { SubmitProperty("frames", new op_set_frames(this)); diff --git a/Assets/Cryville/Crtr/Components/SpriteText.cs.meta b/Assets/Cryville/Crtr/Skin/Components/SpriteText.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/SpriteText.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/SpriteText.cs.meta diff --git a/Assets/Cryville/Crtr/Components/TrackLine.cs b/Assets/Cryville/Crtr/Skin/Components/TrackLine.cs similarity index 96% rename from Assets/Cryville/Crtr/Components/TrackLine.cs rename to Assets/Cryville/Crtr/Skin/Components/TrackLine.cs index 61d9bf1..beee864 100644 --- a/Assets/Cryville/Crtr/Components/TrackLine.cs +++ b/Assets/Cryville/Crtr/Skin/Components/TrackLine.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class TrackLine : SectionalGameObject { readonly List vertices = new List(); diff --git a/Assets/Cryville/Crtr/Components/TrackLine.cs.meta b/Assets/Cryville/Crtr/Skin/Components/TrackLine.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/TrackLine.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/TrackLine.cs.meta diff --git a/Assets/Cryville/Crtr/Components/TransformInterface.cs b/Assets/Cryville/Crtr/Skin/Components/TransformInterface.cs similarity index 90% rename from Assets/Cryville/Crtr/Components/TransformInterface.cs rename to Assets/Cryville/Crtr/Skin/Components/TransformInterface.cs index 298d792..cfe328b 100644 --- a/Assets/Cryville/Crtr/Components/TransformInterface.cs +++ b/Assets/Cryville/Crtr/Skin/Components/TransformInterface.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Cryville.Crtr.Components { +namespace Cryville.Crtr.Skin.Components { public class TransformInterface : SkinComponent { public TransformInterface() { SubmitProperty("pos", new PropOp.Vector3(v => transform.localPosition = v)); diff --git a/Assets/Cryville/Crtr/Components/TransformInterface.cs.meta b/Assets/Cryville/Crtr/Skin/Components/TransformInterface.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Components/TransformInterface.cs.meta rename to Assets/Cryville/Crtr/Skin/Components/TransformInterface.cs.meta diff --git a/Assets/Cryville/Crtr/EffectGroup.cs b/Assets/Cryville/Crtr/Skin/EffectGroup.cs similarity index 98% rename from Assets/Cryville/Crtr/EffectGroup.cs rename to Assets/Cryville/Crtr/Skin/EffectGroup.cs index cc99f97..0c37d24 100644 --- a/Assets/Cryville/Crtr/EffectGroup.cs +++ b/Assets/Cryville/Crtr/Skin/EffectGroup.cs @@ -2,7 +2,7 @@ using Cryville.Common.Buffers; using System.Collections.Generic; using UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public class EffectGroup { public EffectDefinition Definition { get; private set; } readonly EffectPool _pool; diff --git a/Assets/Cryville/Crtr/EffectGroup.cs.meta b/Assets/Cryville/Crtr/Skin/EffectGroup.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/EffectGroup.cs.meta rename to Assets/Cryville/Crtr/Skin/EffectGroup.cs.meta index 462e0ab..2a0ab2b 100644 --- a/Assets/Cryville/Crtr/EffectGroup.cs.meta +++ b/Assets/Cryville/Crtr/Skin/EffectGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d0d27f9b4383b3445a2a27bfe94173a5 +guid: 1fb5011d1fabf204c93bf6e12c842141 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/EffectInstance.cs b/Assets/Cryville/Crtr/Skin/EffectInstance.cs similarity index 98% rename from Assets/Cryville/Crtr/EffectInstance.cs rename to Assets/Cryville/Crtr/Skin/EffectInstance.cs index 39d8a3c..48fd000 100644 --- a/Assets/Cryville/Crtr/EffectInstance.cs +++ b/Assets/Cryville/Crtr/Skin/EffectInstance.cs @@ -1,12 +1,12 @@ using Cryville.Common; -using Cryville.Crtr.Components; +using Cryville.Crtr.Skin.Components; using Cryville.Crtr.Event; using System; using System.Collections.Generic; using System.Globalization; using UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public class EffectInstance : ISkinnableGroup, IComparable { readonly EffectDefinition _def; readonly SkinContainer _skinContainer; diff --git a/Assets/Cryville/Crtr/EffectInstance.cs.meta b/Assets/Cryville/Crtr/Skin/EffectInstance.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/EffectInstance.cs.meta rename to Assets/Cryville/Crtr/Skin/EffectInstance.cs.meta index c4fc6f9..a049dec 100644 --- a/Assets/Cryville/Crtr/EffectInstance.cs.meta +++ b/Assets/Cryville/Crtr/Skin/EffectInstance.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f442db34239c47046ba1b6fdae8e1216 +guid: 2f8a68f9f36942e40974e0477d44113a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/EffectManager.cs b/Assets/Cryville/Crtr/Skin/EffectManager.cs similarity index 96% rename from Assets/Cryville/Crtr/EffectManager.cs rename to Assets/Cryville/Crtr/Skin/EffectManager.cs index efd44c5..b9d7458 100644 --- a/Assets/Cryville/Crtr/EffectManager.cs +++ b/Assets/Cryville/Crtr/Skin/EffectManager.cs @@ -3,7 +3,7 @@ using Cryville.Common.Collections.Specialized; using System; using UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public class EffectManager { readonly IntKeyedDictionary _groups = new IntKeyedDictionary(); diff --git a/Assets/Cryville/Crtr/EffectManager.cs.meta b/Assets/Cryville/Crtr/Skin/EffectManager.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/EffectManager.cs.meta rename to Assets/Cryville/Crtr/Skin/EffectManager.cs.meta index 750bbc7..28d88df 100644 --- a/Assets/Cryville/Crtr/EffectManager.cs.meta +++ b/Assets/Cryville/Crtr/Skin/EffectManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 980c0f18a6f491d44a866a85910cb458 +guid: cade9521fea2fc941b59b5973ee79c3c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/SkinContainer.cs b/Assets/Cryville/Crtr/Skin/SkinContainer.cs similarity index 99% rename from Assets/Cryville/Crtr/SkinContainer.cs rename to Assets/Cryville/Crtr/Skin/SkinContainer.cs index b18f33d..a3dba17 100644 --- a/Assets/Cryville/Crtr/SkinContainer.cs +++ b/Assets/Cryville/Crtr/Skin/SkinContainer.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Profiling; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public class SkinContainer { readonly ISkinnableGroup _group; readonly SkinElement _rootElement; diff --git a/Assets/Cryville/Crtr/SkinContainer.cs.meta b/Assets/Cryville/Crtr/Skin/SkinContainer.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/SkinContainer.cs.meta rename to Assets/Cryville/Crtr/Skin/SkinContainer.cs.meta index 50df29d..d46d38e 100644 --- a/Assets/Cryville/Crtr/SkinContainer.cs.meta +++ b/Assets/Cryville/Crtr/Skin/SkinContainer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5da05fd03d90e04b9bede6ee3b2be5b +guid: 0631a620264a986468fbee7340b688de MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/Skin.cs b/Assets/Cryville/Crtr/Skin/SkinDefinition.cs similarity index 98% rename from Assets/Cryville/Crtr/Skin.cs rename to Assets/Cryville/Crtr/Skin/SkinDefinition.cs index a41a6f9..b6e5109 100644 --- a/Assets/Cryville/Crtr/Skin.cs +++ b/Assets/Cryville/Crtr/Skin/SkinDefinition.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Cryville.Crtr { - public class Skin : MetaInfo { +namespace Cryville.Crtr.Skin { + public class SkinDefinition : MetaInfo { public const long CURRENT_FORMAT = 2; [JsonRequired] diff --git a/Assets/Cryville/Crtr/Skin/SkinDefinition.cs.meta b/Assets/Cryville/Crtr/Skin/SkinDefinition.cs.meta new file mode 100644 index 0000000..185d81a --- /dev/null +++ b/Assets/Cryville/Crtr/Skin/SkinDefinition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 808174467cb90134096a62e4d45d3b0a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/SkinInterpreter.cs b/Assets/Cryville/Crtr/Skin/SkinInterpreter.cs similarity index 99% rename from Assets/Cryville/Crtr/SkinInterpreter.cs rename to Assets/Cryville/Crtr/Skin/SkinInterpreter.cs index 1cd3b18..4d335ea 100644 --- a/Assets/Cryville/Crtr/SkinInterpreter.cs +++ b/Assets/Cryville/Crtr/Skin/SkinInterpreter.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Reflection; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public class SkinInterpreter : PdtInterpreter { public SkinInterpreter(string src, Binder binder) : base(src, binder) { } diff --git a/Assets/Cryville/Crtr/SkinInterpreter.cs.meta b/Assets/Cryville/Crtr/Skin/SkinInterpreter.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/SkinInterpreter.cs.meta rename to Assets/Cryville/Crtr/Skin/SkinInterpreter.cs.meta index e2940ce..cca2e8b 100644 --- a/Assets/Cryville/Crtr/SkinInterpreter.cs.meta +++ b/Assets/Cryville/Crtr/Skin/SkinInterpreter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba83c661d3e10d944b7d8e77da4ba475 +guid: 6612c95458a84014dba8a31142def2b7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/SkinPropertyKey.cs b/Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs similarity index 98% rename from Assets/Cryville/Crtr/SkinPropertyKey.cs rename to Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs index 72b2b72..215505c 100644 --- a/Assets/Cryville/Crtr/SkinPropertyKey.cs +++ b/Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs @@ -1,13 +1,13 @@ using Cryville.Common; using Cryville.Common.Collections.Specialized; using Cryville.Common.Pdt; -using Cryville.Crtr.Components; +using Cryville.Crtr.Skin.Components; using System; using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public abstract class SkinPropertyKey { public static SkinPropertyKey Construct(HashSet a, IReadOnlyList k, bool compKeyFlag) { if (a.Remove("has")) { @@ -41,7 +41,7 @@ namespace Cryville.Crtr { } static Type GetComponentByName(string name) { Type result; - if (GenericResources.Components.TryGetValue(name, out result)) return result; + if (BuiltinResources.Components.TryGetValue(name, out result)) return result; throw new ArgumentException(string.Format("Component type \"{0}\" not found", name)); } } diff --git a/Assets/Cryville/Crtr/SkinPropertyKey.cs.meta b/Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs.meta similarity index 83% rename from Assets/Cryville/Crtr/SkinPropertyKey.cs.meta rename to Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs.meta index ee1e836..483f725 100644 --- a/Assets/Cryville/Crtr/SkinPropertyKey.cs.meta +++ b/Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 701f7f917dc59c540b105732747aeb67 +guid: d0026616450e99143966fbd5c84eee9b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Cryville/Crtr/SkinSelectors.cs b/Assets/Cryville/Crtr/Skin/SkinSelectors.cs similarity index 98% rename from Assets/Cryville/Crtr/SkinSelectors.cs rename to Assets/Cryville/Crtr/Skin/SkinSelectors.cs index c6f2205..caa0409 100644 --- a/Assets/Cryville/Crtr/SkinSelectors.cs +++ b/Assets/Cryville/Crtr/Skin/SkinSelectors.cs @@ -1,6 +1,6 @@ using Cryville.Common; using Cryville.Common.Pdt; -using Cryville.Crtr.Components; +using Cryville.Crtr.Skin.Components; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +8,7 @@ using System.Runtime.Serialization; using UnityEngine; using CAnchor = Cryville.Crtr.Anchor; -namespace Cryville.Crtr { +namespace Cryville.Crtr.Skin { public class SkinSelectors { readonly SkinSelector[] selectors; public readonly HashSet annotations; diff --git a/Assets/Cryville/Crtr/Skin/SkinSelectors.cs.meta b/Assets/Cryville/Crtr/Skin/SkinSelectors.cs.meta new file mode 100644 index 0000000..e35b9e3 --- /dev/null +++ b/Assets/Cryville/Crtr/Skin/SkinSelectors.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 22030fa6d07750d4aa6bbf67722fb1ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/SkinSelectors.cs.meta b/Assets/Cryville/Crtr/SkinSelectors.cs.meta deleted file mode 100644 index d0dd9d1..0000000 --- a/Assets/Cryville/Crtr/SkinSelectors.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 4a142d6867aceb04e951c82d6ea921c8 -timeCreated: 1617842088 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/StampedEvent.cs.meta b/Assets/Cryville/Crtr/StampedEvent.cs.meta deleted file mode 100644 index 9907c1f..0000000 --- a/Assets/Cryville/Crtr/StampedEvent.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 3542ac4f3ae8cf64098a52c6b03102d9 -timeCreated: 1618450720 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/UI.meta b/Assets/Cryville/Crtr/UI.meta new file mode 100644 index 0000000..2830048 --- /dev/null +++ b/Assets/Cryville/Crtr/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52ce2e6604aad754f9586c1b2793066a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/UI/BrowserItem.cs b/Assets/Cryville/Crtr/UI/BrowserItem.cs new file mode 100644 index 0000000..c008042 --- /dev/null +++ b/Assets/Cryville/Crtr/UI/BrowserItem.cs @@ -0,0 +1,13 @@ +using Cryville.Crtr.Browsing; +using UnityEngine; + +namespace Cryville.Crtr.UI { + 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; + } + } +} diff --git a/Assets/Cryville/Crtr/UI/BrowserItem.cs.meta b/Assets/Cryville/Crtr/UI/BrowserItem.cs.meta new file mode 100644 index 0000000..a4efc92 --- /dev/null +++ b/Assets/Cryville/Crtr/UI/BrowserItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: daa91a9b67de4114792406fdc15d2eef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs b/Assets/Cryville/Crtr/UI/BrowserItemTile.cs similarity index 92% rename from Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs rename to Assets/Cryville/Crtr/UI/BrowserItemTile.cs index 6a8cdd1..a470840 100644 --- a/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs +++ b/Assets/Cryville/Crtr/UI/BrowserItemTile.cs @@ -1,8 +1,9 @@ +using Cryville.Crtr.Browsing; using TMPro; using UnityEngine; using UnityEngine.UI; -namespace Cryville.Crtr.Browsing { +namespace Cryville.Crtr.UI { internal class BrowserItemTile : BrowserItem { #pragma warning disable IDE0044 [SerializeField] @@ -45,7 +46,7 @@ namespace Cryville.Crtr.Browsing { } public void OnClick() { if (Id == null) return; - ResourceBrowser resourceBrowser = GetComponentInParent(); + var resourceBrowser = GetComponentInParent(); if (_dir) resourceBrowser.OnDirectoryItemClicked(Id.Value); else resourceBrowser.OnObjectItemClicked(Id.Value); } diff --git a/Assets/Cryville/Crtr/UI/BrowserItemTile.cs.meta b/Assets/Cryville/Crtr/UI/BrowserItemTile.cs.meta new file mode 100644 index 0000000..b7e2d83 --- /dev/null +++ b/Assets/Cryville/Crtr/UI/BrowserItemTile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ed8e603c4cc451b48a917ae3e3c247b8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs b/Assets/Cryville/Crtr/UI/DetailPanel.cs similarity index 97% rename from Assets/Cryville/Crtr/Browsing/DetailPanel.cs rename to Assets/Cryville/Crtr/UI/DetailPanel.cs index e5a375b..f8164ae 100644 --- a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs +++ b/Assets/Cryville/Crtr/UI/DetailPanel.cs @@ -1,10 +1,11 @@ using Cryville.Common; +using Cryville.Crtr.Browsing; using System; using TMPro; using UnityEngine; using UnityEngine.UI; -namespace Cryville.Crtr.Browsing { +namespace Cryville.Crtr.UI { public class DetailPanel : ResourceBrowserUnit { #pragma warning disable IDE0044 [SerializeField] diff --git a/Assets/Cryville/Crtr/UI/DetailPanel.cs.meta b/Assets/Cryville/Crtr/UI/DetailPanel.cs.meta new file mode 100644 index 0000000..c2ecb7f --- /dev/null +++ b/Assets/Cryville/Crtr/UI/DetailPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fb051327d6131e34da9095a055dfb8a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Dialog.cs b/Assets/Cryville/Crtr/UI/Dialog.cs similarity index 98% rename from Assets/Cryville/Crtr/Dialog.cs rename to Assets/Cryville/Crtr/UI/Dialog.cs index a8c1e2a..8347775 100644 --- a/Assets/Cryville/Crtr/Dialog.cs +++ b/Assets/Cryville/Crtr/UI/Dialog.cs @@ -4,7 +4,7 @@ using System.Threading; using UnityEngine; using UnityEngine.UI; -namespace Cryville.Crtr { +namespace Cryville.Crtr.UI { public class Dialog : MonoBehaviour { static Dialog _instance; [SerializeField] CanvasGroup m_group; diff --git a/Assets/Cryville/Crtr/Dialog.cs.meta b/Assets/Cryville/Crtr/UI/Dialog.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Dialog.cs.meta rename to Assets/Cryville/Crtr/UI/Dialog.cs.meta diff --git a/Assets/Cryville/Crtr/Master.cs b/Assets/Cryville/Crtr/UI/Master.cs similarity index 92% rename from Assets/Cryville/Crtr/Master.cs rename to Assets/Cryville/Crtr/UI/Master.cs index 6628519..328b3c1 100644 --- a/Assets/Cryville/Crtr/Master.cs +++ b/Assets/Cryville/Crtr/UI/Master.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.UI { internal class Master : MonoBehaviour { #pragma warning disable IDE0044 [SerializeField] diff --git a/Assets/Cryville/Crtr/Master.cs.meta b/Assets/Cryville/Crtr/UI/Master.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Master.cs.meta rename to Assets/Cryville/Crtr/UI/Master.cs.meta diff --git a/Assets/Cryville/Crtr/Menu.cs b/Assets/Cryville/Crtr/UI/Menu.cs similarity index 97% rename from Assets/Cryville/Crtr/Menu.cs rename to Assets/Cryville/Crtr/UI/Menu.cs index b81d1ca..bc5ff1e 100644 --- a/Assets/Cryville/Crtr/Menu.cs +++ b/Assets/Cryville/Crtr/UI/Menu.cs @@ -1,12 +1,12 @@ using Cryville.Common.Unity.UI; -using Cryville.Crtr.Browsing; using Cryville.Crtr.Config; +using Cryville.Crtr.UI; using System.Collections.Generic; using TMPro; using UnityEngine; using unity = UnityEngine; -namespace Cryville.Crtr { +namespace Cryville.Crtr.UI { public class Menu : MonoBehaviour { #pragma warning disable IDE0044 [SerializeField] diff --git a/Assets/Cryville/Crtr/Menu.cs.meta b/Assets/Cryville/Crtr/UI/Menu.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Menu.cs.meta rename to Assets/Cryville/Crtr/UI/Menu.cs.meta diff --git a/Assets/Cryville/Crtr/Browsing/PathPart.cs b/Assets/Cryville/Crtr/UI/PathPart.cs similarity index 93% rename from Assets/Cryville/Crtr/Browsing/PathPart.cs rename to Assets/Cryville/Crtr/UI/PathPart.cs index d0add35..e6404cc 100644 --- a/Assets/Cryville/Crtr/Browsing/PathPart.cs +++ b/Assets/Cryville/Crtr/UI/PathPart.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Cryville.Crtr.Browsing { +namespace Cryville.Crtr.UI { internal class PathPart : MonoBehaviour { private int _id; private Text _exp; diff --git a/Assets/Cryville/Crtr/UI/PathPart.cs.meta b/Assets/Cryville/Crtr/UI/PathPart.cs.meta new file mode 100644 index 0000000..f698bd5 --- /dev/null +++ b/Assets/Cryville/Crtr/UI/PathPart.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61827f7104dbb3045bb0bf488132984d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Popup.cs b/Assets/Cryville/Crtr/UI/Popup.cs similarity index 96% rename from Assets/Cryville/Crtr/Popup.cs rename to Assets/Cryville/Crtr/UI/Popup.cs index e5c1a59..d92050e 100644 --- a/Assets/Cryville/Crtr/Popup.cs +++ b/Assets/Cryville/Crtr/UI/Popup.cs @@ -2,7 +2,7 @@ using System; using UnityEngine; using UnityEngine.UI; -namespace Cryville.Crtr { +namespace Cryville.Crtr.UI { public class Popup : MonoBehaviour { public string Message = ""; CanvasGroup group; diff --git a/Assets/Cryville/Crtr/Popup.cs.meta b/Assets/Cryville/Crtr/UI/Popup.cs.meta similarity index 100% rename from Assets/Cryville/Crtr/Popup.cs.meta rename to Assets/Cryville/Crtr/UI/Popup.cs.meta diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs b/Assets/Cryville/Crtr/UI/ResourceBrowser.cs similarity index 97% rename from Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs rename to Assets/Cryville/Crtr/UI/ResourceBrowser.cs index 8d664d4..f44002c 100644 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs +++ b/Assets/Cryville/Crtr/UI/ResourceBrowser.cs @@ -1,10 +1,11 @@ using Cryville.Common.Unity; using Cryville.Common.Unity.UI; +using Cryville.Crtr.Browsing; using System; using UnityEngine; using UnityEngine.UI; -namespace Cryville.Crtr.Browsing { +namespace Cryville.Crtr.UI { public class ResourceBrowser : ResourceBrowserUnit { public IResourceManager ResourceManager; public ScrollableItemGrid PathContainer; diff --git a/Assets/Cryville/Crtr/UI/ResourceBrowser.cs.meta b/Assets/Cryville/Crtr/UI/ResourceBrowser.cs.meta new file mode 100644 index 0000000..5566f29 --- /dev/null +++ b/Assets/Cryville/Crtr/UI/ResourceBrowser.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5849fb93f40efc54bb3eb4df80fd1121 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs b/Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs similarity index 92% rename from Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs rename to Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs index 93ed209..8386743 100644 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs +++ b/Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs @@ -1,13 +1,12 @@ -using Cryville.Common; using Cryville.Common.Unity.UI; +using Cryville.Crtr.Browsing; using Cryville.Crtr.Config; -using Cryville.Crtr.Extension; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; -namespace Cryville.Crtr.Browsing { +namespace Cryville.Crtr.UI { public class ResourceBrowserMaster : MonoBehaviour { [SerializeField] private Button m_playButton; @@ -89,9 +88,4 @@ namespace Cryville.Crtr.Browsing { Settings.Default.LoadChart = MainBrowser.ResourceManager.GetItemPath(id); } } - - public struct ChartDetail { - public AsyncDelivery Cover { get; set; } - public ChartMeta Meta { get; set; } - } } diff --git a/Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs.meta b/Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs.meta new file mode 100644 index 0000000..6508adc --- /dev/null +++ b/Assets/Cryville/Crtr/UI/ResourceBrowserMaster.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e12fb3a977e54a4d8c0b92a1e24728e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs b/Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs similarity index 90% rename from Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs rename to Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs index 96f7e3b..0dffb59 100644 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowserUnit.cs +++ b/Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Cryville.Crtr.Browsing { +namespace Cryville.Crtr.UI { public abstract class ResourceBrowserUnit : MonoBehaviour { protected ResourceBrowserMaster Master { get; private set; } protected virtual void Awake() { diff --git a/Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs.meta b/Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs.meta new file mode 100644 index 0000000..5e81ec5 --- /dev/null +++ b/Assets/Cryville/Crtr/UI/ResourceBrowserUnit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1f7ad893896ebbe488994458dcd34218 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menu.unity b/Assets/Menu.unity index 5abaea1..3b8fcd0 100644 --- a/Assets/Menu.unity +++ b/Assets/Menu.unity @@ -5524,7 +5524,7 @@ MonoBehaviour: m_GameObject: {fileID: 968284697} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 477e04b1ed5b60e48886fb76081245c5, type: 3} + m_Script: {fileID: 11500000, guid: fb051327d6131e34da9095a055dfb8a1, type: 3} m_Name: m_EditorClassIdentifier: m_coverPlaceholder: {fileID: 21300000, guid: cca2d29ec605e2540b2f1e8495051e5e, type: 3} @@ -7157,7 +7157,7 @@ MonoBehaviour: m_GameObject: {fileID: 1403805579} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 256d7d3efda1f9b4c882eb42e608cc8e, type: 3} + m_Script: {fileID: 11500000, guid: 5e12fb3a977e54a4d8c0b92a1e24728e, type: 3} m_Name: m_EditorClassIdentifier: m_playButton: {fileID: 2095542304} @@ -10056,7 +10056,7 @@ MonoBehaviour: m_GameObject: {fileID: 1989757278} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6b4df13dea0e4a469d7e54e7e8fb428, type: 3} + m_Script: {fileID: 11500000, guid: 5849fb93f40efc54bb3eb4df80fd1121, type: 3} m_Name: m_EditorClassIdentifier: PathContainer: {fileID: 1061052186} diff --git a/Assets/Prefabs/BrowserTile.prefab b/Assets/Prefabs/BrowserTile.prefab index 564bc64..4f67e55 100644 --- a/Assets/Prefabs/BrowserTile.prefab +++ b/Assets/Prefabs/BrowserTile.prefab @@ -652,7 +652,7 @@ MonoBehaviour: m_GameObject: {fileID: 193230} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b38d66b3e6e5d94438c72f855c4efff9, type: 3} + m_Script: {fileID: 11500000, guid: ed8e603c4cc451b48a917ae3e3c247b8, type: 3} m_Name: m_EditorClassIdentifier: m_iconPlaceholder: {fileID: 21300000, guid: cca2d29ec605e2540b2f1e8495051e5e, type: 3} diff --git a/Assets/Prefabs/PathPart.prefab b/Assets/Prefabs/PathPart.prefab index e4c8243..4f06843 100644 --- a/Assets/Prefabs/PathPart.prefab +++ b/Assets/Prefabs/PathPart.prefab @@ -224,6 +224,6 @@ MonoBehaviour: m_GameObject: {fileID: 115192} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d443a346e9a19d4eabbb0fa9ec7016f, type: 3} + m_Script: {fileID: 11500000, guid: 61827f7104dbb3045bb0bf488132984d, type: 3} m_Name: m_EditorClassIdentifier: