diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs index d10352f22..7e249821c 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs @@ -32,7 +32,7 @@ namespace UniGLTF } m_data = new GlbFileParser(m_importer.assetPath).Parse(); - var materialGenerator = new GltfMaterialDescriptorGenerator(); + var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator(); var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey); var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey); m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap); diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs index 9bed4d9c4..2da25c315 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs @@ -26,7 +26,7 @@ namespace UniGLTF { if (m_renderPipeline == UniGLTF.RenderPipelineTypes.UniversalRenderPipeline) { - if (Shader.Find(UniGLTF.GltfPbrUrpMaterialImporter.ShaderName) == null) + if (Shader.Find(UniGLTF.UrpGltfPbrMaterialImporter.ShaderName) == null) { Debug.LogWarning("URP is not installed. Force to BuiltinRenderPipeline"); m_renderPipeline = UniGLTF.RenderPipelineTypes.BuiltinRenderPipeline; @@ -39,10 +39,10 @@ namespace UniGLTF switch (renderPipeline) { case RenderPipelineTypes.BuiltinRenderPipeline: - return new GltfMaterialDescriptorGenerator(); + return new BuiltInGltfMaterialDescriptorGenerator(); case RenderPipelineTypes.UniversalRenderPipeline: - return new GltfUrpMaterialDescriptorGenerator(); + return new UrpGltfMaterialDescriptorGenerator(); default: throw new System.NotImplementedException(); diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs index 77efc711d..dd15468a5 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs @@ -30,7 +30,7 @@ namespace UniGLTF } m_data = new AutoGltfFileParser(m_importer.assetPath).Parse(); - var materialGenerator = new GltfMaterialDescriptorGenerator(); + var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator(); var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey); var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey); m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap); diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporterEditor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporterEditor.cs index e80c62a16..f37085ce5 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporterEditor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporterEditor.cs @@ -26,7 +26,7 @@ namespace UniGLTF m_importer = target as ZipArchivedGltfScriptedImporter; m_data = new AutoGltfFileParser(m_importer.assetPath).Parse(); - var materialGenerator = new GltfMaterialDescriptorGenerator(); + var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator(); var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey); var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey); m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs index 462fba5cd..23aba44ba 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs @@ -38,7 +38,7 @@ namespace UniGLTF { Data = data; TextureDescriptorGenerator = new GltfTextureDescriptorGenerator(Data); - MaterialDescriptorGenerator = materialGenerator ?? new GltfMaterialDescriptorGenerator(); + MaterialDescriptorGenerator = materialGenerator ?? new BuiltInGltfMaterialDescriptorGenerator(); ExternalObjectMap = externalObjectMap ?? new Dictionary(); textureDeserializer = textureDeserializer ?? new UnityTextureDeserializer(); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs similarity index 54% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs index 2926b68ee..ed75ce33b 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs @@ -9,12 +9,12 @@ namespace UniGLTF /// /// GLTF の MaterialImporter /// - public sealed class GltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class BuiltInGltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator { public MaterialDescriptor Get(GltfData data, int i) { - if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param; - if (GltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param; + if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param; + if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param; // fallback if (Symbols.VRM_DEVELOP) { @@ -22,24 +22,14 @@ namespace UniGLTF } return new MaterialDescriptor( - GetMaterialName(i, null), - GltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), + BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), 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/GltfMaterialDescriptorGenerator.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs similarity index 98% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs index e25979413..2c04b419f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs @@ -39,7 +39,7 @@ namespace UniGLTF /// _ZWrite /// /// - public static class GltfPbrMaterialImporter + public static class BuiltInGltfPbrMaterialImporter { private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend"); private static readonly int DstBlend = Shader.PropertyToID("_DstBlend"); @@ -206,7 +206,7 @@ namespace UniGLTF }); matDesc = new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, src), + GltfMaterialImportUtils.ImportMaterialName(i, src), ShaderName, null, textureSlots, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs similarity index 96% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs index 0f2549189..84c1df03d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs @@ -7,7 +7,7 @@ using ColorSpace = VRMShaders.ColorSpace; namespace UniGLTF { - public static class GltfUnlitMaterialImporter + public static class BuiltInGltfUnlitMaterialImporter { private static readonly int Cutoff = Shader.PropertyToID("_Cutoff"); @@ -50,7 +50,7 @@ namespace UniGLTF } matDesc = new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, src), + GltfMaterialImportUtils.ImportMaterialName(i, src), UniUnlitUtil.ShaderName, null, textureSlots, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs.meta 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/GltfPbrURPMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs similarity index 98% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs index 60cf8abd5..eab137d2e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs @@ -11,7 +11,7 @@ namespace UniGLTF /// /// see: https://github.com/Unity-Technologies/Graphics/blob/v7.5.3/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs#L354-L379 /// - public static class GltfPbrUrpMaterialImporter + public static class UrpGltfPbrMaterialImporter { private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend"); private static readonly int DstBlend = Shader.PropertyToID("_DstBlend"); @@ -181,7 +181,7 @@ namespace UniGLTF }); matDesc = new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, src), + GltfMaterialImportUtils.ImportMaterialName(i, src), ShaderName, null, textureSlots, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs similarity index 59% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs index c13fb5a1e..d67dd3a81 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs @@ -10,12 +10,12 @@ namespace UniGLTF /// /// GLTF の MaterialImporter /// - public sealed class GltfUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class UrpGltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator { public MaterialDescriptor Get(GltfData data, int i) { - if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param; - if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out param)) return param; + if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param; + if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param; // fallback if (Symbols.VRM_DEVELOP) { @@ -23,25 +23,14 @@ namespace UniGLTF } return new MaterialDescriptor( - GetMaterialName(i, null), - GltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), + BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), 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/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs.meta diff --git a/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs b/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs index 2ab25dfba..118f3316b 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs @@ -226,7 +226,7 @@ namespace UniGLTF var path = Path.Combine(root.FullName, "DamagedHelmet/glTF-Binary/DamagedHelmet.glb"); using (var data = new AutoGltfFileParser(path).Parse()) { - var matDesc = new GltfMaterialDescriptorGenerator().Get(data, 0); + var matDesc = new BuiltInGltfMaterialDescriptorGenerator().Get(data, 0); Assert.AreEqual("Standard", matDesc.ShaderName); Assert.AreEqual(5, matDesc.TextureSlots.Count); var (key, value) = matDesc.EnumerateSubAssetKeyValue().First(); diff --git a/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs b/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs index d385bd3fe..f2bf44317 100644 --- a/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs +++ b/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs @@ -109,7 +109,7 @@ namespace VRM // extract converted textures // var subAssets = m_context.TextureFactory.ConvertedTextures; - var vrmTextures = new VRMMaterialDescriptorGenerator(m_context.VRM); + var vrmTextures = new BuiltInVrmMaterialDescriptorGenerator(m_context.VRM); var dirName = $"{m_prefabPath.FileNameWithoutExtension}.Textures"; TextureExtractor.ExtractTextures(m_context.Data, m_prefabPath.Parent.Child(dirName), m_context.TextureDescriptorGenerator, subAssets, (_x, _y) => { }, onTextureReloaded); } diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs similarity index 56% rename from Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs rename to Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs index 80de66b31..ed2a1db94 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs @@ -6,36 +6,37 @@ using VRMShaders; namespace VRM { - public sealed class VRMMaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class BuiltInVrmMaterialDescriptorGenerator : IMaterialDescriptorGenerator { - readonly glTF_VRM_extensions m_vrm; - public VRMMaterialDescriptorGenerator(glTF_VRM_extensions vrm) + private readonly glTF_VRM_extensions _vrm; + + public BuiltInVrmMaterialDescriptorGenerator(glTF_VRM_extensions vrm) { - m_vrm = vrm; + _vrm = vrm; } public MaterialDescriptor Get(GltfData data, int i) { // legacy "VRM/UnlitTransparentZWrite" - if (VRMUnlitTransparentZWriteMaterialImporter.TryCreateParam(data, m_vrm, i, out var matDesc)) + if (BuiltInVrmUnlitTransparentZWriteMaterialImporter.TryCreateParam(data, _vrm, i, out var matDesc)) { return matDesc; } // mtoon - if (VRMMToonMaterialImporter.TryCreateParam(data, m_vrm, i, out matDesc)) + if (BuiltInVrmMToonMaterialImporter.TryCreateParam(data, _vrm, i, out matDesc)) { return matDesc; } // unlit - if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) + if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) { return matDesc; } // pbr - if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) + if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) { return matDesc; } @@ -43,8 +44,8 @@ namespace VRM // fallback Debug.LogWarning($"fallback"); return new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, null), - GltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), + BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs.meta diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs similarity index 96% rename from Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs rename to Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs index 13772d106..026de35e2 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs @@ -7,9 +7,10 @@ using VRMShaders; namespace VRM { - public static class VRMMToonMaterialImporter + public static class BuiltInVrmMToonMaterialImporter { - static string[] MToonTextureSlots = new string[]{ + private static readonly string[] MToonTextureSlots = new string[] + { "_MainTex", "_ShadeTexture", "_BumpMap", diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs.meta similarity index 100% rename from Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs.meta diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs similarity index 99% rename from Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs rename to Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs index dd0792efe..4ab36a434 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs @@ -9,7 +9,7 @@ using RenderMode = MToon.RenderMode; namespace VRM { - public static class VRMUnlitTransparentZWriteMaterialImporter + public static class BuiltInVrmUnlitTransparentZWriteMaterialImporter { public const string UnlitTransparentZWriteShaderName = "VRM/UnlitTransparentZWrite"; public const string UnlitTransparentZWriteMainTexturePropName = "_MainTex"; diff --git a/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs.meta similarity index 100% rename from Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs.meta diff --git a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs similarity index 65% rename from Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs rename to Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs index aebbf4e0c..6c8f2d482 100644 --- a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs @@ -6,29 +6,30 @@ using VRMShaders; namespace VRM { - public sealed class VRMUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class UrpVrmMaterialDescriptorGenerator : IMaterialDescriptorGenerator { - readonly glTF_VRM_extensions m_vrm; - public VRMUrpMaterialDescriptorGenerator(glTF_VRM_extensions vrm) + private readonly glTF_VRM_extensions _vrm; + + public UrpVrmMaterialDescriptorGenerator(glTF_VRM_extensions vrm) { - m_vrm = vrm; + _vrm = vrm; } public MaterialDescriptor Get(GltfData data, int i) { // mtoon URP "MToon" shader is not ready. import fallback to unlit // unlit "UniUnlit" work in URP - if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var matDesc)) return matDesc; + if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var matDesc)) return matDesc; // pbr "Standard" to "Universal Render Pipeline/Lit" - if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; + if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; // fallback if (Symbols.VRM_DEVELOP) { Debug.LogWarning($"material: {i} out of range. fallback"); } return new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, null), - GltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), + BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), diff --git a/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs.meta b/Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs.meta similarity index 100% rename from Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs.meta rename to Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs.meta diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs index ffe6a9772..d2f7c5637 100644 --- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs +++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs @@ -27,7 +27,7 @@ namespace VRM ITextureDeserializer textureDeserializer = null, IMaterialDescriptorGenerator materialGenerator = null, bool loadAnimation = false) - : base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new VRMMaterialDescriptorGenerator(data.VrmExtension)) + : base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new BuiltInVrmMaterialDescriptorGenerator(data.VrmExtension)) { _data = data; TextureDescriptorGenerator = new VrmTextureDescriptorGenerator(Data, VRM); diff --git a/Assets/VRM/Tests/MToonTest.cs b/Assets/VRM/Tests/MToonTest.cs index 0810b5356..ec5c7adbd 100644 --- a/Assets/VRM/Tests/MToonTest.cs +++ b/Assets/VRM/Tests/MToonTest.cs @@ -31,7 +31,7 @@ namespace VRM var vrmMaterial = BuiltInVrmExtensionMaterialPropertyExporter.ExportMaterial(srcMaterial, textureExporter); Assert.AreEqual(vrmMaterial.vectorProperties["_MainTex"], new float[] { 0.3f, 0.2f, 0.5f, 0.6f }); - var materialImporter = new VRMMaterialDescriptorGenerator(new glTF_VRM_extensions + var materialImporter = new BuiltInVrmMaterialDescriptorGenerator(new glTF_VRM_extensions { materialProperties = new System.Collections.Generic.List { vrmMaterial } }); @@ -51,7 +51,7 @@ namespace VRM var importer = new VRMImporterContext(vrm, null); Assert.AreEqual(73, vrm.Data.GLTF.materials.Count); - Assert.True(VRMMToonMaterialImporter.TryCreateParam(vrm.Data, importer.VRM, 0, out MaterialDescriptor matDesc)); + Assert.True(BuiltInVrmMToonMaterialImporter.TryCreateParam(vrm.Data, importer.VRM, 0, out MaterialDescriptor matDesc)); } } @@ -71,7 +71,7 @@ namespace VRM using (var data = new GlbFileParser(path).Parse()) { var vrmImporter = new VRMImporterContext(new VRMData(data), null); - var materialParam = new VRMMaterialDescriptorGenerator(vrmImporter.VRM).Get(data, 0); + var materialParam = new BuiltInVrmMaterialDescriptorGenerator(vrmImporter.VRM).Get(data, 0); Assert.AreEqual("VRM/MToon", materialParam.ShaderName); Assert.AreEqual("Alicia_body", materialParam.TextureSlots["_MainTex"].UnityObjectName); diff --git a/Assets/VRM/Tests/VRMTextureEnumerateTests.cs b/Assets/VRM/Tests/VRMTextureEnumerateTests.cs index 9ae342c83..5c4160dd6 100644 --- a/Assets/VRM/Tests/VRMTextureEnumerateTests.cs +++ b/Assets/VRM/Tests/VRMTextureEnumerateTests.cs @@ -141,7 +141,7 @@ namespace VRM }; // 2系統ある？ - Assert.IsTrue(VRMMToonMaterialImporter.TryCreateParam(data, vrm, 0, out VRMShaders.MaterialDescriptor matDesc)); + Assert.IsTrue(BuiltInVrmMToonMaterialImporter.TryCreateParam(data, vrm, 0, out VRMShaders.MaterialDescriptor matDesc)); Assert.AreEqual(1, matDesc.TextureSlots.Count); var items = new VrmTextureDescriptorGenerator(data, vrm).Get().GetEnumerable().ToArray(); diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs index 9870da7d3..be82aec15 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs @@ -26,7 +26,7 @@ namespace UniVRM10 { if (RenderPipeline == UniGLTF.RenderPipelineTypes.UniversalRenderPipeline) { - if (Shader.Find(UniGLTF.GltfPbrUrpMaterialImporter.ShaderName) == null) + if (Shader.Find(UniGLTF.UrpGltfPbrMaterialImporter.ShaderName) == null) { Debug.LogWarning("URP is not installed. Force to BuiltinRenderPipeline"); RenderPipeline = UniGLTF.RenderPipelineTypes.BuiltinRenderPipeline; 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 58% rename from Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs rename to Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs index c483adfb2..79360e37a 100644 --- a/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs @@ -6,23 +6,23 @@ 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 (GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; + if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; // pbr - if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; + if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; // fallback if (Symbols.VRM_DEVELOP) { Debug.LogWarning($"material: {i} out of range. fallback"); } return new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), 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 65% rename from Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs rename to Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs index ca719650d..2201e19ad 100644 --- a/Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs @@ -6,19 +6,19 @@ using VRMShaders; namespace UniVRM10 { - public sealed class Vrm10UrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator + public sealed class UrpVrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator { public MaterialDescriptor Get(GltfData data, int i) { // unlit - if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc; + if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc; // pbr - if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; + if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc; // fallback Debug.LogWarning($"material: {i} out of range. fallback"); return new MaterialDescriptor( - GltfMaterialDescriptorGenerator.GetMaterialName(i, null), - GltfPbrMaterialImporter.ShaderName, + GltfMaterialImportUtils.ImportMaterialName(i, null), + BuiltInGltfPbrMaterialImporter.ShaderName, null, new Dictionary(), new Dictionary(), 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 806270b77..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(); } } @@ -309,11 +309,11 @@ namespace UniVRM10.VRM10Viewer { if (useUrp) { - return new GltfUrpMaterialDescriptorGenerator(); + return new UrpGltfMaterialDescriptorGenerator(); } else { - return new GltfMaterialDescriptorGenerator(); + return new BuiltInGltfMaterialDescriptorGenerator(); } } diff --git a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs index 2b6bea54c..893d31ead 100644 --- a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs +++ b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs @@ -332,11 +332,11 @@ namespace VRM.SimpleViewer { if (useUrp) { - return new GltfUrpMaterialDescriptorGenerator(); + return new UrpGltfMaterialDescriptorGenerator(); } else { - return new GltfMaterialDescriptorGenerator(); + return new BuiltInGltfMaterialDescriptorGenerator(); } } @@ -344,11 +344,11 @@ namespace VRM.SimpleViewer { if (useUrp) { - return new VRM.VRMUrpMaterialDescriptorGenerator(vrm); + return new VRM.UrpVrmMaterialDescriptorGenerator(vrm); } else { - return new VRM.VRMMaterialDescriptorGenerator(vrm); + return new VRM.BuiltInVrmMaterialDescriptorGenerator(vrm); } }