ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 20:24:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix some unnecessary crashes on mtrl.

Browse source
This commit is contained in:
Ottermandias 2022-09-25 18:32:31 +02:00
parent b359c18360
commit 35c6e0ec88
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Penumbra.GameData/Files/MtrlFile.Write.cs
View file

@ -1,3 +1,4 @@
using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -46,14 +47,19 @@ public partial class MtrlFile
} }
w.Write( AdditionalData ); w.Write( AdditionalData );
foreach( var row in ColorSets.Select( c => c.Rows ) ) var dataSetSize = 0;
foreach( var row in ColorSets.Where( c => c.HasRows ).Select( c => c.Rows ) )
{ {
w.Write( row.AsBytes() ); var span = row.AsBytes();
w.Write( span );
dataSetSize += span.Length;
} }
foreach( var row in ColorDyeSets.Select( c => c.Rows ) ) foreach( var row in ColorDyeSets.Select( c => c.Rows ) )
{ {
w.Write( row.AsBytes() ); var span = row.AsBytes();
w.Write( span );
dataSetSize += span.Length;
} }
w.Write( ( ushort )( ShaderPackage.ShaderValues.Length * 4 ) ); w.Write( ( ushort )( ShaderPackage.ShaderValues.Length * 4 ) );
@ -88,19 +94,18 @@ public partial class MtrlFile
w.Write( value ); w.Write( value );
} }
WriteHeader( w, ( ushort )w.BaseStream.Position, cumulativeStringOffset ); WriteHeader( w, ( ushort )w.BaseStream.Position, dataSetSize, cumulativeStringOffset );
} }
return stream.ToArray(); return stream.ToArray();
} }
private void WriteHeader( BinaryWriter w, ushort fileSize, ushort shaderPackageNameOffset ) private void WriteHeader( BinaryWriter w, ushort fileSize, int dataSetSize, ushort shaderPackageNameOffset )
{ {
w.BaseStream.Seek( 0, SeekOrigin.Begin ); w.BaseStream.Seek( 0, SeekOrigin.Begin );
w.Write( Version ); w.Write( Version );
w.Write( fileSize ); w.Write( fileSize );
w.Write( ( ushort )( ColorSets.Length * ColorSet.RowArray.NumRows * ColorSet.Row.Size w.Write( ( ushort )dataSetSize );
+ ColorDyeSets.Length * ColorDyeSet.RowArray.NumRows * 2 ) );
w.Write( ( ushort )( shaderPackageNameOffset + ShaderPackage.Name.Length + 1 ) ); w.Write( ( ushort )( shaderPackageNameOffset + ShaderPackage.Name.Length + 1 ) );
w.Write( shaderPackageNameOffset ); w.Write( shaderPackageNameOffset );
w.Write( ( byte )Textures.Length ); w.Write( ( byte )Textures.Length );

11
Penumbra.GameData/Files/MtrlFile.cs
View file

@ -143,6 +143,7 @@ public partial class MtrlFile : IWritable
public RowArray Rows; public RowArray Rows;
public string Name; public string Name;
public ushort Index; public ushort Index;
public bool HasRows;
} }
public unsafe struct ColorDyeSet public unsafe struct ColorDyeSet
@ -305,7 +306,15 @@ public partial class MtrlFile : IWritable
AdditionalData = r.ReadBytes( additionalDataSize ); AdditionalData = r.ReadBytes( additionalDataSize );
for( var i = 0; i < ColorSets.Length; ++i ) for( var i = 0; i < ColorSets.Length; ++i )
{ {
ColorSets[ i ].Rows = r.ReadStructure< ColorSet.RowArray >(); if( stream.Position + ColorSet.RowArray.NumRows * ColorSet.Row.Size <= stream.Length )
{
ColorSets[ i ].Rows = r.ReadStructure< ColorSet.RowArray >();
ColorSets[ i ].HasRows = true;
}
else
{
ColorSets[i].HasRows = false;
}
} }
for( var i = 0; i < ColorDyeSets.Length; ++i ) for( var i = 0; i < ColorDyeSets.Length; ++i )

3
Penumbra/UI/Classes/ModEditWindow.FileEdit.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Numerics; using System.Numerics;
using Dalamud.Interface; using Dalamud.Interface;
using ImGuiNET; using ImGuiNET;
@ -259,7 +260,7 @@ public partial class ModEditWindow
private static bool DrawMaterialColorSetChange( MtrlFile file, bool disabled ) private static bool DrawMaterialColorSetChange( MtrlFile file, bool disabled )
{ {
if( file.ColorSets.Length == 0 ) if( !file.ColorSets.Any(c => c.HasRows ) )
{ {
return false; return false;
} }