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

Func<int, int> to delegage int MeshIndexToNodeIndexFunc(int meshIndex)

Browse Source
This commit is contained in:
ousttrue 2021-10-28 14:58:03 +09:00
parent bfb4e74489
commit 3ba9d1cc7c
3 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/VRM10/Runtime/Migration/MigrationVrm.cs
View File

@ -42,6 +42,8 @@ namespace UniVRM10
static byte[] MigrateVrm(glTF gltf, ArraySegment<byte> bin, JsonNode vrm0)
{
var meshToNode = CreateMeshToNode(gltf);
{
// vrm
var vrm1 = new UniGLTF.Extensions.VRMC_vrm.VRMC_vrm();
@ -59,7 +61,7 @@ namespace UniVRM10
Preset = new UniGLTF.Extensions.VRMC_vrm.Preset(),
Custom = new Dictionary<string, UniGLTF.Extensions.VRMC_vrm.Expression>(),
};
foreach (var (preset, customName, expression) in MigrationVrmExpression.Migrate(gltf, vrm0BlendShape))
foreach (var (preset, customName, expression) in MigrationVrmExpression.Migrate(gltf, vrm0BlendShape, meshToNode))
{
switch (preset)
{
@ -119,11 +121,29 @@ namespace UniVRM10
return Glb.Create(vrm1Json, bin).ToBytes();
}
public static void Check(JsonNode vrm0, UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm1, Func<int, int> MeshToNode)
public delegate int MeshIndexToNodeIndexFunc(int meshIndex);
public static MeshIndexToNodeIndexFunc CreateMeshToNode(UniGLTF.glTF gltf)
{
return (int mesh) =>
{
for (int i = 0; i < gltf.nodes.Count; ++i)
{
var node = gltf.nodes[i];
if (node.mesh == mesh)
{
return i;
}
}
return -1;
};
}
public static void Check(JsonNode vrm0, UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm1, MeshIndexToNodeIndexFunc meshToNode)
{
MigrationVrmMeta.Check(vrm0["meta"], vrm1.Meta);
MigrationVrmHumanoid.Check(vrm0["humanoid"], vrm1.Humanoid);
MigrationVrmExpression.Check(vrm0["blendShapeMaster"], vrm1.Expressions, MeshToNode);
MigrationVrmExpression.Check(vrm0["blendShapeMaster"], vrm1.Expressions, meshToNode);
}
public static void Check(JsonNode vrm0, UniGLTF.Extensions.VRMC_springBone.VRMC_springBone vrm1, List<glTFNode> nodes)

61
Assets/VRM10/Runtime/Migration/MigrationVrmExpression.cs
View File

@ -42,7 +42,8 @@ namespace UniVRM10
throw new NotImplementedException();
}
static IEnumerable<UniGLTF.Extensions.VRMC_vrm.MorphTargetBind> ToMorphTargetBinds(UniGLTF.glTF gltf, JsonNode json)
static IEnumerable<UniGLTF.Extensions.VRMC_vrm.MorphTargetBind> ToMorphTargetBinds(JsonNode json,
MigrationVrm.MeshIndexToNodeIndexFunc meshToNode)
{
foreach (var x in json.ArrayItems())
{
@ -54,18 +55,11 @@ namespace UniVRM10
// https://github.com/vrm-c/vrm-specification/pull/106
// https://github.com/vrm-c/vrm-specification/pull/153
var node = gltf.nodes.FirstOrDefault(y => y.mesh == meshIndex);
if (node == null)
{
// invalid data. skip
Debug.LogWarning($"[MigrationVrmExpression] node.mesh == {meshIndex} is not found");
continue;
}
var nodeIndex = gltf.nodes.IndexOf(node);
var nodeIndex = meshToNode(meshIndex);
if (nodeIndex == -1)
{
// invalid data. skip
Debug.LogWarning($"[MigrationVrmExpression] node.mesh == {meshIndex} index");
Debug.LogWarning($"[MigrationVrmExpression] node.mesh == {meshIndex} not found");
continue;
}
bind.Node = nodeIndex;
@ -194,7 +188,8 @@ namespace UniVRM10
}
}
public static IEnumerable<(ExpressionPreset, string, UniGLTF.Extensions.VRMC_vrm.Expression)> Migrate(UniGLTF.glTF gltf, JsonNode json)
public static IEnumerable<(ExpressionPreset, string, UniGLTF.Extensions.VRMC_vrm.Expression)> Migrate(UniGLTF.glTF gltf, JsonNode json,
MigrationVrm.MeshIndexToNodeIndexFunc meshToNode)
{
foreach (var blendShapeClip in json["blendShapeGroups"].ArrayItems())
{
@ -212,7 +207,7 @@ namespace UniVRM10
MaterialColorBinds = new List<UniGLTF.Extensions.VRMC_vrm.MaterialColorBind>(),
TextureTransformBinds = new List<UniGLTF.Extensions.VRMC_vrm.TextureTransformBind>(),
};
expression.MorphTargetBinds = ToMorphTargetBinds(gltf, blendShapeClip["binds"]).ToList();
expression.MorphTargetBinds = ToMorphTargetBinds(blendShapeClip["binds"], meshToNode).ToList();
if (blendShapeClip.TryGet("materialValues", out JsonNode materialValues))
{
@ -223,7 +218,8 @@ namespace UniVRM10
}
}
static void Check(string name, JsonNode vrm0, UniGLTF.Extensions.VRMC_vrm.Expression vrm1, Func<int, int> MeshToNode)
static void Check(string name, JsonNode vrm0, UniGLTF.Extensions.VRMC_vrm.Expression vrm1,
MigrationVrm.MeshIndexToNodeIndexFunc meshToNode)
{
if (vrm0["binds"].GetArrayCount() == 0)
{
@ -241,7 +237,7 @@ namespace UniVRM10
foreach (var (l, r) in Enumerable.Zip(vrm0["binds"].ArrayItems(), vrm1.MorphTargetBinds, (x, y) => (x, y)))
{
var mesh = l["mesh"].GetInt32();
var node = MeshToNode(mesh);
var node = meshToNode(mesh);
if (node != r.Node)
{
throw new MigrationException($"expression.{name}.binds.node", $"{node} != {r.Node}");
@ -261,29 +257,30 @@ namespace UniVRM10
}
}
public static void Check(JsonNode vrm0, UniGLTF.Extensions.VRMC_vrm.Expressions vrm1, Func<int, int> MeshToNode)
public static void Check(JsonNode vrm0, UniGLTF.Extensions.VRMC_vrm.Expressions vrm1,
MigrationVrm.MeshIndexToNodeIndexFunc meshToNode)
{
foreach (var blendShape in vrm0["blendShapeGroups"].ArrayItems())
{
var name = blendShape["presetName"].GetString().ToLower();
switch (name)
{
case "a": Check(name, blendShape, vrm1.Preset.Aa, MeshToNode); break;
case "i": Check(name, blendShape, vrm1.Preset.Ih, MeshToNode); break;
case "u": Check(name, blendShape, vrm1.Preset.Ou, MeshToNode); break;
case "e": Check(name, blendShape, vrm1.Preset.Ee, MeshToNode); break;
case "o": Check(name, blendShape, vrm1.Preset.Oh, MeshToNode); break;
case "blink": Check(name, blendShape, vrm1.Preset.Blink, MeshToNode); break;
case "joy": Check(name, blendShape, vrm1.Preset.Happy, MeshToNode); break;
case "angry": Check(name, blendShape, vrm1.Preset.Angry, MeshToNode); break;
case "sorrow": Check(name, blendShape, vrm1.Preset.Sad, MeshToNode); break;
case "fun": Check(name, blendShape, vrm1.Preset.Relaxed, MeshToNode); break;
case "lookup": Check(name, blendShape, vrm1.Preset.LookUp, MeshToNode); break;
case "lookdown": Check(name, blendShape, vrm1.Preset.LookDown, MeshToNode); break;
case "lookleft": Check(name, blendShape, vrm1.Preset.LookLeft, MeshToNode); break;
case "lookright": Check(name, blendShape, vrm1.Preset.LookRight, MeshToNode); break;
case "blink_l": Check(name, blendShape, vrm1.Preset.BlinkLeft, MeshToNode); break;
case "blink_r": Check(name, blendShape, vrm1.Preset.BlinkRight, MeshToNode); break;
case "a": Check(name, blendShape, vrm1.Preset.Aa, meshToNode); break;
case "i": Check(name, blendShape, vrm1.Preset.Ih, meshToNode); break;
case "u": Check(name, blendShape, vrm1.Preset.Ou, meshToNode); break;
case "e": Check(name, blendShape, vrm1.Preset.Ee, meshToNode); break;
case "o": Check(name, blendShape, vrm1.Preset.Oh, meshToNode); break;
case "blink": Check(name, blendShape, vrm1.Preset.Blink, meshToNode); break;
case "joy": Check(name, blendShape, vrm1.Preset.Happy, meshToNode); break;
case "angry": Check(name, blendShape, vrm1.Preset.Angry, meshToNode); break;
case "sorrow": Check(name, blendShape, vrm1.Preset.Sad, meshToNode); break;
case "fun": Check(name, blendShape, vrm1.Preset.Relaxed, meshToNode); break;
case "lookup": Check(name, blendShape, vrm1.Preset.LookUp, meshToNode); break;
case "lookdown": Check(name, blendShape, vrm1.Preset.LookDown, meshToNode); break;
case "lookleft": Check(name, blendShape, vrm1.Preset.LookLeft, meshToNode); break;
case "lookright": Check(name, blendShape, vrm1.Preset.LookRight, meshToNode); break;
case "blink_l": Check(name, blendShape, vrm1.Preset.BlinkLeft, meshToNode); break;
case "blink_r": Check(name, blendShape, vrm1.Preset.BlinkRight, meshToNode); break;
default:
{
string found = default;
@ -291,7 +288,7 @@ namespace UniVRM10
{
if (kv.Key.ToLower() == name)
{
Check(name, blendShape, kv.Value, MeshToNode);
Check(name, blendShape, kv.Value, meshToNode);
found = kv.Key;
break;
}

15
Assets/VRM10/Tests/MigrationTests.cs
View File

@ -54,21 +54,8 @@ namespace UniVRM10
var json = glb.Json.Bytes.ParseAsJson();
var gltf = UniGLTF.GltfDeserializer.Deserialize(json);
Func<int, int> meshToNode = (int mesh) =>
{
for (int i = 0; i < gltf.nodes.Count; ++i)
{
var node = gltf.nodes[i];
if (node.mesh == mesh)
{
return i;
}
}
throw new KeyNotFoundException();
};
MigrationVrm.Check(vrm0Json, GetExtension(gltf.extensions, UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.ExtensionNameUtf8,
UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.Deserialize), meshToNode);
UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.Deserialize), MigrationVrm.CreateMeshToNode(gltf));
MigrationVrm.Check(vrm0Json, GetExtension(gltf.extensions, UniGLTF.Extensions.VRMC_springBone.GltfDeserializer.ExtensionNameUtf8,
UniGLTF.Extensions.VRMC_springBone.GltfDeserializer.Deserialize), gltf.nodes);
}