From 4d051c0fa036d245027a211bc7fd6a4afdce207f Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Mon, 13 Sep 2021 11:29:46 -0300 Subject: ZRoom cleaning 3 (#140) * Remove redundant scene member * altheaders clean * it is broken and I don't know why * fix VTXs * Fix the stuff I broke in SetRoomList * Add RoomAltHeader and SceneAltHeader * fix syotes again and set the size of each ZRoomCommand * Add SCENE_CMD_UNK_09 todo * Nuke HintSystem * run format * Remove `canHaveInner` from ZRoom since the HintSystem doesn't exists anymore * Remove sourceOutput member from ZResource * Update docs * run format * Add non 64-bits aligned textures warning * remove unused json library * Update SCENE_CMD_UNK_09 * Fix merge issues * run format * Clean up actorlist output * Fix merge conflicts * format * Fix actorlist extraction * Unify AltHeader * fix merge conflicts * Run formatter * minor style changes * fix using wrong symbols for extracted vtxs from overlays * format * fix makefile stuff * fix merge issue --- ZAPD/ZRoom/Commands/SetMesh.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'ZAPD/ZRoom/Commands/SetMesh.cpp') diff --git a/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPD/ZRoom/Commands/SetMesh.cpp index d2c9337..b2f9268 100644 --- a/ZAPD/ZRoom/Commands/SetMesh.cpp +++ b/ZAPD/ZRoom/Commands/SetMesh.cpp @@ -59,7 +59,6 @@ void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList) StringHelper::Sprintf("%s%s", zRoom->GetName().c_str(), dList->GetName().c_str()); dList->SetName(srcVarName); - dList->scene = zRoom->scene; std::string sourceOutput = dList->GetSourceOutputCode(zRoom->GetName()); for (ZDisplayList* otherDList : dList->otherDLists) @@ -98,11 +97,6 @@ std::string SetMesh::GetBodySourceCode() const return StringHelper::Sprintf("SCENE_CMD_MESH(%s)", list.c_str()); } -size_t SetMesh::GetRawDataSize() const -{ - return ZRoomCommand::GetRawDataSize(); -} - std::string SetMesh::GetCommandCName() const { return "SCmdMesh"; @@ -654,9 +648,8 @@ void PolygonType2::DeclareReferences(const std::string& prefix) polyDlistType, polyDListName, polyDLists.size(), declaration); } - parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, - DeclarationPadding::Pad16, 4, "static s32", "terminatorMaybe", - "0x01000000"); + parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, 4, "static s32", + "terminatorMaybe", "0x01000000"); } std::string PolygonType2::GetBodySourceCode() const -- cgit v1.2.3