Merge pull request #67 from NotAdam/xande

Pull in what we have for Xande so far

src/Lumina/Data/Parsing/MdlStructs.cs

@@ -337,15 +337,25 @@ public static ShapeStruct Read( LuminaBinaryReader br )
 
         public struct ShapeMeshStruct
         {
-            public uint StartIndex;
+            /// <summary>
+            /// From TT: The offset to the index block this Shape Data should be replacing in.
+            /// This is how Shape Data is tied to each mesh.
+            /// </summary>
+            public uint MeshIndexOffset;
             public uint ShapeValueCount;
             public uint ShapeValueOffset;
         }
 
         public struct ShapeValueStruct
         {
-            public ushort Offset;
-            public ushort Value;
+            /// <summary>
+            /// PROBABLY: Index into the Indices array of a mesh.
+            /// </summary>
+            public ushort BaseIndicesIndex;
+            /// <summary>
+            /// PROBABLY: Index into the (without transformation probably unused) vertex of a mesh.
+            /// </summary>
+            public ushort ReplacingVertexIndex;
         }
 
         public struct BoundingBoxStruct
@@ -362,4 +372,4 @@ public static BoundingBoxStruct Read( LuminaBinaryReader br )
             }
         }
     }
-}
+}

src/Lumina/GameData.cs

@@ -190,10 +190,11 @@ public GameData( string dataPath, ILogger logger, LuminaOptions? options = null!
         /// Load a defined file given a filesystem path
         /// </summary>
         /// <param name="path">A relative or absolute path to the file to load</param>
+        /// <param name="origPath">The original file path in SqPack, required for reading some files (e.g. materials)</param>
         /// <typeparam name="T">The type of <see cref="FileResource"/> to load the raw file in to</typeparam>
         /// <returns>The requested file if found, null if not</returns>
         /// <exception cref="FileNotFoundException">The path given doesn't point to an existing file</exception>
-        public T GetFileFromDisk< T >( string path ) where T : FileResource
+        public T GetFileFromDisk< T >( string path, string? origPath = null ) where T : FileResource
         {
             SetCurrentContext();
 
@@ -206,6 +207,10 @@ public T GetFileFromDisk< T >( string path ) where T : FileResource
 
             var file = Activator.CreateInstance< T >();
             file.Data = fileContent;
+            if( origPath != null )
+            {
+                file.FilePath = ParseFilePath( origPath )!;
+            }
             file.Reader = new LuminaBinaryReader( file.Data, Options.CurrentPlatform );
             file.LoadFile();
 
@@ -320,4 +325,4 @@ internal static void SetCurrentContext( GameData gameData )
             CurrentContext = new(() => gameData);
         }
     }
-}
+}

src/Lumina/Models/Models/Mesh.cs

@@ -128,8 +128,7 @@ private void ReadVertices()
             MdlStructs.VertexDeclarationStruct currentDecl = Parent.File.VertexDeclarations[ MeshIndex ];
 
             // We have to go through these in order by offset with this implementation
-            var orderedElements = currentDecl.VertexElements.ToList();
-            orderedElements.Sort( ( e1, e2 ) => e1.Offset.CompareTo( e2.Offset ) );
+            var orderedElements = currentDecl.VertexElements.OrderBy( e => e.Offset ).ToList();
             Vertices = new Vertex[currentMesh.VertexCount];
 
             // Vertices may be defined across at most 3 streams defined by a Mesh's VertexDeclarations

src/Lumina/Models/Models/Model.cs

@@ -93,7 +93,7 @@ private void BuildModel()
             ReadStrings();
             ReadMaterials();
             ReadMeshes();
-            ReadShapes();
+            ReadShapes( Meshes );
         }
 
         /// <summary>
@@ -127,14 +127,19 @@ private void ReadMaterials()
             }
         }
 
-        private void ReadShapes()
+        private void ReadShapes( IReadOnlyList< Mesh > meshes )
         {
+            if( File == null )
+            {
+                return;
+            }
+
+            var shapeMeshes = ShapeMesh.ConstructList( File, meshes );
             Shapes = new Dictionary< string, Shape >();
             for( int i = 0; i < File?.Shapes.Length; i++ )
             {
-                // We will need more info in the constructor here... eventually
-                var shape = new Shape( this, i );
-                Shapes[ shape.ShapeName ] = shape;
+                var shape = new Shape( this, Lod, shapeMeshes, i );
+                Shapes[ shape.Name ] = shape;
             }
         }
 
@@ -250,4 +255,4 @@ public Mesh[] GetMeshesByType( Mesh.MeshType mp )
             return Meshes.Where( m => m.Types.Contains( mp ) ).ToArray();
         }
     }
-}
+}

src/Lumina/Models/Models/Shape.cs

@@ -1,16 +1,54 @@
+using System.Collections.Generic;
+using System.Linq;
+using Lumina.Data.Files;
+
 namespace Lumina.Models.Models
 {
-    public class Shape
-    {
-        public string ShapeName { get; private set; }
+    public struct ShapeMesh {
+        public Mesh AssociatedMesh;
+
+        public ( ushort BaseIndicesIndex, ushort ReplacedVertexIndex )[] Values;
+
+        public static IReadOnlyList< ShapeMesh > ConstructList( MdlFile file, IReadOnlyList< Mesh > meshes )
+        {
+            var ret = new ShapeMesh[ file.ModelHeader.ShapeMeshCount ];
+            var idx = 0;
+
+            var meshDict = meshes.ToDictionary( m => file.Meshes[ m.MeshIndex ].StartIndex, m => m );
+
+            foreach( var shapeMeshStruct in file.ShapeMeshes ) {
+
+                if( !meshDict.TryGetValue( shapeMeshStruct.MeshIndexOffset, out var mesh ) ) continue;
+
+                var values = Enumerable
+                    .Range( (int)shapeMeshStruct.ShapeValueOffset, (int)shapeMeshStruct.ShapeValueCount )
+                    .Select( i => ( file.ShapeValues[ i ].BaseIndicesIndex, file.ShapeValues[ i ].ReplacingVertexIndex ) )
+                    .ToArray();
+
+                ret[ idx++ ] = new ShapeMesh {
+                    AssociatedMesh = mesh,
+                    Values = values,
+                };
+            }
+
+            return ret;
+        }
+    }
+
+    public class Shape {
+        public string Name { get; private set; }
+        public ShapeMesh[] Meshes { get; private set; }
 
-        public Shape(Model model, int shapeIndex)
+        public Shape( Model model, Model.ModelLod lod, IReadOnlyList< ShapeMesh > shapeMeshes, int shapeIndex )
         {
             var currentShape = model.File.Shapes[ shapeIndex ];
-            ShapeName = model.StringOffsetToStringMap[ (int) currentShape.StringOffset ];
-
-            // TODO: shape index modifier things
-            // someone else do this pls
+            Name   = model.StringOffsetToStringMap[ (int)currentShape.StringOffset ];
+            Meshes = new ShapeMesh[ currentShape.ShapeMeshCount[ (int)lod ] ];
+            var end    = currentShape.ShapeMeshCount[ (int)lod ];
+            var offset = currentShape.ShapeMeshStartIndex[ (int)lod ];
+            for( var i = 0; i < end; ++i ) {
+                Meshes[ i ] = shapeMeshes[ i + offset ];
+            }
         }
     }
-}
+}

src/Lumina/Models/Models/Submesh.cs

@@ -31,7 +31,7 @@ public Submesh( Model model, int meshIndex, int subMeshIndex )
             int subMeshListIndex = currentMesh.SubMeshIndex + subMeshIndex;
             var currentSubMesh = model.File.Submeshes[ subMeshListIndex ];
 
-            IndexOffset = currentSubMesh.IndexOffset;
+            IndexOffset = currentSubMesh.IndexOffset - currentMesh.StartIndex;
             IndexNum = currentSubMesh.IndexCount;
 
             // AttributeIndexMask is a bit-based index mask