From bd63c7e14f2b9c883ee453397c90157d68532498 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 10 Nov 2022 21:30:13 +0900 Subject: [PATCH] mv function of importing material name --- .../BuiltInGltfMaterialDescriptorGenerator.cs | 12 +----------- .../Materials/BuiltInGltfPbrMaterialImporter.cs | 2 +- .../Materials/BuiltInGltfUnlitMaterialImporter.cs | 2 +- .../IO/MaterialIO/GltfMaterialImportUtils.cs | 9 +++++++++ .../Import/Materials/UrpGltfPbrMaterialImporter.cs | 2 +- .../Import/UrpGltfMaterialDescriptorGenerator.cs | 13 +------------ .../Import/VRMMaterialDescriptorGenerator.cs | 2 +- .../URP/Import/VRMURPMaterialDescriptorGenerator.cs | 2 +- .../Import/Vrm10MaterialDescriptorGenerator.cs | 2 +- .../Import/Vrm10UrpMaterialDescriptorGenerator.cs | 2 +- 10 files changed, 18 insertions(+), 30 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs index 83a46454c..ed75ce33b 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs @@ -22,7 +22,7 @@ namespace UniGLTF } return new MaterialDescriptor( - GetMaterialName(i, null), + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), @@ -30,16 +30,6 @@ namespace UniGLTF new Dictionary(), new Dictionary(), new Action[]{}); - - } - - public static string GetMaterialName(int index, glTFMaterial src) - { - if (src != null && !string.IsNullOrEmpty(src.name)) - { - return src.name; - } - return $"material_{index:00}"; } } } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs index 96251ebdb..2c04b419f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs @@ -206,7 +206,7 @@ namespace UniGLTF }); matDesc = new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src), + GltfMaterialImportUtils.ImportMaterialName(i, src), ShaderName, null, textureSlots, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs index 5c477c5cc..84c1df03d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs @@ -50,7 +50,7 @@ namespace UniGLTF } matDesc = new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src), + GltfMaterialImportUtils.ImportMaterialName(i, src), UniUnlitUtil.ShaderName, null, textureSlots, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs index a90ea9a1b..e12e42a24 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs @@ -5,6 +5,15 @@ namespace UniGLTF { public static class GltfMaterialImportUtils { + public static string ImportMaterialName(int index, glTFMaterial src) + { + if (src != null && !string.IsNullOrEmpty(src.name)) + { + return src.name; + } + return $"material_{index:00}"; + } + public static Color? ImportLinearEmissiveFactorFromMaterial(GltfData data, glTFMaterial src) { if (src.emissiveFactor == null || src.emissiveFactor.Length != 3) return null; diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs index f045857da..eab137d2e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs @@ -181,7 +181,7 @@ namespace UniGLTF }); matDesc = new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src), + GltfMaterialImportUtils.ImportMaterialName(i, src), ShaderName, null, textureSlots, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs index 66b93fbcc..d67dd3a81 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs @@ -23,7 +23,7 @@ namespace UniGLTF } return new MaterialDescriptor( - GetMaterialName(i, null), + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), @@ -31,17 +31,6 @@ namespace UniGLTF new Dictionary(), new Dictionary(), new Collection>()); - - } - - public static string GetMaterialName(int index, glTFMaterial src) - { - if (src != null && !string.IsNullOrEmpty(src.name)) - { - return src.name; - } - - return $"material_{index:00}"; } } } \ No newline at end of file diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs index f4143632d..e679e7f8a 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs @@ -43,7 +43,7 @@ namespace VRM // fallback Debug.LogWarning($"fallback"); return new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null), + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), diff --git a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs index 1f7d4a722..bbbc0fdb8 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs @@ -27,7 +27,7 @@ namespace VRM Debug.LogWarning($"material: {i} out of range. fallback"); } return new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null), + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), diff --git a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs index 821be9b15..1b09beafd 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs @@ -22,7 +22,7 @@ namespace UniVRM10 Debug.LogWarning($"material: {i} out of range. fallback"); } return new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), diff --git a/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs index 74448307c..5fc42b521 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs @@ -17,7 +17,7 @@ namespace UniVRM10 // fallback Debug.LogWarning($"material: {i} out of range. fallback"); return new MaterialDescriptor( - BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null), + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(),