diff --git a/src/Companion.cpp b/src/Companion.cpp index 8c4476d..a896eb3 100644 --- a/src/Companion.cpp +++ b/src/Companion.cpp @@ -28,6 +28,7 @@ #include "factories/Vec3fFactory.h" #include "factories/Vec3sFactory.h" #include "factories/AssetArrayFactory.h" +#include "factories/ViewportFactory.h" #include "factories/sm64/AnimationFactory.h" #include "factories/sm64/BehaviorScriptFactory.h" @@ -95,6 +96,7 @@ void Companion::Init(const ExportType type) { this->RegisterFactory("VEC3S", std::make_shared()); this->RegisterFactory("ARRAY", std::make_shared()); this->RegisterFactory("ASSET_ARRAY", std::make_shared()); + this->RegisterFactory("VP", std::make_shared()); // SM64 specific this->RegisterFactory("SM64:DIALOG", std::make_shared()); diff --git a/src/factories/DisplayListFactory.cpp b/src/factories/DisplayListFactory.cpp index 8aaae73..f88b07e 100644 --- a/src/factories/DisplayListFactory.cpp +++ b/src/factories/DisplayListFactory.cpp @@ -127,6 +127,7 @@ ExportResult DListCodeExporter::Export(std::ostream &write, std::shared_ptrGetNodeByAddr(ptr); + + if(dec.has_value()){ + auto node = std::get<1>(dec.value()); + auto symbol = GetSafeNode(node, "symbol"); + SPDLOG_INFO("Found Viewport: 0x{:X} Symbol: {}", ptr, symbol); + gfxd_puts(("&" + symbol).c_str()); + return 1; + } + + SPDLOG_WARN("Could not find viewport 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); diff --git a/src/factories/DisplayListOverrides.h b/src/factories/DisplayListOverrides.h index 5b938c1..5597449 100644 --- a/src/factories/DisplayListOverrides.h +++ b/src/factories/DisplayListOverrides.h @@ -45,6 +45,7 @@ int Palette(uint32_t tlut, int32_t idx, int32_t count); int Lights(uint32_t lightsn, int32_t count); int Light(uint32_t light); int DisplayList(uint32_t dl); +int Viewport(uint32_t vp); void RegisterVTXOverlap(uint32_t ptr, std::tuple& vtx); std::optional> GetVtxOverlap(uint32_t ptr); void ClearVtx(); diff --git a/src/factories/ResourceType.h b/src/factories/ResourceType.h index 46f8de6..7039dbc 100644 --- a/src/factories/ResourceType.h +++ b/src/factories/ResourceType.h @@ -23,6 +23,7 @@ enum class ResourceType { Vec3s = 0x56433353, // VC3S GenericArray = 0x47415252, // GARR AssetArray = 0x41415252, // AARR + Viewport = 0x4F565054, // OVPT // SM64 Anim = 0x414E494D, // ANIM diff --git a/src/factories/ViewportFactory.cpp b/src/factories/ViewportFactory.cpp new file mode 100644 index 0000000..beed8b8 --- /dev/null +++ b/src/factories/ViewportFactory.cpp @@ -0,0 +1,84 @@ +#include "ViewportFactory.h" + +#include "utils/Decompressor.h" +#include "spdlog/spdlog.h" +#include "Companion.h" + +ExportResult ViewportHeaderExporter::Export(std::ostream &write, std::shared_ptr raw, std::string& entryName, YAML::Node &node, std::string* replacement) { + const auto symbol = GetSafeNode(node, "symbol", entryName); + + if(Companion::Instance->IsOTRMode()){ + write << "static const ALIGN_ASSET(2) char " << symbol << "[] = \"__OTR__" << (*replacement) << "\";\n\n"; + return std::nullopt; + } + + write << "extern Vp " << symbol << ";\n"; + + return std::nullopt; +} + +ExportResult ViewportCodeExporter::Export(std::ostream &write, std::shared_ptr raw, std::string& entryName, YAML::Node &node, std::string* replacement ) { + const auto symbol = GetSafeNode(node, "symbol", entryName); + const auto offset = GetSafeNode(node, "offset"); + auto viewport = std::static_pointer_cast(raw); + + write << "Vp " << symbol << " = {\n"; + + write << fourSpaceTab; + for (size_t i = 0; i < 4; i++) { + write << viewport->mViewport.vscale[i]; + if (i != 3) { + write << ", "; + } + } + write << ",\n"; + + write << fourSpaceTab; + for (size_t i = 0; i < 4; i++) { + write << viewport->mViewport.vtrans[i]; + if (i != 3) { + write << ", "; + } + } + write << ",\n"; + + write << "};\n\n"; + + return offset + sizeof(VpRaw); +} + +ExportResult ViewportBinaryExporter::Export(std::ostream &write, std::shared_ptr raw, std::string& entryName, YAML::Node &node, std::string* replacement ) { + auto writer = LUS::BinaryWriter(); + auto viewport = std::static_pointer_cast(raw); + + WriteHeader(writer, Torch::ResourceType::Viewport, 0); + + for (size_t i = 0; i < 4; i++) { + writer.Write(viewport->mViewport.vscale[i]); + } + + for (size_t i = 0; i < 4; i++) { + writer.Write(viewport->mViewport.vtrans[i]); + } + + writer.Finish(write); + return std::nullopt; +} + +std::optional> ViewportFactory::parse(std::vector& buffer, YAML::Node& node) { + auto [_, segment] = Decompressor::AutoDecode(node, buffer); + LUS::BinaryReader reader(segment.data, segment.size); + VpRaw viewport; + + reader.SetEndianness(Torch::Endianness::Big); + + for (size_t i = 0; i < 4; i++) { + viewport.vscale[i] = reader.ReadInt16(); + } + + for (size_t i = 0; i < 4; i++) { + viewport.vtrans[i] = reader.ReadInt16(); + } + + return std::make_shared(viewport); +} diff --git a/src/factories/ViewportFactory.h b/src/factories/ViewportFactory.h new file mode 100644 index 0000000..39d512f --- /dev/null +++ b/src/factories/ViewportFactory.h @@ -0,0 +1,39 @@ +#pragma once + +#include "BaseFactory.h" + +typedef struct { + int16_t vscale[4]; /* scale */ + int16_t vtrans[4]; /* translate */ +} VpRaw; + +class VpData : public IParsedData { +public: + VpRaw mViewport; + + VpData(VpRaw viewport) : mViewport(std::move(viewport)) {} +}; + +class ViewportHeaderExporter : public BaseExporter { + ExportResult Export(std::ostream& write, std::shared_ptr data, std::string& entryName, YAML::Node& node, std::string* replacement) override; +}; + +class ViewportBinaryExporter : public BaseExporter { + ExportResult Export(std::ostream& write, std::shared_ptr data, std::string& entryName, YAML::Node& node, std::string* replacement) override; +}; + +class ViewportCodeExporter : public BaseExporter { + ExportResult Export(std::ostream& write, std::shared_ptr data, std::string& entryName, YAML::Node& node, std::string* replacement) override; +}; + +class ViewportFactory : public BaseFactory { +public: + std::optional> parse(std::vector& buffer, YAML::Node& data) override; + inline std::unordered_map> GetExporters() override { + return { + REGISTER(Code, ViewportCodeExporter) + REGISTER(Header, ViewportHeaderExporter) + REGISTER(Binary, ViewportBinaryExporter) + }; + } +};