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

Merge pull request #696 from Santarh/fix-turkish-i-problem

Browse Source 
Fix #694 Turkish "i" problem.
This commit is contained in:
ousttrue
2021-01-27 15:50:18 +09:00
committed by GitHub
parent 4e4cc1150c 37b6d1ca04
commit 7de32b5e35
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Assets/VRM/Runtime/Extensions/glTF_VRMExtensions.cs
View File

@@ -19,6 +19,10 @@ namespace VRM
public static glTF_VRM_BlendShapeBind Create(Transform root, BlendShapeBinding binding,
gltfExporter exporter)
{
if (root == null || exporter == null)
{
return null;
}
if (string.IsNullOrEmpty((binding.RelativePath)))
{
Debug.LogWarning("binding.RelativePath is null");
@@ -77,19 +81,16 @@ namespace VRM
};
}
/// <summary>
///
/// </summary>
/// <param name="master"></param>
/// <param name="clip"></param>
/// <param name="transform"></param>
/// <param name="meshes"></param>
/// <param name="blendShapeIndexMap">エクスポート中にBlendShapeIndexが変わったかもしれない</param>
public static void Add(this glTF_VRM_BlendShapeMaster master,
BlendShapeClip clip, gltfExporter exporter)
{
var list = new List<glTF_VRM_BlendShapeBind>();
if (clip.Values != null)
master.blendShapeGroups.Add(clip.Serialize(exporter));
}
public static glTF_VRM_BlendShapeGroup Serialize(this BlendShapeClip clip, gltfExporter exporter)
{
var bindList = new List<glTF_VRM_BlendShapeBind>();
if (clip.Values != null && exporter != null)
{
foreach (var value in clip.Values)
{
@@ -99,14 +100,14 @@ namespace VRM
// Debug.LogFormat("{0}: skip blendshapebind", clip.name);
continue;
}
list.Add(bind);
bindList.Add(bind);
}
}
var materialList = new List<glTF_VRM_MaterialValueBind>();
var materialValueBinds = new List<glTF_VRM_MaterialValueBind>();
if (clip.MaterialValues != null)
{
materialList.AddRange(clip.MaterialValues.Select(y => new glTF_VRM_MaterialValueBind
materialValueBinds.AddRange(clip.MaterialValues.Select(y => new glTF_VRM_MaterialValueBind
{
materialName = y.MaterialName,
propertyName = y.ValueName,
@@ -114,15 +115,14 @@ namespace VRM
}));
}
var group = new glTF_VRM_BlendShapeGroup
return new glTF_VRM_BlendShapeGroup
{
name = clip.BlendShapeName,
presetName = clip.Preset.ToString().ToLower(),
presetName = clip.Preset.ToString().ToLowerInvariant(),
isBinary = clip.IsBinary,
binds = list,
materialValues = materialList,
binds = bindList,
materialValues = materialValueBinds,
};
master.blendShapeGroups.Add(group);
}
public static void Apply(this glTF_VRM_DegreeMap map, CurveMapper mapper)

13
Assets/VRM/Tests/UniVRMSerializeTests.cs
View File

@@ -200,6 +200,19 @@ namespace VRM
presetName = "aaaaaaaaaaaa_not_exists_",
};
}
[Test]
public void BlendShapePresetInvariantCultureTest()
{
// https://github.com/vrm-c/UniVRM/issues/694
// Must pass even if this computer's locale was tr-TR.
var clip2 = ScriptableObject.CreateInstance<BlendShapeClip>();
clip2.Preset = BlendShapePreset.I;
var model2 = clip2.Serialize(null);
var json2 = model2.ToJson();
Assert.AreEqual(@"{""presetName"":""i"",""binds"":[],""materialValues"":[],""isBinary"":false}", json2);
Debug.Log(json2);
}
[Test]
public void DegreeMapTest()