Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-25 03:55:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1106 from ousttrue/fix/expression_load

Browse Source 
UnitTestの修正
This commit is contained in:
PoChang007
2021-07-19 12:45:24 +09:00
committed by GitHub
parent 54e023e82e e57235d0a0
commit e8a0823bac
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@@ -267,16 +267,40 @@ namespace UniVRM10
clip.OverrideLookAt = expression.OverrideLookAt;
clip.OverrideMouth = expression.OverrideMouth;
clip.MorphTargetBindings = expression?.MorphTargetBinds?.Select(x => x.Build10(Root, m_map, m_model))
.ToArray();
clip.MaterialColorBindings = expression?.MaterialColorBinds?.Select(x => x.Build10(MaterialFactory.Materials))
.Where(x => x.HasValue)
.Select(x => x.Value)
.ToArray();
clip.MaterialUVBindings = expression?.TextureTransformBinds?.Select(x => x.Build10(MaterialFactory.Materials))
.Where(x => x.HasValue)
.Select(x => x.Value)
.ToArray();
if (expression.MorphTargetBinds != null)
{
clip.MorphTargetBindings = expression.MorphTargetBinds?.Select(x => x.Build10(Root, m_map, m_model))
.ToArray();
}
else
{
clip.MorphTargetBindings = new MorphTargetBinding[] { };
}
if (expression.MaterialColorBinds != null)
{
clip.MaterialColorBindings = expression.MaterialColorBinds.Select(x => x.Build10(MaterialFactory.Materials))
.Where(x => x.HasValue)
.Select(x => x.Value)
.ToArray();
}
else
{
clip.MaterialColorBindings = new MaterialColorBinding[] { };
}
if (expression.TextureTransformBinds != null)
{
clip.MaterialUVBindings = expression?.TextureTransformBinds?.Select(x => x.Build10(MaterialFactory.Materials))
.Where(x => x.HasValue)
.Select(x => x.Value)
.ToArray();
}
else
{
clip.MaterialUVBindings = new MaterialUVBinding[] { };
}
m_expressions.Add(clip);
}
return clip;

2
Assets/VRM10/Tests/SerializationTests.cs
View File

@@ -212,7 +212,7 @@ namespace UniVRM10
data.OverrideBlink = UniGLTF.Extensions.VRMC_vrm.ExpressionOverrideType.block;
var json = Serialize(data, UniGLTF.Extensions.VRMC_vrm.GltfSerializer.__expressions_Serialize_Custom_ITEM);
Assert.AreEqual($"{{{q}preset{q}:{q}custom{q},{q}overrideBlink{q}:{q}block{q},{q}overrideLookAt{q}:{q}none{q},{q}overrideMouth{q}:{q}none{q}}}", json);
Assert.AreEqual($"{{{q}overrideBlink{q}:{q}block{q},{q}overrideLookAt{q}:{q}none{q},{q}overrideMouth{q}:{q}none{q}}}", json);
}
{