Pull in what we have for Xande so far #67
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NotAdam
requested changes
Aug 29, 2023
src/Lumina/GameData.cs
Outdated
| @@ -206,6 +207,7 @@ public GameData( string dataPath, ILogger logger, LuminaOptions? options = null! | |||
|
|
|||
| var file = Activator.CreateInstance< T >(); | |||
| file.Data = fileContent; | |||
| if( origPath != null ) file.FilePath = ParseFilePath( origPath )!; | |||
src/Lumina/Models/Models/Model.cs
Outdated
| @@ -93,7 +93,7 @@ private void BuildModel() | |||
| ReadStrings(); | |||
| ReadMaterials(); | |||
| ReadMeshes(); | |||
| ReadShapes(); | |||
| ReadShapes(Meshes); | |||
src/Lumina/Models/Models/Model.cs
Outdated
| @@ -127,14 +127,19 @@ private void ReadMaterials() | |||
| } | |||
| } | |||
|
|
|||
| private void ReadShapes() | |||
| private void ReadShapes(IReadOnlyList<Mesh> meshes ) | |||
src/Lumina/Models/Models/Shape.cs
Outdated
| public string ShapeName { get; private set; } | ||
| public struct ShapeMesh { | ||
| public Mesh AssociatedMesh; | ||
| public (ushort BaseIndicesIndex, ushort ReplacedVertexIndex)[] Values; |
src/Lumina/Models/Models/Shape.cs
Outdated
| public static IReadOnlyList< ShapeMesh > ConstructList( MdlFile file, IReadOnlyList<Mesh> meshes ) | ||
| { | ||
| var ret = new ShapeMesh[file.ModelHeader.ShapeMeshCount]; | ||
| var idx = 0; |
src/Lumina/Models/Models/Shape.cs
Outdated
| 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]; |
| public ushort Offset; | ||
| public ushort Value; | ||
| public ushort BaseIndicesIndex; // PROBABLY: Index into the Indices array of a mesh. | ||
| public ushort ReplacingVertexIndex; // PROBABLY: Index into the (without transformation probably unused) vertex of a mesh. |
There was a problem hiding this comment.
there probs should be obsolete backing fields for this but i dont know if i care
| @@ -337,15 +337,15 @@ public static ShapeStruct Read( LuminaBinaryReader br ) | |||
|
|
|||
| public struct ShapeMeshStruct | |||
| { | |||
| public uint StartIndex; | |||
| public uint MeshIndexOffset; // 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. | |||
There was a problem hiding this comment.
add this as a doc comment not a normal comment
| public ushort Offset; | ||
| public ushort Value; | ||
| public ushort BaseIndicesIndex; // PROBABLY: Index into the Indices array of a mesh. | ||
| public ushort ReplacingVertexIndex; // PROBABLY: Index into the (without transformation probably unused) vertex of a mesh. |
src/Lumina/Models/Models/Shape.cs
Outdated
|
|
||
| public Shape(Model model, int shapeIndex) | ||
| public Shape(Model model, Model.ModelLod lod, IReadOnlyList<ShapeMesh> shapeMeshes, int shapeIndex) |
Exter-N
reviewed
Aug 30, 2023
| /// <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 |
There was a problem hiding this comment.
I don't know if that's a concern, but this breaks backwards compatibility by the way.
IIRC, creating Func<string, T> delegates out of this method won't work any more, also the code that depends on it will need a recompile.
NotAdam
approved these changes
Sep 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm being harassed by people in the Penumbra Discord to work on Xande again so that means this needs to be merged. Is it finished? Who knows!