ZRoom refactor (#124)

* Remove redundant methods

* first pass os cleaning

* More cleaning

* Fix compilation errors

* Fix dumb crashes

* Fix dumb issues

* Removing most uses of GenerateSourceCodePass1

* more cleanup

* Move segmentOffset to ZRoomCommand

* Half of ParseRawData

* somehow broken...

* fix broken stuff

* This may or may not be broken

* More cleaning

* Remove GenerateSourceCodePass2

* More cleanup and pointer removal

* Use PolygonType2 in SetMesh

* another small cleanup

* Merge PolygonDlist and PolygonDlist2

* More code merging

* GetDeclarationPtrName

* Remove most repeated externs and a bit of redundant code

* Dumb MM fixes

* small fix

(cherry picked from commit 0813fd69538491c5aceb00d79d19bf59fd082ca7)

* Another dumb fix

* Remove GenerateExterns

* Change DeclareReferences signature

* Refactor SetAnimatedTextureList

* const std::vector<uint8_t>&

* another small bunch of changes

* last parserawdata and declarereferences separation probably

* Move parserawdata

* Remove GenerateSourceCodePass1

* Use macros for commands

* Make ZRoomCommand inherit  ZResource

* shrink scenes tluts

* ProcessTextureIntersections

* small output improvements

* Small changes

* run format

* SCENE_CMD -> SCENECMD

* fix merge errors

* run format

* fix some warnings

* update macros names

* Add again different commands for each game ni SCENE_CMD_ROOM_BEHAVIOR

* macro update

* More booleans

* Move declaration to its own file

* minor changes

* Update according to latest reviews in oot

* run format

* Yet another cutscene change

* Remove special scene/room segment code

* This is crashing and I don't know why

* remove includeFilePrefix

* fix merge issues

* always pass a parent to zresource

* move path to its own zclass and properly implement parserawdata in commands

* Fix GetDeclarationPtrName uses

* Some ZPath fixes (still broken tho)

* Fix ZPath declarations

* Fix weird problem

* Add `Path` to the docs

* run format

* clean syotes code

* A bunch of changes for MM

* run format

1 files changed, 45 insertions, 46 deletions

diff --git a/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
index 2c97902..4ba73a2 100644
--- a/ZAPD/ZRoom/Commands/SetEntranceList.cpp
+++ b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
@@ -1,70 +1,64 @@
 #include "SetEntranceList.h"
-#include "../../BitConverter.h"
-#include "../../StringHelper.h"
-#include "../../ZFile.h"
-#include "../ZRoom.h"
+#include "BitConverter.h"
 #include "SetStartPositionList.h"
+#include "StringHelper.h"
+#include "ZFile.h"
+#include "ZRoom/ZRoom.h"
 
-SetEntranceList::SetEntranceList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex)
-	: ZRoomCommand(nZRoom, rawData, rawDataIndex)
+SetEntranceList::SetEntranceList(ZFile* nParent) : ZRoomCommand(nParent)
 {
-	segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF;
-	entrances = std::vector<EntranceEntry*>();
-
-	_rawData = rawData;
-	_rawDataIndex = rawDataIndex;
 }
 
-SetEntranceList::~SetEntranceList()
+void SetEntranceList::DeclareReferences(const std::string& prefix)
 {
-	for (EntranceEntry* entry : entrances)
-		delete entry;
+	if (segmentOffset != 0)
+		parent->AddDeclarationPlaceholder(segmentOffset);
 }
 
-std::string SetEntranceList::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress)
+void SetEntranceList::ParseRawDataLate()
 {
-	std::string sourceOutput =
-		StringHelper::Sprintf("%s 0x00, (u32)&%sEntranceList0x%06X",
-	                          ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(),
-	                          zRoom->GetName().c_str(), segmentOffset);
-
 	// Parse Entrances and Generate Declaration
-	zRoom->parent->AddDeclarationPlaceholder(segmentOffset);  // Make sure this segment is defined
-	int32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2;
+	int numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2;
 	uint32_t currentPtr = segmentOffset;
 
 	for (int32_t i = 0; i < numEntrances; i++)
 	{
-		EntranceEntry* entry = new EntranceEntry(_rawData, currentPtr);
+		EntranceEntry entry(parent->GetRawData(), currentPtr);
 		entrances.push_back(entry);
 
 		currentPtr += 2;
 	}
+}
 
-	std::string declaration = "";
-
-	int32_t index = 0;
-
-	for (EntranceEntry* entry : entrances)
+void SetEntranceList::DeclareReferencesLate(const std::string& prefix)
+{
+	if (!entrances.empty())
 	{
-		declaration +=
-			StringHelper::Sprintf("    { 0x%02X, 0x%02X }, //0x%06X \n", entry->startPositionIndex,
-		                          entry->roomToLoad, segmentOffset + (index * 2));
-		index++;
+		std::string declaration = "";
+
+		size_t index = 0;
+		for (const auto& entry : entrances)
+		{
+			declaration +=
+				StringHelper::Sprintf("    { %s }, //0x%06X", entry.GetBodySourceCode().c_str(),
+			                          segmentOffset + (index * 2));
+			if (index + 1 < entrances.size())
+				declaration += "\n";
+
+			index++;
+		}
+
+		parent->AddDeclarationArray(
+			segmentOffset, DeclarationAlignment::None, entrances.size() * 2, "EntranceEntry",
+			StringHelper::Sprintf("%sEntranceList0x%06X", zRoom->GetName().c_str(), segmentOffset),
+			entrances.size(), declaration);
 	}
-
-	zRoom->parent->AddDeclarationArray(
-		segmentOffset, DeclarationAlignment::None, entrances.size() * 2, "EntranceEntry",
-		StringHelper::Sprintf("%sEntranceList0x%06X", zRoom->GetName().c_str(), segmentOffset),
-		entrances.size(), declaration);
-
-	return sourceOutput;
 }
 
-std::string SetEntranceList::GenerateExterns() const
+std::string SetEntranceList::GetBodySourceCode() const
 {
-	return StringHelper::Sprintf("extern EntranceEntry %sEntranceList0x%06X[];\n",
-	                             zRoom->GetName().c_str(), segmentOffset);
+	std::string listName = parent->GetDeclarationPtrName(cmdArg2);
+	return StringHelper::Sprintf("SCENE_CMD_ENTRANCE_LIST(%s)", listName.c_str());
 }
 
 std::string SetEntranceList::GetCommandCName() const
@@ -77,8 +71,13 @@ RoomCommand SetEntranceList::GetRoomCommand() const
 	return RoomCommand::SetEntranceList;
 }
 
-EntranceEntry::EntranceEntry(std::vector<uint8_t> rawData, uint32_t rawDataIndex)
+EntranceEntry::EntranceEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex)
+{
+	startPositionIndex = rawData.at(rawDataIndex + 0);
+	roomToLoad = rawData.at(rawDataIndex + 1);
+}
+
+std::string EntranceEntry::GetBodySourceCode() const
 {
-	startPositionIndex = rawData[rawDataIndex + 0];
-	roomToLoad = rawData[rawDataIndex + 1];
-}
\ No newline at end of file
+	return StringHelper::Sprintf("0x%02X, 0x%02X", startPositionIndex, roomToLoad);
+}