Polychunks now get added to offset luts

Author: Justin113D

src/SA3D.Modeling/Mesh/Chunk/ChunkMesh.cs

@@ -182,15 +182,15 @@ public override bool CanWrite(Format format)
 		public override void Read(BinaryObjectReader reader, IOContext context)
 		{
 			VertexChunks = reader.ReadLUTItemAtOffset(reader.ReadOffsetValue(), context.PointerLUT, VertexChunksLabelPrefix, VertexChunk.ReadArray);
-			PolyChunks = reader.ReadLUTItemAtOffset(reader.ReadOffsetValue(), context.PointerLUT, PolyChunksLabelPrefix, PolyChunk.ReadArray);
+			PolyChunks = reader.ReadLUTItemAtOffset(reader.ReadOffsetValue(), context.PointerLUT, PolyChunksLabelPrefix, (r) => PolyChunk.ReadArray(r, context.PointerLUT));
 			MeshBounds = reader.ReadObject<Bounds>();
 		}
 
 		/// <inheritdoc/>
 		public override void Write(BinaryObjectWriter writer, IOContext context)
 		{
 			writer.WriteObjectOffset(VertexChunks.EmptyNull(), VertexChunk.WriteArray, context.PointerLUT);
-			writer.WriteObjectOffset(PolyChunks.EmptyNull(), PolyChunk.WriteArray, context.PointerLUT);
+			writer.WriteObjectOffset(PolyChunks.EmptyNull(), (w, v) => PolyChunk.WriteArray(w, v, context.PointerLUT), context.PointerLUT);
 			writer.WriteObject(MeshBounds);
 		}
 

src/SA3D.Modeling/Mesh/Chunk/PolyChunk.cs

@@ -1,4 +1,5 @@
-using Amicitia.IO.Binary;
+using Amicitia.IO;
+using Amicitia.IO.Binary;
 using Amicitia.IO.Streams;
 using J113D.Json;
 using SA3D.Common;
@@ -181,7 +182,7 @@ public virtual void Read(BinaryObjectReader reader)
 			Attributes = (byte)(header >> 8);
 		}
 
-		internal static LabeledArray<PolyChunk> ReadArray(BinaryObjectReader reader)
+		internal static LabeledArray<PolyChunk> ReadArray(BinaryObjectReader reader, PointerLUT lut)
 		{
 			PolyChunkType peekType()
 			{
@@ -194,6 +195,7 @@ PolyChunkType peekType()
 			while(true)
 			{
 				PolyChunk chunk;
+				long offset = reader.ReadOffsetValue();
 				switch(peekType())
 				{
 					case PolyChunkType.BlendAlpha:
@@ -265,6 +267,7 @@ PolyChunkType peekType()
 				}
 
 				chunks.Add(chunk);
+				lut.PolyChunks.Add(offset, chunk);
 			}
 
 			End:
@@ -282,10 +285,19 @@ public virtual void Write(BinaryObjectWriter writer)
 			writer.WriteUInt16((ushort)((byte)Type | (Attributes << 8)));
 		}
 
-		internal static void WriteArray(BinaryObjectWriter writer, IEnumerable<PolyChunk> chunks)
+		internal static void WriteArray(BinaryObjectWriter writer, IEnumerable<PolyChunk> chunks, PointerLUT lut)
 		{
 			long start = writer.Position;
-			writer.WriteObjectArray(chunks);
+
+			foreach(PolyChunk chunk in chunks)
+			{
+				long offset = chunk.AlignWithFour
+					? AlignmentHelper.Align(writer.Position, 4)
+					: writer.Position;
+
+				writer.WriteObject(chunk);
+				lut.PolyChunks.Add(offset, chunk);
+			}
 
 			// End chunk
 			writer.WriteUInt16((ushort)PolyChunkType.End);