From 36dd65c57bf88fd7d8b15cfbdcad2a78c9b01ebb Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 18 Jul 2024 22:44:05 +0900 Subject: [PATCH] mv generated Vrm10Material format from VRMShaders.VRM10.Format.Runtime to VRM10 --- .../VRM10/Editor/Vrm10SerializerGenerator.cs | 32 +++++++++---------- .../Format}/MaterialsMToon/Format.g.cs | 0 .../Format}/MaterialsMToon/Format.g.cs.meta | 2 +- Assets/VRMShaders/VRM10/Format.meta | 8 ----- Assets/VRMShaders/VRM10/Format/Runtime.meta | 8 ----- .../VRM10/Format/Runtime/MaterialsMToon.meta | 8 ----- .../VRMShaders.VRM10.Format.Runtime.asmdef | 13 -------- ...RMShaders.VRM10.Format.Runtime.asmdef.meta | 7 ---- 8 files changed, 17 insertions(+), 61 deletions(-) rename Assets/{VRMShaders/VRM10/Format/Runtime => VRM10/Runtime/Format}/MaterialsMToon/Format.g.cs (100%) rename Assets/{VRMShaders/VRM10/Format/Runtime => VRM10/Runtime/Format}/MaterialsMToon/Format.g.cs.meta (83%) delete mode 100644 Assets/VRMShaders/VRM10/Format.meta delete mode 100644 Assets/VRMShaders/VRM10/Format/Runtime.meta delete mode 100644 Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta delete mode 100644 Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef delete mode 100644 Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta diff --git a/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs b/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs index 184132e93..034f3b792 100644 --- a/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs +++ b/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs @@ -15,7 +15,7 @@ namespace UniVRM10 /// public static class Vrm10SerializerGenerator { - struct GenerateInfo + private struct GenerateInfo { public string JsonSchema; public string FormatDir; @@ -33,7 +33,8 @@ namespace UniVRM10 } } - const string SPEC_DIR = "vrm-specification/specification"; + private const string Vrm10SpecDir = "vrm-specification/specification"; + private const string Vrm10FormatGeneratedDir = "Assets/VRM10/Runtime/Format"; public static void Run(bool debug) { @@ -45,45 +46,44 @@ namespace UniVRM10 { // VRMC_hdr_emissiveMultiplier new GenerateInfo( - $"{SPEC_DIR}/VRMC_materials_hdr_emissiveMultiplier-1.0/schema/VRMC_materials_hdr_emissiveMultiplier.json", + $"{Vrm10SpecDir}/VRMC_materials_hdr_emissiveMultiplier-1.0/schema/VRMC_materials_hdr_emissiveMultiplier.json", "Assets/UniGLTF/Runtime/UniGLTF/Format/ExtensionsAndExtras/EmissiveMultiplier" ), // VRMC_vrm new GenerateInfo( - $"{SPEC_DIR}/VRMC_vrm-1.0/schema/VRMC_vrm.schema.json", - "Assets/VRM10/Runtime/Format/Vrm" + $"{Vrm10SpecDir}/VRMC_vrm-1.0/schema/VRMC_vrm.schema.json", + $"{Vrm10FormatGeneratedDir}/Vrm" ), // VRMC_materials_mtoon new GenerateInfo( - $"{SPEC_DIR}/VRMC_materials_mtoon-1.0/schema/VRMC_materials_mtoon.schema.json", - "Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon", - "Assets/VRM10/Runtime/Format/MaterialsMToon" + $"{Vrm10SpecDir}/VRMC_materials_mtoon-1.0/schema/VRMC_materials_mtoon.schema.json", + $"{Vrm10FormatGeneratedDir}/MaterialsMToon" ), // VRMC_springBone new GenerateInfo( - $"{SPEC_DIR}/VRMC_springBone-1.0/schema/VRMC_springBone.schema.json", - "Assets/VRM10/Runtime/Format/SpringBone" + $"{Vrm10SpecDir}/VRMC_springBone-1.0/schema/VRMC_springBone.schema.json", + $"{Vrm10FormatGeneratedDir}/SpringBone" ), // VRMC_node_constraint new GenerateInfo( - $"{SPEC_DIR}/VRMC_node_constraint-1.0/schema/VRMC_node_constraint.schema.json", - "Assets/VRM10/Runtime/Format/Constraints" + $"{Vrm10SpecDir}/VRMC_node_constraint-1.0/schema/VRMC_node_constraint.schema.json", + $"{Vrm10FormatGeneratedDir}/Constraints" ), // VRMC_animation new GenerateInfo( - $"{SPEC_DIR}/VRMC_vrm_animation-1.0/schema/VRMC_vrm_animation.schema.json", - "Assets/VRM10/Runtime/Format/Animation" + $"{Vrm10SpecDir}/VRMC_vrm_animation-1.0/schema/VRMC_vrm_animation.schema.json", + $"{Vrm10FormatGeneratedDir}/Animation" ), // VRMC_animation new GenerateInfo( - $"{SPEC_DIR}/VRMC_springBone_extended_collider-1.0/schema/VRMC_springBone_extended_collider.schema.json", - "Assets/VRM10/Runtime/Format/SpringBoneExtendedCollider" + $"{Vrm10SpecDir}/VRMC_springBone_extended_collider-1.0/schema/VRMC_springBone_extended_collider.schema.json", + $"{Vrm10FormatGeneratedDir}/SpringBoneExtendedCollider" ), }; diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs similarity index 100% rename from Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs rename to Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs.meta b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs.meta similarity index 83% rename from Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs.meta rename to Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs.meta index d1f29bc99..7e91b262f 100644 --- a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs.meta +++ b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bbff45dd057a5a4d935d5ee9a64e40a +guid: a36356ed698e0cb4d8ad805b14c3d361 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRMShaders/VRM10/Format.meta b/Assets/VRMShaders/VRM10/Format.meta deleted file mode 100644 index f42cb0b10..000000000 --- a/Assets/VRMShaders/VRM10/Format.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 83500e0cfc53cf04f95af8a60cc32017 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format/Runtime.meta b/Assets/VRMShaders/VRM10/Format/Runtime.meta deleted file mode 100644 index 9dda04a2d..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07be59cdcf4b2df4ca9241939bf1054e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta b/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta deleted file mode 100644 index 7bf05b5d3..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6bae94a423d90d45bc6f1bd1eada5fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef b/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef deleted file mode 100644 index fd9a63aee..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "VRMShaders.VRM10.Format.Runtime", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta b/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta deleted file mode 100644 index 3667d97ad..000000000 --- a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bce005214fa49654d93927908c15b1f2 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: