ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-07-05 01:11:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted padding for BoundGeometry Materials array

Browse Source
This commit is contained in:
dexy 2020-03-15 02:25:09 +11:00
parent 38bb3ebb16
commit da62abefcf
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
CodeWalker.Core/GameFiles/Resources/Bounds.cs
View File

@ -1066,7 +1066,7 @@ namespace CodeWalker.GameFiles
this.Octants = reader.ReadBlockAt<BoundGeomOctants>(this.OctantsPointer, this.OctantItemsPointer);
this.Materials = reader.ReadStructsAt<BoundMaterial_s>(this.MaterialsPointer, this.MaterialsCount);
this.Materials = reader.ReadStructsAt<BoundMaterial_s>(this.MaterialsPointer, (this.MaterialsCount < 4) ? 4u : MaterialsCount);
this.MaterialColours = reader.ReadStructsAt<BoundMaterialColour>(this.MaterialColoursPointer, this.MaterialColoursCount);
@ -1074,6 +1074,27 @@ namespace CodeWalker.GameFiles
if ((MaterialsPointer != 0) && (MaterialsCount < 4))
{
//for (var i = MaterialsCount; i < 4; i++)
//{
// var m = Materials[i];
// if ((m.Data1 != 0) || (m.Data2 != 0))
// { }//no hit
//}
//the read array was padded, so remove the padding from this array. will re-add padding in BuildMaterials...
var mats = new BoundMaterial_s[MaterialsCount];
for (int i = 0; i < MaterialsCount; i++)
{
mats[i] = Materials[i];
}
Materials = mats;
}
//if (Vertices2Count != VerticesCount)
//{ }//no hit here
//if (Unknown_9Ch != 0)
@ -1114,7 +1135,7 @@ namespace CodeWalker.GameFiles
this.MaterialsPointer = (ulong)(this.MaterialsBlock != null ? this.MaterialsBlock.FilePosition : 0);
this.MaterialColoursPointer = (ulong)(this.MaterialColoursBlock != null ? this.MaterialColoursBlock.FilePosition : 0);
this.PolygonMaterialIndicesPointer = (ulong)(this.PolygonMaterialIndicesBlock != null ? this.PolygonMaterialIndicesBlock.FilePosition : 0);
this.MaterialsCount = (byte)(this.MaterialsBlock != null ? this.MaterialsBlock.ItemCount : 0);
//this.MaterialsCount = (byte)(this.MaterialsBlock != null ? this.MaterialsBlock.ItemCount : 0);//this is updated by BuildMaterials, and the array could include padding!
this.MaterialColoursCount = (byte)(this.MaterialColoursBlock != null ? this.MaterialColoursBlock.ItemCount : 0);
@ -1750,6 +1771,14 @@ namespace CodeWalker.GameFiles
}
}
MaterialsCount = (byte)matlist.Count;
//add padding to the array for writing
for (int i = matlist.Count; i < 4; i++)
{
matlist.Add(new BoundMaterial_s());
}
Materials = matlist.ToArray();
PolygonMaterialIndices = polymats.ToArray();
}