From f199c593b7d099c94d545ab9897c1c21910d8065 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 5 Apr 2022 12:48:43 +0900 Subject: [PATCH] detect dividedVertexBuffer --- Assets/VRM10/Runtime/Migration/MeshUpdater.cs | 156 ++++++++++-------- 1 file changed, 89 insertions(+), 67 deletions(-) diff --git a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs index aeb8611f5..c6148e3c4 100644 --- a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs +++ b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs @@ -75,74 +75,13 @@ namespace UniVRM10 image.bufferView = AddBuffer(bytes); } - // update Mesh - foreach (var (gltfMesh, mesh) in Enumerable.Zip(gltf.meshes, model.MeshGroups, (l, r) => (l, r.Meshes[0]))) + if (model.MeshGroups.All(x => x.Meshes.Count == 1)) { - 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(); - } - - foreach (var (gltfPrim, submesh) in Enumerable.Zip(gltfMesh.primitives, mesh.Submeshes, (l, r) => (l, r))) - { - var subIndices = indices.GetSubArray(submesh.Offset, submesh.DrawCount); - gltfPrim.indices = AddAccessor(subIndices); - 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; - } - } + UpdateSharedVertexBuffer(model); + } + else + { + UpdateDividedVertexBuffer(model); } // update nodes and remove unused skin @@ -212,6 +151,89 @@ namespace UniVRM10 gltf.accessors = _accessors; return (gltf, _buffer.Bytes); + + } + + void UpdateSharedVertexBuffer(VrmLib.Model model) + { + var gltf = _data.GLTF; + + // update Mesh + foreach (var (gltfMesh, mesh) in Enumerable.Zip(gltf.meshes, model.MeshGroups, (l, r) => (l, r.Meshes[0]))) + { + 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(); + } + + foreach (var (gltfPrim, submesh) in Enumerable.Zip(gltfMesh.primitives, mesh.Submeshes, (l, r) => (l, r))) + { + var subIndices = indices.GetSubArray(submesh.Offset, submesh.DrawCount); + gltfPrim.indices = AddAccessor(subIndices); + 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; + } + } + } + } + + void UpdateDividedVertexBuffer(VrmLib.Model model) + { + var gltf = _data.GLTF; + + throw new NotImplementedException(); } } }