From 28f7045418148e5b59c082ab7d6c2933c54f6bef Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Fri, 4 Nov 2022 15:50:42 +0900 Subject: [PATCH] format directory structure about VRM10 material io --- Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export.meta | 3 +++ .../BuiltInVrm10MaterialExporter.cs} | 4 ++-- .../BuiltInVrm10MaterialExporter.cs.meta} | 0 .../Runtime/IO/Material/BuiltinRP/Export/Materials.meta | 3 +++ .../Materials/BuiltInVrm10MToonMaterialExporter.cs} | 2 +- .../Materials/BuiltInVrm10MToonMaterialExporter.cs.meta} | 0 .../{ => BuiltinRP/Export}/Vrm10MaterialExportUtils.cs | 0 .../Export}/Vrm10MaterialExportUtils.cs.meta | 0 Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import.meta | 3 +++ .../Runtime/IO/Material/BuiltinRP/Import/Materials.meta | 3 +++ .../Import/Materials}/Vrm10MToonMaterialImporter.cs | 0 .../Import/Materials}/Vrm10MToonMaterialImporter.cs.meta | 4 ++-- .../Import}/Vrm10MaterialDescriptorGenerator.cs | 0 .../Import}/Vrm10MaterialDescriptorGenerator.cs.meta | 0 Assets/VRM10/Runtime/IO/Material/URP.meta | 8 ++++++++ Assets/VRM10/Runtime/IO/Material/URP/Import.meta | 3 +++ .../Import}/Vrm10UrpMaterialDescriptorGenerator.cs | 0 .../Import}/Vrm10UrpMaterialDescriptorGenerator.cs.meta | 0 Assets/VRM10/Runtime/IO/Vrm10Exporter.cs | 2 +- 19 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export.meta rename Assets/VRM10/Runtime/IO/Material/BuiltinRP/{BuiltinRPVrm10MaterialExporter.cs => Export/BuiltInVrm10MaterialExporter.cs} (68%) rename Assets/VRM10/Runtime/IO/Material/BuiltinRP/{BuiltinRPVrm10MaterialExporter.cs.meta => Export/BuiltInVrm10MaterialExporter.cs.meta} (100%) create mode 100644 Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials.meta rename Assets/VRM10/Runtime/IO/Material/BuiltinRP/{BuiltinRPVrm10MToonMaterialExporter.cs => Export/Materials/BuiltInVrm10MToonMaterialExporter.cs} (99%) rename Assets/VRM10/Runtime/IO/Material/BuiltinRP/{BuiltinRPVrm10MToonMaterialExporter.cs.meta => Export/Materials/BuiltInVrm10MToonMaterialExporter.cs.meta} (100%) rename Assets/VRM10/Runtime/IO/Material/{ => BuiltinRP/Export}/Vrm10MaterialExportUtils.cs (100%) rename Assets/VRM10/Runtime/IO/Material/{ => BuiltinRP/Export}/Vrm10MaterialExportUtils.cs.meta (100%) create mode 100644 Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import.meta create mode 100644 Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials.meta rename Assets/VRM10/Runtime/IO/Material/{ => BuiltinRP/Import/Materials}/Vrm10MToonMaterialImporter.cs (100%) rename Assets/VRM10/Runtime/IO/Material/{ => BuiltinRP/Import/Materials}/Vrm10MToonMaterialImporter.cs.meta (71%) rename Assets/VRM10/Runtime/IO/Material/{ => BuiltinRP/Import}/Vrm10MaterialDescriptorGenerator.cs (100%) rename Assets/VRM10/Runtime/IO/Material/{ => BuiltinRP/Import}/Vrm10MaterialDescriptorGenerator.cs.meta (100%) create mode 100644 Assets/VRM10/Runtime/IO/Material/URP.meta create mode 100644 Assets/VRM10/Runtime/IO/Material/URP/Import.meta rename Assets/VRM10/Runtime/IO/Material/{ => URP/Import}/Vrm10UrpMaterialDescriptorGenerator.cs (100%) rename Assets/VRM10/Runtime/IO/Material/{ => URP/Import}/Vrm10UrpMaterialDescriptorGenerator.cs.meta (100%) diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export.meta new file mode 100644 index 000000000..56bcb363b --- /dev/null +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 48ae52bce69c4f68a97461a4f52ca46e +timeCreated: 1667544324 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/BuiltInVrm10MaterialExporter.cs similarity index 68% rename from Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MaterialExporter.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/BuiltInVrm10MaterialExporter.cs index a260b2bc0..dd9c60768 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MaterialExporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/BuiltInVrm10MaterialExporter.cs @@ -4,11 +4,11 @@ using VRMShaders; namespace UniVRM10 { - public class BuiltinRPVrm10MaterialExporter : BuiltInGltfMaterialExporter + public class BuiltInVrm10MaterialExporter : BuiltInGltfMaterialExporter { public override glTFMaterial ExportMaterial(Material m, ITextureExporter textureExporter, GltfExportSettings settings) { - if (BuiltinRPVrm10MToonMaterialExporter.TryExportMaterialAsMToon(m, textureExporter, out var dst)) + if (BuiltInVrm10MToonMaterialExporter.TryExportMaterialAsMToon(m, textureExporter, out var dst)) { return dst; } diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MaterialExporter.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/BuiltInVrm10MaterialExporter.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MaterialExporter.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/BuiltInVrm10MaterialExporter.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials.meta new file mode 100644 index 000000000..76c0be0bf --- /dev/null +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9471ebdc1b724bccaff0223a9d20070e +timeCreated: 1667544340 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MToonMaterialExporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs similarity index 99% rename from Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MToonMaterialExporter.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs index afeb6c623..3e774f1e3 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MToonMaterialExporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs @@ -8,7 +8,7 @@ using ColorSpace = VRMShaders.ColorSpace; namespace UniVRM10 { - public static class BuiltinRPVrm10MToonMaterialExporter + public static class BuiltInVrm10MToonMaterialExporter { public static bool TryExportMaterialAsMToon(Material src, ITextureExporter textureExporter, out glTFMaterial dst) diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MToonMaterialExporter.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/BuiltinRP/BuiltinRPVrm10MToonMaterialExporter.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Vrm10MaterialExportUtils.cs similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Vrm10MaterialExportUtils.cs diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Vrm10MaterialExportUtils.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Export/Vrm10MaterialExportUtils.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import.meta new file mode 100644 index 000000000..56170b0c3 --- /dev/null +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b100c9d06dda49ed91afa6b2c2cebc06 +timeCreated: 1667544368 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials.meta new file mode 100644 index 000000000..85fedab14 --- /dev/null +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0361e8fb0fb84326ada30f8c5cc7b665 +timeCreated: 1667544400 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials/Vrm10MToonMaterialImporter.cs similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials/Vrm10MToonMaterialImporter.cs diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials/Vrm10MToonMaterialImporter.cs.meta similarity index 71% rename from Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials/Vrm10MToonMaterialImporter.cs.meta index af9937828..aa49da4ff 100644 --- a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialImporter.cs.meta +++ b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Materials/Vrm10MToonMaterialImporter.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 -guid: 01c1ac60c9a047b59ea52aaddb7a0d63 +fileFormatVersion: 2 +guid: 01c1ac60c9a047b59ea52aaddb7a0d63 timeCreated: 1620630516 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Vrm10MaterialDescriptorGenerator.cs similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10MaterialDescriptorGenerator.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Vrm10MaterialDescriptorGenerator.cs diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MaterialDescriptorGenerator.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Vrm10MaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10MaterialDescriptorGenerator.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltinRP/Import/Vrm10MaterialDescriptorGenerator.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/URP.meta b/Assets/VRM10/Runtime/IO/Material/URP.meta new file mode 100644 index 000000000..36a00e993 --- /dev/null +++ b/Assets/VRM10/Runtime/IO/Material/URP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0d1364c3beb8494f9b3ae9c0445ffa9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import.meta b/Assets/VRM10/Runtime/IO/Material/URP/Import.meta new file mode 100644 index 000000000..ec9b3f18f --- /dev/null +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 45fd659f340f450e97fd111184db0c9d +timeCreated: 1667544438 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs rename to Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs.meta b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs.meta rename to Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs index 43287523f..e77ce7eae 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs @@ -158,7 +158,7 @@ namespace UniVRM10 static IEnumerable ExportMaterials(Model model, ITextureExporter textureExporter, GltfExportSettings settings) { - var materialExporter = new BuiltinRPVrm10MaterialExporter(); + var materialExporter = new BuiltInVrm10MaterialExporter(); foreach (Material material in model.Materials) { yield return materialExporter.ExportMaterial(material, textureExporter, settings);