Start to fix multi-material import

kythyria · Jan 29, 2020 · c803ffd · c803ffd
1 parent 2073c68
commit c803ffd
Showing 1 changed file with 98 additions and 26 deletions.
diff --git a/PD2ModelParser/Importers/GltfImporter.cs b/PD2ModelParser/Importers/GltfImporter.cs
@@ -285,6 +285,14 @@ public int AppendVertex(Vertex vtx)
                 return idx;
             }
 
+            public void AppendVertices(IEnumerable<Vertex> vertices)
+            {
+                foreach(var i in vertices)
+                {
+                    AppendVertex(i);
+                }
+            }
+
             public static MeshData FromGltfMesh(GLTF.Mesh mesh)
             {
                 var attribsUsed = mesh.Primitives.First().VertexAccessors.Select(i => i.Key).OrderBy(i => i);
@@ -297,46 +305,110 @@ public static MeshData FromGltfMesh(GLTF.Mesh mesh)
                 var ms = new MeshData();
                 ms.materials = mesh.Primitives.Select(i => i.Material?.Name ?? "Material: Default Material").Distinct().ToList();
 
-                if (ms.materials.Contains(null))
-                {
-                    throw new Exception($"Missing material in mesh {mesh.Name}");
-                }
-
                 uint currentBaseVertex = 0;
-                uint currentBaseFace = 0;
+                uint currentBaseIndex = 0;
+
                 foreach (var prim in mesh.Primitives)
                 {
-                    //var indicesByVertex = new Dictionary<Vertex, int>();
                     var vertices = GetVerticesFromPrimitive(prim).ToList();
-                    foreach (var vtx in vertices)
+                    var primFaces = prim.GetTriangleIndices().ToList();
+                    var matname = prim.Material?.Name ?? "Material: Default Material";
+
+                    var ra = new DM.RenderAtom
                     {
-                        //if (indicesByVertex.ContainsKey(vtx)) { continue; }
-                        /*indicesByVertex[vtx] =*/ ms.AppendVertex(vtx);
-                    }
+                        BaseIndex = currentBaseIndex,
+                        BaseVertex = currentBaseVertex,
+                        MaterialId = (uint)ms.materials.IndexOf(matname),
+                        TriangleCount = (uint)primFaces.Count
+                    };
 
-                    foreach (var (A, B, C) in prim.GetTriangleIndices())
+                    var vertexIds = new Dictionary<Vertex, int>();
+                    foreach(var (A,B,C) in primFaces)
                     {
-                        var face = new DM.Face
+                        var vtxA = vertices[A];
+                        var vtxB = vertices[B];
+                        var vtxC = vertices[C];
+
+                        if(!vertexIds.ContainsKey(vtxA))
+                        {
+                            vertexIds[vtxA] = ms.AppendVertex(vtxA);
+                        }
+                        if (!vertexIds.ContainsKey(vtxB))
+                        {
+                            vertexIds[vtxB] = ms.AppendVertex(vtxB);
+                        }
+                        if (!vertexIds.ContainsKey(vtxC))
                         {
-                            a = (ushort)(currentBaseVertex + A),// indicesByVertex[vertices[A]],
-                            b = (ushort)(currentBaseVertex + B),// indicesByVertex[vertices[B]],
-                            c = (ushort)(currentBaseVertex + C),// indicesByVertex[vertices[C]],
+                            vertexIds[vtxC] = ms.AppendVertex(vtxC);
+                        }
+
+                        var df = new DM.Face()
+                        {
+                            a = (ushort)vertexIds[vtxA],
+                            b = (ushort)vertexIds[vtxB],
+                            c = (ushort)vertexIds[vtxC]
                         };
-                        ms.faces.Add(face);
+
+                        ms.faces.Add(df);
                     }
 
-                    var ra = new DM.RenderAtom
+                    ra.GeometrySliceLength = (uint)vertexIds.Count;
+                    ms.renderAtoms.Add(ra);
+
+                    currentBaseIndex += ra.TriangleCount * 3;
+                    currentBaseVertex += ra.GeometrySliceLength;
+                }
+                return ms;
+            }
+
+            public static MeshData FromGltfMesh0(GLTF.Mesh mesh)
+            {
+                var attribsUsed = mesh.Primitives.First().VertexAccessors.Select(i => i.Key).OrderBy(i => i);
+                var ok = mesh.Primitives.Select(i => i.VertexAccessors.Keys.OrderBy(j => j)).Aggregate(true, (acc, curr) => acc && curr.SequenceEqual(attribsUsed));
+                if (!ok)
+                {
+                    throw new Exception("Vertex attributes not consistent between Primitives. Diesel cannot represent this.");
+                }
+
+                var ms = new MeshData();
+                ms.materials = mesh.Primitives.Select(i => i.Material?.Name ?? "Material: Default Material").Distinct().ToList();
+
+                if (ms.materials.Contains(null))
+                {
+                    throw new Exception($"Missing material in mesh {mesh.Name}");
+                }
+
+                var atomoids = new List<(List<Vertex> verts, List<DM.Face> faces, string matName)>();
+                foreach (var prim in mesh.Primitives)
+                {
+                    var vertices = GetVerticesFromPrimitive(prim).ToList();
+                    var faces = prim.GetTriangleIndices().Select(i => new DM.Face { a = (ushort)i.A, b = (ushort)i.B, c = (ushort)i.C }).ToList();
+                    var matname = prim.Material?.Name ?? "Material: Default Material";
+                    atomoids.Add((vertices, faces, matname));
+                }
+
+                var md = new MeshData();
+
+                uint currentBaseVertex = 0;
+                uint currentBaseIndex = 0;
+                foreach (var i in atomoids)
+                {
+                    var ra = new DM.RenderAtom()
                     {
-                        BaseIndex = currentBaseVertex,
-                        TriangleCount = (uint)ms.faces.Count,
-                        GeometrySliceLength = (uint)ms.verts.Count,
-                        BaseVertex = currentBaseFace,
-                        MaterialId = (uint)ms.materials.IndexOf(prim.Material?.Name ?? "Material: Default Material")
+                        BaseIndex = currentBaseIndex,
+                        BaseVertex = currentBaseVertex,
+                        MaterialId = (uint)ms.materials.IndexOf(i.matName)
                     };
-                    ms.renderAtoms.Add(ra);
 
-                    currentBaseVertex += ra.TriangleCount;
-                    currentBaseFace += ra.GeometrySliceLength;
+                    ms.AppendVertices(i.verts);
+                    ra.GeometrySliceLength = (uint)i.verts.Count;
+                    currentBaseVertex += (uint)i.verts.Count;
+
+                    ms.faces.AddRange(i.faces);
+                    ra.TriangleCount = (uint)i.faces.Count;
+                    currentBaseIndex += (uint)i.faces.Count * 3;
+
+                    ms.renderAtoms.Add(ra);
                 }
                 return ms;
             }