From f00d8219b75c3cb3966c3836a8cab8dcad03864a Mon Sep 17 00:00:00 2001 From: ud2 Date: Tue, 17 Jun 2025 18:55:08 +0800 Subject: [PATCH 1/2] g3d: Add `ResFile::GetTextureIndex` --- include/g3d/aglNW4FToNN.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/g3d/aglNW4FToNN.h b/include/g3d/aglNW4FToNN.h index 3c52c62..b69a425 100644 --- a/include/g3d/aglNW4FToNN.h +++ b/include/g3d/aglNW4FToNN.h @@ -1,14 +1,19 @@ #pragma once +#include + namespace nn::g3d { class ResFile; -} // namespace nn::g3d +} namespace agl::g3d { + class ResFile { public: static void Setup(nn::g3d::ResFile*); - static void BindTexture(nn::g3d::ResFile*, nn::g3d::ResFile*); static void Cleanup(nn::g3d::ResFile*); + static s32 GetTextureIndex(const nn::g3d::ResFile*, const char*); + static void BindTexture(nn::g3d::ResFile*, const nn::g3d::ResFile*); }; + } // namespace agl::g3d From f7b2a7d0cff85410bbea208cbc231d113a0e9431 Mon Sep 17 00:00:00 2001 From: ud2 Date: Wed, 18 Jun 2025 02:47:10 +0800 Subject: [PATCH 2/2] change `BindTexture` return type --- include/g3d/aglNW4FToNN.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/g3d/aglNW4FToNN.h b/include/g3d/aglNW4FToNN.h index b69a425..a11fbbb 100644 --- a/include/g3d/aglNW4FToNN.h +++ b/include/g3d/aglNW4FToNN.h @@ -13,7 +13,7 @@ class ResFile { static void Setup(nn::g3d::ResFile*); static void Cleanup(nn::g3d::ResFile*); static s32 GetTextureIndex(const nn::g3d::ResFile*, const char*); - static void BindTexture(nn::g3d::ResFile*, const nn::g3d::ResFile*); + static bool BindTexture(nn::g3d::ResFile*, const nn::g3d::ResFile*); }; } // namespace agl::g3d