From f54f2fa96bfc476a15fcc3ebcd6124bc19164fcd Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Thu, 2 Jun 2022 13:20:36 -0400 Subject: Extract palette data from external file (#249) * WIP * Done * Fix * Fixes * More fixes * Fixes for backgrounds. * Roman's fixes and format. * Update docs and use tinyxml function for validation. * Update docs/zapd_extraction_xml_reference.md Co-authored-by: EllipticEllipsis * move tlut texture data to stack variable Co-authored-by: EllipticEllipsis --- ZAPD/ZCollision.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ZAPD/ZCollision.cpp') diff --git a/ZAPD/ZCollision.cpp b/ZAPD/ZCollision.cpp index 992332d..debf037 100644 --- a/ZAPD/ZCollision.cpp +++ b/ZAPD/ZCollision.cpp @@ -61,7 +61,7 @@ void ZCollisionHeader::ParseRawData() currentPtr += vec.GetRawDataSize(); vertices.push_back(vec); } - + for (uint16_t i = 0; i < numPolygons; i++) { ZCollisionPoly poly(parent); @@ -158,9 +158,10 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix) declaration += "\n"; } - parent->AddDeclarationArray( - polySegmentOffset, DeclarationAlignment::Align4, polygons.size() * 16, polygons[0].GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sPolygons", auxName.c_str()), polygons.size(), declaration); + parent->AddDeclarationArray(polySegmentOffset, DeclarationAlignment::Align4, + polygons.size() * 16, polygons[0].GetSourceTypeName().c_str(), + StringHelper::Sprintf("%sPolygons", auxName.c_str()), + polygons.size(), declaration); } declaration.clear(); -- cgit v1.2.3