diff --git a/Assets/VRM/Runtime/IO/VRMData.cs b/Assets/VRM/Runtime/IO/VRMData.cs index 658f45a5b..84e85eb82 100644 --- a/Assets/VRM/Runtime/IO/VRMData.cs +++ b/Assets/VRM/Runtime/IO/VRMData.cs @@ -5,7 +5,7 @@ namespace VRM public class VRMData { public GltfData Data { get; } - public glTF_VRM_extensions VrmExtensions { get; } + public glTF_VRM_extensions VrmExtension { get; } public VRMData(GltfData data) { @@ -15,7 +15,7 @@ namespace VRM { throw new NotVrm0Exception(); } - VrmExtensions = vrm; + VrmExtension = vrm; } } } diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs index c085f6bd6..889dd7892 100644 --- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs +++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs @@ -17,7 +17,7 @@ namespace VRM { get { - return _data.VrmExtensions; + return _data.VrmExtension; } } @@ -26,7 +26,7 @@ namespace VRM IReadOnlyDictionary externalObjectMap = null, ITextureDeserializer textureDeserializer = null, IMaterialDescriptorGenerator materialGenerator = null) - : base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new VRMMaterialDescriptorGenerator(data.VrmExtensions)) + : base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new VRMMaterialDescriptorGenerator(data.VrmExtension)) { _data = data; TextureDescriptorGenerator = new VrmTextureDescriptorGenerator(Data, VRM); diff --git a/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs index d4436d723..1811c3cc8 100644 --- a/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs +++ b/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs @@ -364,7 +364,7 @@ namespace VRM.SimpleViewer { var data = new GlbFileParser(path).Parse(); var vrm = new VRMData(data); - using (var context = new VRMImporterContext(vrm, materialGenerator: GetVrmMaterialGenerator(m_useUrpMaterial.isOn, vrm.VrmExtensions))) + using (var context = new VRMImporterContext(vrm, materialGenerator: GetVrmMaterialGenerator(m_useUrpMaterial.isOn, vrm.VrmExtension))) { await m_texts.UpdateMetaAsync(context); var loaded = await context.LoadAsync();