Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-12 13:59:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VrmExtensions to VrmExtension

Browse Source
This commit is contained in:
ousttrue
2021-09-02 13:00:33 +09:00
parent 18d1840f0c
commit d938e9dd05
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/VRM/Runtime/IO/VRMData.cs
View File

@@ -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;
}
}
}

4
Assets/VRM/Runtime/IO/VRMImporterContext.cs
View File

@@ -17,7 +17,7 @@ namespace VRM
{
get
{
return _data.VrmExtensions;
return _data.VrmExtension;
}
}
@@ -26,7 +26,7 @@ namespace VRM
IReadOnlyDictionary<SubAssetKey, Object> 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);

2
Assets/VRM/Samples/SimpleViewer/ViewerUI.cs
View File

@@ -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();