diff --git a/Scripts/Format/VRMExporter.cs b/Scripts/Format/VRMExporter.cs index 5b56fcc61..4dea58798 100644 --- a/Scripts/Format/VRMExporter.cs +++ b/Scripts/Format/VRMExporter.cs @@ -108,7 +108,7 @@ namespace VRM gltf.extensions.VRM.meta.title = meta.Title; if (meta.Thumbnail != null) { - gltf.extensions.VRM.meta.texture = gltfExporter.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail); + gltf.extensions.VRM.meta.texture = TextureIO.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail); } gltf.extensions.VRM.meta.licenseType = meta.LicenseType; gltf.extensions.VRM.meta.otherLicenseUrl = meta.OtherLicenseUrl; @@ -130,7 +130,7 @@ namespace VRM gltf.extensions.VRM.meta.title = meta.Title; if (meta.Thumbnail != null) { - gltf.extensions.VRM.meta.texture = gltfExporter.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail); + gltf.extensions.VRM.meta.texture = TextureIO.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail); } // ussage pemission diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs index 4c87c9170..ca99c23d1 100644 --- a/Scripts/Format/VRMImporter.cs +++ b/Scripts/Format/VRMImporter.cs @@ -55,11 +55,11 @@ namespace VRM "VRM/MToon", }; - public static CreateMaterialFunc GetMaterialFunc(List materials) + public static MaterialIO.CreateMaterialFunc GetMaterialFunc(List materials) { - var CreateDefault = gltfImporter.CreateMaterialFuncFromShader(new ShaderStore("VRM/UnlitTexture")); - var CreateZWrite = gltfImporter.CreateMaterialFuncFromShader(new ShaderStore("VRM/UnlitTransparentZWrite")); - CreateMaterialFunc fallback = (ctx, i) => + var CreateDefault = MaterialIO.CreateMaterialFuncFromShader(new ShaderStore("VRM/UnlitTexture")); + var CreateZWrite = MaterialIO.CreateMaterialFuncFromShader(new ShaderStore("VRM/UnlitTransparentZWrite")); + MaterialIO.CreateMaterialFunc fallback = (ctx, i) => { var vrm = ctx.GLTF; if (vrm != null && vrm.materials[i].name.ToLower().Contains("zwrite")) diff --git a/UniGLTF b/UniGLTF index 522dbaa13..dfdfbfe21 160000 --- a/UniGLTF +++ b/UniGLTF @@ -1 +1 @@ -Subproject commit 522dbaa1399b6df27e47264b14f25f91c8820ba0 +Subproject commit dfdfbfe2156bae29bab301b203d94ad087712fc4