Added support for reading BASIC models with normals = null

X-Hax · Apr 7, 2024 · 174f3ed · 174f3ed
1 parent e2c94c0
commit 174f3ed
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/src/SA3D.Modeling/Mesh/Basic/BasicAttach.cs b/src/SA3D.Modeling/Mesh/Basic/BasicAttach.cs
@@ -159,7 +159,7 @@ public static BasicAttach Read(EndianStackReader reader, uint address, bool DX,
 		{
 			BasicAttach onRead()
 			{
-				ILabeledArray<T> readArray<T>(uint arrayOffset, uint countOffset, string genPrefix, bool shortCount, uint elementSize, EndianIOExtensions.ReadValueDelegate<T> read)
+				ILabeledArray<T> readArray<T>(uint arrayOffset, uint countOffset, string genPrefix, bool shortCount, uint elementSize, EndianIOExtensions.ReadValueDelegate<T> read, bool allowNull = false, T? nullDefault = default)
 				{
 					uint itemCount = shortCount
 						? reader.ReadUShort(address + countOffset)
@@ -177,14 +177,31 @@ ILabeledArray<T> readArray<T>(uint arrayOffset, uint countOffset, string genPref
 						return new LabeledArray<T>(0);
 					}
 
+					/* Same thing for null arrays. Only happens to normals though, fortunately */
+
 					uint itemAddr = reader.ReadPointer(address + arrayOffset);
-					return reader.ReadLabeledArray(itemAddr, itemCount, elementSize, read, genPrefix, lut);
+					if(itemAddr == 0 && allowNull)
+					{
+						LabeledArray<T> result = new(itemCount);
+
+						for(int i = 0; i < itemCount; i++)
+						{
+							result[i] = nullDefault!;
+						}
+
+						return result;
+					}
+					else
+					{
+						return reader.ReadLabeledArray(itemAddr, itemCount, elementSize, read, genPrefix, lut);
+					}
+
 				}
 
 				uint meshSize = DX ? BasicMesh.StructSizeDX : BasicMesh.StructSize;
 
 				ILabeledArray<Vector3> positions /***/ = readArray(0x00, 0x08, "vertex_", false, 12, /*******************/ (r, p) => r.ReadVector3(p));
-				ILabeledArray<Vector3> normals /*****/ = readArray(0x04, 0x08, "normal_", false, 12, /*******************/ (r, p) => r.ReadVector3(p));
+				ILabeledArray<Vector3> normals /*****/ = readArray(0x04, 0x08, "normal_", false, 12, /*******************/ (r, p) => r.ReadVector3(p), true, BufferMesh.DefaultNormal);
 				ILabeledArray<BasicMesh> meshes /****/ = readArray(0x0C, 0x14, "meshlist_", true, meshSize, /************/ (r, p) => BasicMesh.Read(r, p, lut));
 				ILabeledArray<BasicMaterial> materials = readArray(0x10, 0x16, "matlist_", true, BasicMaterial.StructSize, (r, p) => BasicMaterial.Read(r, p));