diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-20 10:17:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 05:17:39 -0400 |
| commit | 4751db5c9ee0a25a26379ca5b44efad72215d256 (patch) | |
| tree | ce49e6e23e352c93424343f75b2e10601457a9c3 /ZAPD/ZRoom/Commands/SetPathways.cpp | |
| parent | 963a282dc10036f367a2cb09bb5651aefc73d2a4 (diff) | |
Add a clang-format config and reformat all source files (#63)
* build: Add genbuildinfo as a dependency for ZAPD object files
* Add a clang-format config and reformat all source files
The existing code style is mostly preserved; this just makes formatting
more consistent and prevents lines from getting too long.
* Fix missing includes
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetPathways.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetPathways.cpp | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/ZAPD/ZRoom/Commands/SetPathways.cpp b/ZAPD/ZRoom/Commands/SetPathways.cpp index a920e19..9d70e27 100644 --- a/ZAPD/ZRoom/Commands/SetPathways.cpp +++ b/ZAPD/ZRoom/Commands/SetPathways.cpp @@ -1,12 +1,13 @@ #include "SetPathways.h" -#include "../ZRoom.h" -#include "../../ZFile.h" #include "../../BitConverter.h" #include "../../StringHelper.h" +#include "../../ZFile.h" +#include "../ZRoom.h" using namespace std; -SetPathways::SetPathways(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetPathways::SetPathways(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) + : ZRoomCommand(nZRoom, rawData, rawDataIndex) { _rawData = rawData; _rawDataIndex = rawDataIndex; @@ -40,7 +41,7 @@ string SetPathways::GetSourceOutputCode(std::string prefix) string SetPathways::GenerateSourceCodePass1(string roomName, int baseAddress) { - //int numPathsReal = zRoom->GetDeclarationSizeFromNeighbor(listSegmentOffset) / 6; + // int numPathsReal = zRoom->GetDeclarationSizeFromNeighbor(listSegmentOffset) / 6; uint32_t currentPtr = listSegmentOffset; uint8_t* data = _rawData.data(); @@ -57,7 +58,7 @@ string SetPathways::GenerateSourceCodePass1(string roomName, int baseAddress) currentPtr += 6; } - if (numPoints == 0) // Hack for SharpOcarina + if (numPoints == 0) // Hack for SharpOcarina { for (int i = 0; i < 3; i++) { @@ -69,17 +70,21 @@ string SetPathways::GenerateSourceCodePass1(string roomName, int baseAddress) return ""; } - string SetPathways::GenerateSourceCodePass2(string roomName, int baseAddress) { string sourceOutput = ""; - sourceOutput += StringHelper::Sprintf("%s 0, (u32)&%sPathway0x%06X };", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), roomName.c_str(), segmentOffset); + sourceOutput += + StringHelper::Sprintf("%s 0, (u32)&%sPathway0x%06X };", + ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), + roomName.c_str(), segmentOffset); { - string declaration = StringHelper::Sprintf("%i, (u32)%sPathwayList0x%06X", numPoints, roomName.c_str(), listSegmentOffset); - - zRoom->parent->AddDeclaration(segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, 8, "Path", + string declaration = StringHelper::Sprintf("%i, (u32)%sPathwayList0x%06X", numPoints, + roomName.c_str(), listSegmentOffset); + + zRoom->parent->AddDeclaration( + segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, 8, "Path", StringHelper::Sprintf("%sPathway0x%06X", roomName.c_str(), segmentOffset), declaration); } @@ -89,16 +94,20 @@ string SetPathways::GenerateSourceCodePass2(string roomName, int baseAddress) size_t index = 0; for (PathwayEntry* entry : pathways) { - declaration += StringHelper::Sprintf(" { %i, %i, %i }, //0x%06X", entry->x, entry->y, entry->z, listSegmentOffset + (index * 6)); + declaration += StringHelper::Sprintf(" { %i, %i, %i }, //0x%06X", entry->x, entry->y, + entry->z, listSegmentOffset + (index * 6)); if (index < pathways.size() - 1) declaration += "\n"; - + index++; } - zRoom->parent->AddDeclarationArray(listSegmentOffset, DeclarationAlignment::None, DeclarationPadding::None, pathways.size() * 6, - "Vec3s", StringHelper::Sprintf("%sPathwayList0x%06X", roomName.c_str(), listSegmentOffset), pathways.size(), declaration); + zRoom->parent->AddDeclarationArray( + listSegmentOffset, DeclarationAlignment::None, DeclarationPadding::None, + pathways.size() * 6, "Vec3s", + StringHelper::Sprintf("%sPathwayList0x%06X", roomName.c_str(), listSegmentOffset), + pathways.size(), declaration); } return sourceOutput; @@ -111,7 +120,8 @@ int32_t SetPathways::GetRawDataSize() string SetPathways::GenerateExterns() { - return StringHelper::Sprintf("extern Vec3s %sPathwayList0x%06X[];\n", zRoom->GetName().c_str(), segmentOffset); + return StringHelper::Sprintf("extern Vec3s %sPathwayList0x%06X[];\n", zRoom->GetName().c_str(), + segmentOffset); } string SetPathways::GetCommandCName() |
