From 62085d255a3f45447a28c81b013c88e82e66fa32 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 10 Nov 2022 21:41:01 +0900 Subject: [PATCH] rename vrm10 material importer class names --- .../Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs | 2 +- .../VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs | 4 ++-- ...enerator.cs => BuiltInVrm10MaterialDescriptorGenerator.cs} | 4 ++-- ...s.meta => BuiltInVrm10MaterialDescriptorGenerator.cs.meta} | 0 ...terialImporter.cs => BuiltInVrm10MToonMaterialImporter.cs} | 2 +- ...rter.cs.meta => BuiltInVrm10MToonMaterialImporter.cs.meta} | 0 ...torGenerator.cs => UrpVrm10MaterialDescriptorGenerator.cs} | 2 +- ...or.cs.meta => UrpVrm10MaterialDescriptorGenerator.cs.meta} | 0 .../{BuiltInRP/Export => }/Vrm10MaterialExportUtils.cs | 0 .../{BuiltInRP/Export => }/Vrm10MaterialExportUtils.cs.meta | 0 Assets/VRM10/Runtime/IO/Vrm10Importer.cs | 2 +- Assets/VRM10/Tests/MaterialImportTests.cs | 2 +- Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs | 4 ++-- 13 files changed, 11 insertions(+), 11 deletions(-) rename Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/{Vrm10MaterialDescriptorGenerator.cs => BuiltInVrm10MaterialDescriptorGenerator.cs} (83%) rename Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/{Vrm10MaterialDescriptorGenerator.cs.meta => BuiltInVrm10MaterialDescriptorGenerator.cs.meta} (100%) rename Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/{Vrm10MToonMaterialImporter.cs => BuiltInVrm10MToonMaterialImporter.cs} (99%) rename Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/{Vrm10MToonMaterialImporter.cs.meta => BuiltInVrm10MToonMaterialImporter.cs.meta} (100%) rename Assets/VRM10/Runtime/IO/Material/URP/Import/{Vrm10UrpMaterialDescriptorGenerator.cs => UrpVrm10MaterialDescriptorGenerator.cs} (94%) rename Assets/VRM10/Runtime/IO/Material/URP/Import/{Vrm10UrpMaterialDescriptorGenerator.cs.meta => UrpVrm10MaterialDescriptorGenerator.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%) diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs index 00b79edc0..cf7d530c5 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs @@ -72,7 +72,7 @@ namespace UniVRM10 var tmp = m_importer.GetExternalObjectMap(); - var generator = new Vrm10MaterialDescriptorGenerator(); + var generator = new BuiltInVrm10MaterialDescriptorGenerator(); var materialKeys = m_result.Data.GLTF.materials.Select((x, i) => generator.Get(m_result.Data, i).SubAssetKey); var textureKeys = new Vrm10TextureDescriptorGenerator(m_result.Data).Get().GetEnumerable().Select(x => x.SubAssetKey); m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap); diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs index 0e8e11d6b..a6a2705f9 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs @@ -19,10 +19,10 @@ namespace UniVRM10 switch (renderPipeline) { case RenderPipelineTypes.BuiltinRenderPipeline: - return new Vrm10MaterialDescriptorGenerator(); + return new BuiltInVrm10MaterialDescriptorGenerator(); case RenderPipelineTypes.UniversalRenderPipeline: - return new Vrm10UrpMaterialDescriptorGenerator(); + return new UrpVrm10MaterialDescriptorGenerator(); default: throw new NotImplementedException(); diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs similarity index 83% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs index 1b09beafd..79360e37a 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs @@ -6,12 +6,12 @@ using VRMShaders; namespace UniVRM10 { - public sealed class Vrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class BuiltInVrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator { public MaterialDescriptor Get(GltfData data, int i) { // mtoon - if (Vrm10MToonMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc; + if (BuiltInVrm10MToonMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc; // unlit if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; // pbr diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs similarity index 99% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs index 83d4fa9f6..982461d7b 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs @@ -14,7 +14,7 @@ namespace UniVRM10 /// /// Convert MToon parameters from glTF specification to Unity implementation. /// - public static class Vrm10MToonMaterialImporter + public static class BuiltInVrm10MToonMaterialImporter { /// /// VMRC_materials_mtoon の場合にマテリアル生成情報を作成する diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs.meta b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs.meta rename to Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs similarity index 94% rename from Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs rename to Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs index 5fc42b521..2201e19ad 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs @@ -6,7 +6,7 @@ using VRMShaders; namespace UniVRM10 { - public sealed class Vrm10UrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class UrpVrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator { public MaterialDescriptor Get(GltfData data, int i) { diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs.meta b/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs.meta rename to Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Vrm10MaterialExportUtils.cs b/Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Vrm10MaterialExportUtils.cs rename to Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Vrm10MaterialExportUtils.cs.meta b/Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Vrm10MaterialExportUtils.cs.meta rename to Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs.meta diff --git a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs index 1a430086c..fc5da977d 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs @@ -42,7 +42,7 @@ namespace UniVRM10 m_controlRigGenerationOption = controlRigGenerationOption; TextureDescriptorGenerator = new Vrm10TextureDescriptorGenerator(Data); - MaterialDescriptorGenerator = materialGenerator ?? new Vrm10MaterialDescriptorGenerator(); + MaterialDescriptorGenerator = materialGenerator ?? new BuiltInVrm10MaterialDescriptorGenerator(); m_externalMap = externalObjectMap; if (m_externalMap == null) diff --git a/Assets/VRM10/Tests/MaterialImportTests.cs b/Assets/VRM10/Tests/MaterialImportTests.cs index c4961c776..1af246409 100644 --- a/Assets/VRM10/Tests/MaterialImportTests.cs +++ b/Assets/VRM10/Tests/MaterialImportTests.cs @@ -25,7 +25,7 @@ namespace UniVRM10 using (var data = new GlbLowLevelParser(AliciaPath, migratedBytes).Parse()) { - var matDesc = new Vrm10MaterialDescriptorGenerator().Get(data, 0); + var matDesc = new BuiltInVrm10MaterialDescriptorGenerator().Get(data, 0); Assert.AreEqual("Alicia_body", matDesc.Name); Assert.AreEqual("VRM10/MToon10", matDesc.ShaderName); Assert.AreEqual("Alicia_body", matDesc.TextureSlots["_MainTex"].UnityObjectName); diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs index 6f601fe03..4d8a5d34a 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs @@ -297,11 +297,11 @@ namespace UniVRM10.VRM10Viewer { if (useUrp) { - return new Vrm10UrpMaterialDescriptorGenerator(); + return new UrpVrm10MaterialDescriptorGenerator(); } else { - return new Vrm10MaterialDescriptorGenerator(); + return new BuiltInVrm10MaterialDescriptorGenerator(); } }