diff --git a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs
index c6148e3c4..389d441e3 100644
--- a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs
+++ b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs
@@ -64,6 +64,12 @@ namespace UniVRM10
public int? Normal;
};
+ ///
+ /// bufferView, accessor を push することで bin を再構築する
+ /// (meshの右手左手変換結果の適用など)
+ ///
+ ///
+ ///
public (glTF, ArraySegment) Update(VrmLib.Model model)
{
var gltf = _data.GLTF;
@@ -75,6 +81,7 @@ namespace UniVRM10
image.bufferView = AddBuffer(bytes);
}
+ // copy mesh
if (model.MeshGroups.All(x => x.Meshes.Count == 1))
{
UpdateSharedVertexBuffer(model);
@@ -154,11 +161,16 @@ namespace UniVRM10
}
+ ///
+ /// model はひとつのノードに複数の mesh をぶら下げることができる(meshGroup)
+ /// gltf.meshes[i].primitives[j] <-> model.meshGroups[i].meshes[0].submeshes[j]
+ ///
+ ///
void UpdateSharedVertexBuffer(VrmLib.Model model)
{
var gltf = _data.GLTF;
- // update Mesh
+ // gltfMeshes[i] <=> MeshGroups[i].Meshes[0] ( MeshGroups[i].Meshes.Count == 1 )
foreach (var (gltfMesh, mesh) in Enumerable.Zip(gltf.meshes, model.MeshGroups, (l, r) => (l, r.Meshes[0])))
{
NativeArray indices;
@@ -207,6 +219,7 @@ namespace UniVRM10
}).ToArray();
}
+ // gltfPrim[j] <=> mesh.Submeshes[j]
foreach (var (gltfPrim, submesh) in Enumerable.Zip(gltfMesh.primitives, mesh.Submeshes, (l, r) => (l, r)))
{
var subIndices = indices.GetSubArray(submesh.Offset, submesh.DrawCount);
@@ -229,11 +242,85 @@ namespace UniVRM10
}
}
+ ///
+ /// model はひとつのノードに複数の mesh をぶら下げることができる(meshGroup)
+ /// gltf.meshes[i].primitives[j] <-> model.meshGroups[i].meshes[j].submeshes[0]
+ ///
+ ///
void UpdateDividedVertexBuffer(VrmLib.Model model)
{
var gltf = _data.GLTF;
- throw new NotImplementedException();
+ // gltfMesh[i] <=> meshGroups[i]
+ foreach (var (gltfMesh, meshGroup) in Enumerable.Zip(gltf.meshes, model.MeshGroups, (l, r) => (l, r)))
+ {
+ // gltfPrimitives[j] <=> meshGroup.Meshes[j] (meshGroup.Meshes[j].Submeshes.Count==1)
+ foreach (var (gltfPrim, mesh) in Enumerable.Zip(gltfMesh.primitives, meshGroup.Meshes, (l, r) => (l, r)))
+ {
+ NativeArray indices;
+ switch (mesh.IndexBuffer.Stride)
+ {
+ case 1:
+ {
+ // byte
+ var byte_indices = mesh.IndexBuffer.GetSpan();
+ indices = _data.NativeArrayManager.Convert(byte_indices, (byte x) => (uint)x);
+ break;
+ }
+
+ case 2:
+ {
+ // ushort
+ var ushort_indices = mesh.IndexBuffer.GetSpan();
+ indices = _data.NativeArrayManager.Convert(ushort_indices, (ushort x) => (uint)x);
+ break;
+ }
+
+ case 4:
+ {
+ // uint
+ indices = mesh.IndexBuffer.GetSpan();
+ break;
+ }
+
+ default:
+ throw new NotImplementedException();
+ }
+
+ var position = AddAccessor(mesh.VertexBuffer.Positions);
+ var normal = AddAccessor(mesh.VertexBuffer.Normals);
+ var uv = AddAccessor(mesh.VertexBuffer.TexCoords);
+ var weights = AddAccessor(mesh.VertexBuffer.Weights);
+ var joints = AddAccessor(mesh.VertexBuffer.Joints);
+ var color = AddAccessor(mesh.VertexBuffer.Colors);
+
+ var morphTargets = new MorphAccessor[] { };
+ if (mesh.MorphTargets != null)
+ {
+ morphTargets = mesh.MorphTargets.Select(x => new MorphAccessor
+ {
+ Position = AddAccessor(x.VertexBuffer.Positions),
+ Normal = AddAccessor(x.VertexBuffer.Normals),
+ }).ToArray();
+ }
+
+ gltfPrim.indices = AddAccessor(indices);
+ gltfPrim.attributes.POSITION = position.Value;
+ gltfPrim.attributes.NORMAL = normal.GetValueOrDefault(-1); // たぶん、ありえる
+ gltfPrim.attributes.TANGENT = -1;
+ gltfPrim.attributes.COLOR_0 = color.GetValueOrDefault(-1);
+ gltfPrim.attributes.TEXCOORD_0 = uv.GetValueOrDefault(-1); // ありえる?
+ gltfPrim.attributes.TEXCOORD_1 = -1;
+ gltfPrim.attributes.WEIGHTS_0 = weights.GetValueOrDefault(-1);
+ gltfPrim.attributes.JOINTS_0 = joints.GetValueOrDefault(-1);
+ foreach (var (gltfMorph, morph) in Enumerable.Zip(gltfPrim.targets, morphTargets, (l, r) => (l, r)))
+ {
+ gltfMorph.POSITION = morph.Position.GetValueOrDefault(-1);
+ gltfMorph.NORMAL = morph.Normal.GetValueOrDefault(-1);
+ gltfMorph.TANGENT = -1;
+ }
+ }
+ }
}
}
}