diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2021-11-30 20:09:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 20:09:32 -0500 |
| commit | a3363333d809e8089a55efc3ea32eaea9ddb8d8c (patch) | |
| tree | 5cf25cc7a7fb5eebd2a1671f0e54a8e3335ebbce /ZAPD/ZDisplayList.cpp | |
| parent | e3b53d3b8f88a0d139e72602c52666057e7066c0 (diff) | |
ZResource::GetSourceOutputCode no longer returns a string (#209)
* Updated nuget to use newer version of libpng. Also updated uses of std::filesystem::path to be compliant with MSVC implementation.
* Updated nuget to use newer version of libpng. Also updated uses of std::filesystem::path to be compliant with MSVC implementation.
* GetSourceOutputCode no longer uses strings, and some overrides were removed.
* Removed redundant GetSourceOutputHeader
* Fixed MSVC issue
* Changed libpng nuget package due to compilation issues. Other minor tweaks.
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
Diffstat (limited to 'ZAPD/ZDisplayList.cpp')
| -rw-r--r-- | ZAPD/ZDisplayList.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp index d2defb1..869b563 100644 --- a/ZAPD/ZDisplayList.cpp +++ b/ZAPD/ZDisplayList.cpp @@ -1524,11 +1524,6 @@ void ZDisplayList::Opcode_G_ENDDL([[maybe_unused]] const std::string& prefix, ch TextureGenCheck(); } -std::string ZDisplayList::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix) -{ - return ""; -} - static int32_t GfxdCallback_FormatSingleEntry() { ZDisplayList* self = static_cast<ZDisplayList*>(gfxd_udata_get()); @@ -1739,7 +1734,7 @@ static int32_t GfxdCallback_Matrix(uint32_t seg) return 1; } -std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) +void ZDisplayList::DeclareReferences(const std::string& prefix) { std::string sourceOutput; @@ -1752,7 +1747,7 @@ std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) if (vertices.size() > 0) { std::vector<std::pair<uint32_t, std::vector<ZVtx>>> verticesSorted(vertices.begin(), - vertices.end()); + vertices.end()); for (size_t i = 0; i < verticesSorted.size() - 1; i++) { @@ -1783,9 +1778,7 @@ std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) auto& firstVtx = item.second.at(0); for (auto vtx : item.second) - { declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str()); - } Declaration* decl = parent->AddDeclarationArray( curAddr, firstVtx.GetDeclarationAlignment(), @@ -1802,7 +1795,7 @@ std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) if (vertices.size() > 0) { std::vector<std::pair<uint32_t, std::vector<ZVtx>>> verticesSorted(vertices.begin(), - vertices.end()); + vertices.end()); for (size_t i = 0; i < verticesSorted.size() - 1; i++) { @@ -1865,11 +1858,6 @@ std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) } } } - - if (parent != nullptr) - return ""; - - return sourceOutput; } std::string ZDisplayList::ProcessLegacy(const std::string& prefix) |