From 5d4bd639dfdffcf26edb458485beee1b81b92531 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Sat, 9 Mar 2024 23:12:39 -0600 Subject: Refactored vtx overlap function --- src/factories/DisplayListOverrides.cpp | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'src/factories/DisplayListOverrides.cpp') diff --git a/src/factories/DisplayListOverrides.cpp b/src/factories/DisplayListOverrides.cpp index 52a832d..32c9b5c 100644 --- a/src/factories/DisplayListOverrides.cpp +++ b/src/factories/DisplayListOverrides.cpp @@ -10,6 +10,8 @@ namespace GFXDOverride { +std::unordered_map> mVtxOverlaps; + void Triangle2(const Gfx* gfx) { auto w0 = gfx->words.w0; auto w1 = gfx->words.w1; @@ -47,6 +49,25 @@ void Quadrangle(const Gfx* gfx) { } int Vtx(uint32_t ptr, int32_t num) { + auto vtx = GetVtxOverlap(ptr); + + if(vtx.has_value()){ + auto symbol = std::get<0>(vtx.value()); + auto node = std::get<1>(vtx.value()); + + auto offset = GetSafeNode(node, "offset"); + auto count = GetSafeNode(node, "count"); + auto idx = (ptr - offset) / sizeof(Vtx_t); + + SPDLOG_INFO("Replaced Vtx Overlapped: 0x{:X} Symbol: {}", ptr, symbol); + gfxd_puts("&"); + gfxd_puts(symbol.c_str()); + gfxd_puts("["); + gfxd_puts(std::to_string(idx).c_str()); + gfxd_puts("]"); + return 1; + } + auto dec = Companion::Instance->GetNodeByAddr(ptr); if(dec.has_value()){ @@ -120,4 +141,24 @@ int DisplayList(uint32_t ptr) { SPDLOG_WARN("Could not find display list to override at 0x{:X}", ptr); return 0; } + +std::optional> GetVtxOverlap(uint32_t ptr){ + if(mVtxOverlaps.contains(ptr)){ + SPDLOG_INFO("Found overlap for ptr 0x{:X}", ptr); + return mVtxOverlaps[ptr]; + } + + SPDLOG_INFO("Failed to find overlap for ptr 0x{:X}", ptr); + + return std::nullopt; +} + +void RegisterVTXOverlap(uint32_t ptr, std::tuple& vtx){ + mVtxOverlaps[ptr] = vtx; + SPDLOG_INFO("Register overlap for ptr 0x{:X}", ptr); +} + +void ClearVtx(){ + mVtxOverlaps.clear(); +} } -- cgit v1.2.3