LayoutResourceMgr functions + update NintendoSDK.

This commit is contained in:
Pistonight 2024-08-07 18:28:23 -07:00
parent 0f88ba6f00
commit c4e0a55dd9
12 changed files with 536 additions and 43 deletions

View File

@ -4,8 +4,11 @@ jobs:
clang-format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: DoozyX/clang-format-lint-action@v0.12
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- uses: DoozyX/clang-format-lint-action@v0.18
with:
source: 'src'
exclude: 'lib'

View File

@ -1,6 +1,6 @@
0x0000007101e9fe68,_ZN4sead8Matrix34IfE5identE
0x0000007101e9ff18,_ZN4sead7Vector3IfE4zeroE
0x0000007101e9ff48,_ZN4sead7Vector3IfE4onesE
0x0000007101E9FE68,_ZN4sead8Matrix34IfE5identE
0x0000007101E9FF18,_ZN4sead7Vector3IfE4zeroE
0x0000007101E9FF48,_ZN4sead7Vector3IfE4onesE
0x00000071023556B0,_ZTVN4sead14SafeStringBaseIcEE
0x0000007102356AF0,_ZTVN4sead22BufferedSafeStringBaseIcEE
0x000000710246F9E0,_ZN4ksys3gdt6detail13sCommonFlags0E
@ -20,6 +20,9 @@
0x00000071024C1600,_ZTVN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEEE
0x00000071024C16A0,_ZTVN3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEEE
0x00000071024C1740,_ZTVN3agl3utl9ParameterIN4sead14SafeStringBaseIcEEEE
0x00000071024C6600,_ZN6xlink216ContainerCreator17sContainerSizeMaxE
0x00000071024C68A8,_ZN6xlink215sMinAddressHighE
0x00000071024C68B0,_ZN6xlink214sMinAddressLowE
0x00000071024D8D58,_ZTVN4ksys3act2ai10ActionBaseE
0x00000071025129E0,_ZTVN4ksys3act2ai6ActionE
0x0000007102513268,_ZTVN4ksys3act2ai2AiE
@ -500,17 +503,15 @@
0x00000071025F8480,pfnc_nvnEventSignal
0x00000071025F8488,pfnc_nvnCommandBufferWaitEvent
0x00000071025F8490,pfnc_nvnCommandBufferSignalEvent
0x0000007102606910,_ZN4ksys12SystemTimers9sInstanceE
0x0000007102650608,_ZN4ksys3act11BaseProcMgr9sInstanceE
0x00000071025F9CB0,_ZN3agl6driver17GraphicsDriverMgr18SingletonDisposer_15sStaticDisposerE
0x00000071025F9CB8,_ZN3agl6driver17GraphicsDriverMgr9sInstanceE
0x00000071024c6600,_ZN6xlink216ContainerCreator17sContainerSizeMaxE
0x00000071024c68a8,_ZN6xlink215sMinAddressHighE
0x00000071024c68b0,_ZN6xlink214sMinAddressLowE
0x00000071025fb508,_ZN3aal6System9sInstanceE
0x00000071025fc7f0,_ZN6xlink211SystemSLink9sInstanceE
0x00000071025fc7f8,_ZN6xlink211SystemSLink10sLockProxyE
0x00000071025fc878,_ZZNK6xlink214ResourceBuffer18getEmptyUserHeaderEvE6sDummy
0x00000071025fc8b0,_ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy
0x00000071025fc948,_ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy
0x00000071025fc950,_ZN6xlink27Locator16sDataLoadedCountE
0x00000071025FB508,_ZN3aal6System9sInstanceE
0x00000071025FC7F0,_ZN6xlink211SystemSLink9sInstanceE
0x00000071025FC7F8,_ZN6xlink211SystemSLink10sLockProxyE
0x00000071025FC878,_ZZNK6xlink214ResourceBuffer18getEmptyUserHeaderEvE6sDummy
0x00000071025FC8B0,_ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy
0x00000071025FC948,_ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy
0x00000071025FC950,_ZN6xlink27Locator16sDataLoadedCountE
0x0000007102606910,_ZN4ksys12SystemTimers9sInstanceE
0x000000710261EB90,_ZN4ksys2ui17LayoutResourceMgr9sInstanceE
0x0000007102650608,_ZN4ksys3act11BaseProcMgr9sInstanceE

1 0x0000007101e9fe68 0x0000007101E9FE68 _ZN4sead8Matrix34IfE5identE
2 0x0000007101e9ff18 0x0000007101E9FF18 _ZN4sead7Vector3IfE4zeroE
3 0x0000007101e9ff48 0x0000007101E9FF48 _ZN4sead7Vector3IfE4onesE
4 0x00000071023556B0 0x00000071023556B0 _ZTVN4sead14SafeStringBaseIcEE
5 0x0000007102356AF0 0x0000007102356AF0 _ZTVN4sead22BufferedSafeStringBaseIcEE
6 0x000000710246F9E0 0x000000710246F9E0 _ZN4ksys3gdt6detail13sCommonFlags0E
20 0x00000071024C1600 0x00000071024C1600 _ZTVN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEEE
21 0x00000071024C16A0 0x00000071024C16A0 _ZTVN3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEEE
22 0x00000071024C1740 0x00000071024C1740 _ZTVN3agl3utl9ParameterIN4sead14SafeStringBaseIcEEEE
23 0x00000071024C6600 _ZN6xlink216ContainerCreator17sContainerSizeMaxE
24 0x00000071024C68A8 _ZN6xlink215sMinAddressHighE
25 0x00000071024C68B0 _ZN6xlink214sMinAddressLowE
26 0x00000071024D8D58 0x00000071024D8D58 _ZTVN4ksys3act2ai10ActionBaseE
27 0x00000071025129E0 0x00000071025129E0 _ZTVN4ksys3act2ai6ActionE
28 0x0000007102513268 0x0000007102513268 _ZTVN4ksys3act2ai2AiE
503 0x00000071025F8480 0x00000071025F8480 pfnc_nvnEventSignal
504 0x00000071025F8488 0x00000071025F8488 pfnc_nvnCommandBufferWaitEvent
505 0x00000071025F8490 0x00000071025F8490 pfnc_nvnCommandBufferSignalEvent
0x0000007102606910 _ZN4ksys12SystemTimers9sInstanceE
0x0000007102650608 _ZN4ksys3act11BaseProcMgr9sInstanceE
506 0x00000071025F9CB0 0x00000071025F9CB0 _ZN3agl6driver17GraphicsDriverMgr18SingletonDisposer_15sStaticDisposerE
507 0x00000071025F9CB8 0x00000071025F9CB8 _ZN3agl6driver17GraphicsDriverMgr9sInstanceE
508 0x00000071024c6600 0x00000071025FB508 _ZN6xlink216ContainerCreator17sContainerSizeMaxE _ZN3aal6System9sInstanceE
509 0x00000071024c68a8 0x00000071025FC7F0 _ZN6xlink215sMinAddressHighE _ZN6xlink211SystemSLink9sInstanceE
510 0x00000071024c68b0 0x00000071025FC7F8 _ZN6xlink214sMinAddressLowE _ZN6xlink211SystemSLink10sLockProxyE
511 0x00000071025fb508 0x00000071025FC878 _ZN3aal6System9sInstanceE _ZZNK6xlink214ResourceBuffer18getEmptyUserHeaderEvE6sDummy
512 0x00000071025fc7f0 0x00000071025FC8B0 _ZN6xlink211SystemSLink9sInstanceE _ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy
513 0x00000071025fc7f8 0x00000071025FC948 _ZN6xlink211SystemSLink10sLockProxyE _ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy
514 0x00000071025fc878 0x00000071025FC950 _ZZNK6xlink214ResourceBuffer18getEmptyUserHeaderEvE6sDummy _ZN6xlink27Locator16sDataLoadedCountE
515 0x00000071025fc8b0 0x0000007102606910 _ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy _ZN4ksys12SystemTimers9sInstanceE
516 0x00000071025fc948 0x000000710261EB90 _ZZNK6xlink214ResourceBuffer24getEmptyRomResourceParamEvE6sDummy _ZN4ksys2ui17LayoutResourceMgr9sInstanceE
517 0x00000071025fc950 0x0000007102650608 _ZN6xlink27Locator16sDataLoadedCountE _ZN4ksys3act11BaseProcMgr9sInstanceE

View File

@ -81790,7 +81790,7 @@ Address,Quality,Size,Name
0x0000007100f3a528,U,000016,
0x0000007100f3a538,U,000756,ui::init
0x0000007100f3a82c,U,000172,createRegionLanguageMgr
0x0000007100f3a8d8,U,002276,ksys::PreInitializeApp
0x0000007100f3a8d8,W,002276,_ZN4ksys16preInitializeAppERKNS_10InitParamsE
0x0000007100f3b1bc,U,000132,checkPreInitializeResourcesStillLoading
0x0000007100f3b240,U,007612,ksys::InitializeApp
0x0000007100f3cffc,O,000388,_ZN4ksys15initBaseProcMgrEPN4sead4HeapE
@ -88328,31 +88328,31 @@ Address,Quality,Size,Name
0x00000071010a2294,U,000008,
0x00000071010a229c,U,000040,
0x00000071010a22c4,U,000372,
0x00000071010a2438,U,000112,
0x00000071010a24a8,U,000120,
0x00000071010a2520,U,000284,LayoutResourceMgr::createInstance
0x00000071010a263c,U,000268,LayoutResourceMgr::init
0x00000071010a2748,U,000424,LayoutResourceMgr::loadMsgPack
0x00000071010a28f0,U,000384,LayoutResourceMgr::__auto2
0x00000071010a2a70,U,000260,LayoutResourceMgr::loadLangFont
0x00000071010a2b74,U,000388,LayoutResourceMgr::__auto0
0x00000071010a2cf8,U,000680,LayoutResourceMgr::loadFonts
0x00000071010a2fa0,U,000188,LayoutResourceMgr::ready
0x00000071010a305c,U,000136,LayoutResourceMgr::ready_0
0x00000071010a30e4,U,000136,LayoutResourceMgr::loadVersion
0x00000071010a316c,U,000372,LayoutResourceMgr::ready_1
0x00000071010a32e0,U,001584,
0x00000071010a2438,O,000112,_ZN4ksys2ui17LayoutResourceMgr18SingletonDisposer_D1Ev
0x00000071010a24a8,O,000120,_ZN4ksys2ui17LayoutResourceMgr18SingletonDisposer_D0Ev
0x00000071010a2520,O,000284,_ZN4ksys2ui17LayoutResourceMgr14createInstanceEPN4sead4HeapE
0x00000071010a263c,O,000268,_ZN4ksys2ui17LayoutResourceMgr4initEPN4sead4HeapE
0x00000071010a2748,O,000424,_ZN4ksys2ui17LayoutResourceMgr11loadMsgPackEPj
0x00000071010a28f0,U,000384,LayoutResourceMgr::loadGrammarArticleMaxLen
0x00000071010a2a70,O,000260,_ZN4ksys2ui17LayoutResourceMgr12loadLangFontEPN4sead4HeapE
0x00000071010a2b74,U,000388,LayoutResourceMgr::initializeFontMgr
0x00000071010a2cf8,O,000680,_ZN4ksys2ui17LayoutResourceMgr18loadExtraLangFontsEPN4sead4HeapE
0x00000071010a2fa0,O,000188,_ZN4ksys2ui17LayoutResourceMgr18checkLangFontReadyEv
0x00000071010a305c,O,000136,_ZNK4ksys2ui17LayoutResourceMgr24checkExtraLangFontsReadyEv
0x00000071010a30e4,O,000136,_ZN4ksys2ui17LayoutResourceMgr11loadVersionEv
0x00000071010a316c,O,000372,_ZN4ksys2ui17LayoutResourceMgr17checkVersionReadyEv
0x00000071010a32e0,U,001584,LayoutResourceMgr::doSomethingWithFontTextureCache
0x00000071010a3910,W,000064,_ZN4sead12PerfJobQueue13measureEndRunEv
0x00000071010a3950,U,000072,LayoutResourceMgr::loadLayoutCommonArchive
0x00000071010a3998,U,000288,LayoutResourceMgr::loadArcResource
0x00000071010a3ab8,U,000104,
0x00000071010a3b20,U,000208,
0x00000071010a3bf0,U,000016,
0x00000071010a3c00,U,000104,
0x00000071010a3c68,U,000264,LayoutResourceMgr::x
0x00000071010a3d70,U,000076,
0x00000071010a3dbc,U,000068,
0x00000071010a3e00,U,000168,
0x00000071010a3950,O,000072,_ZN4ksys2ui17LayoutResourceMgr23loadCommonLayoutArchiveEPN4sead7ExpHeapE
0x00000071010a3998,O,000288,_ZN4ksys2ui17LayoutResourceMgr15loadArcResourceERNS1_7ArchiveEPKc
0x00000071010a3ab8,O,000104,_ZN4ksys2ui17LayoutResourceMgr8unloadA8Ev
0x00000071010a3b20,O,000208,_ZN4ksys2ui17LayoutResourceMgr15loadTitleLayoutEPN4sead4HeapE
0x00000071010a3bf0,O,000016,_ZN4ksys2ui17LayoutResourceMgr23loadTitleLayoutResourceEv
0x00000071010a3c00,O,000104,_ZN4ksys2ui17LayoutResourceMgr17unloadTitleLayoutEv
0x00000071010a3c68,O,000264,_ZN4ksys2ui17LayoutResourceMgr15loadHorseLayoutEPN4sead4HeapE
0x00000071010a3d70,O,000076,_ZN4ksys2ui17LayoutResourceMgr23loadHorseLayoutResourceEv
0x00000071010a3dbc,O,000068,_ZNK4ksys2ui17LayoutResourceMgr25hasHorseLayoutLoadFailureEv
0x00000071010a3e00,O,000168,_ZN4ksys2ui17LayoutResourceMgr17unloadHorseLayoutEv
0x00000071010a3ea8,U,000104,ScreenLoadSaveIcon::ctor
0x00000071010a3f10,U,000044,
0x00000071010a3f3c,U,000048,

Can't render this file because it is too large.

@ -1 +1 @@
Subproject commit a7a1e2b715cbafbbe50264a6157da8388a390776
Subproject commit cc73cdf466e31794669757352a434d240f79c9f4

View File

@ -1,4 +1,9 @@
target_sources(uking PRIVATE
UI/ArcResource.h
UI/ArcResourceMgr.h
UI/LayoutResourceMgr.cpp
UI/LayoutResourceMgr.h
Account.cpp
Account.h
AutoDim.cpp

View File

@ -0,0 +1,33 @@
#pragma once
#include <heap/seadDisposer.h>
#include <prim/seadSafeString.h>
#include "KingSystem/Utils/Types.h"
namespace ksys {
namespace res {
class Handle;
}
namespace ui {
class ArcResourceMgr;
class ArcResource : public sead::IDisposer {
public:
ArcResource() = default;
void init(ArcResourceMgr* mgr, const sead::SafeString& name, u8* data, res::Handle* handle);
private:
void* _20;
void* _28;
ArcResourceMgr* mArcResourceMgr;
sead::FixedSafeString<0x40> mName;
u8* mData;
void* mFile;
res::Handle* mHandle;
};
KSYS_CHECK_SIZE_NX150(ArcResource, 0xA8);
} // namespace ui
} // namespace ksys

View File

@ -0,0 +1,34 @@
#pragma once
#include <container/seadTList.h>
#include <prim/seadSafeString.h>
#include "KingSystem/System/UI/ArcResource.h"
#include "KingSystem/Utils/Types.h"
namespace sead {
class ExpHeap;
}
namespace ksys::ui {
class ArcResourceMgr {
public:
ArcResourceMgr() = default;
virtual ~ArcResourceMgr();
virtual void sub_10();
virtual void loadArchive(sead::Heap* heap, const sead::SafeString& path);
virtual void sub_20();
virtual void sub_28();
virtual void addArchive(ArcResource* archive);
private:
// TODO: fields
/* sead::TList */
char list[0x10];
int _18 = 0;
int _1c = 0x20;
};
KSYS_CHECK_SIZE_NX150(ArcResourceMgr, 0x20);
} // namespace ksys::ui

View File

@ -0,0 +1,268 @@
#include <devenv/seadEnvUtil.h>
#include <nn/pl.h>
#include <prim/seadScopedLock.h>
#include "KingSystem/Resource/resLoadRequest.h"
#include "KingSystem/System/StarterPackMgr.h"
#include "KingSystem/System/UI/ArcResource.h"
#include "KingSystem/System/UI/LayoutResourceMgr.h"
namespace ksys::ui {
SEAD_SINGLETON_DISPOSER_IMPL(LayoutResourceMgr)
void LayoutResourceMgr::init(sead::Heap* heap) {
mMsgPackHandle = new (heap) res::Handle;
mLangFontHandle = new (heap) res::Handle;
mVersionHandle = new (heap) res::Handle;
int count;
switch (sead::EnvUtil::getRegionLanguage().value()) {
case sead::RegionLanguageID::KRko:
case sead::RegionLanguageID::CNzh:
case sead::RegionLanguageID::TWzh:
count = cExtraLangFontCount;
break;
default:
count = 0;
break;
}
for (int i = 0; i < count; i++) {
mExtraLangFontHandles.pushBack(new (heap) res::Handle);
}
if (count > 0) {
mZeldaGlyphHandle = new (heap) res::Handle;
}
}
u8* LayoutResourceMgr::loadMsgPack(u32* size) {
mMsgPackHandle->resetUnitFlag20000IfSuccess();
mMsgPackHandle->unload();
res::LoadRequest req;
req.mRequester = "LayoutResourceMgr";
req._22 = true;
req._21 = true;
req.mLoadDataAlignment = 0x80;
req._26 = false;
req.mPackHandle = StarterPackMgr::instance()->getBootupLangPack();
sead::FixedSafeString<0x20> path;
path.format("Message/Msg_%s.product.sarc", sead::EnvUtil::getRegionLanguage().text());
res::Handle::Status status;
auto* resource =
sead::DynamicCast<sead::DirectResource>(mMsgPackHandle->load(path, &req, &status));
*size = resource->getRawSize();
return resource->getRawData();
}
void LayoutResourceMgr::loadLangFont(sead::Heap* heap) {
mLangFontHandle->resetUnitFlag20000IfSuccess();
mLangFontHandle->unload();
mLangFontResource = nullptr;
res::LoadRequest req;
req.mRequester = "LayoutResourceMgr";
req._22 = true;
req.mLoadDataAlignment = 0x1000;
req._26 = false;
sead::FixedSafeString<0x20> path;
path.format("Font/Font_%s.bfarc", sead::EnvUtil::getRegion().text());
mLangFontHandle->requestLoad(path, &req, nullptr);
}
constexpr const char* sExtraLangFontFiles[LayoutResourceMgr::cExtraLangCount *
LayoutResourceMgr::cExtraLangFontCount] = {
"AsiaKCUBE-R", "AsiaKDREAM2R", "AsiaKDREAM4R", "AsiaKDREAM7R", "DFP_GBZY9", "DFP_GB_H3",
"DFP_GB_H5", "DFHEI5A", "DFT_ZY9", "DFT_B3", "DFT_B5", "DFT_B9"};
void LayoutResourceMgr::loadExtraLangFonts(sead::Heap* heap) {
sead::RegionLanguageID lang_id = sead::EnvUtil::getRegionLanguage();
auto* fonts = sExtraLangFontFiles;
for (int i = 0; i <= cExtraLangCount; i++) {
if (lang_id.value() == sead::RegionLanguageID::KRko + i) {
break;
}
if (i == cExtraLangCount - 1) {
return;
}
fonts += cExtraLangFontCount;
}
res::LoadRequest req;
req.mRequester = "ui::LayoutResourceMgr";
req._26 = false;
res::Handle::Status status = res::Handle::Status::NoFile;
for (int i = 0; i < cExtraLangFontCount; ++i) {
auto* handle = mExtraLangFontHandles[i];
sead::FixedSafeString<0x20> path;
#ifdef MATCHING_HACK_NX_CLANG
asm("");
#endif
path.format("Font/%s.bfttf", fonts[i]);
handle->requestLoad(path, &req, &status);
}
mZeldaGlyphHandle->requestLoad("Font/ZeldaGlyphs-v2-Deco.bfotf", &req, &status);
nn::pl::RequestSharedFontLoad(nn::pl::SharedFontType::STANDARD);
}
bool LayoutResourceMgr::checkLangFontReady() {
if (mLangFontResource) {
return true;
}
if (!mLangFontHandle->isReady()) {
return false;
}
mLangFontResource = sead::DynamicCast<sead::DirectResource>(mLangFontHandle->getResource());
return true;
}
bool LayoutResourceMgr::checkExtraLangFontsReady() const {
switch (sead::EnvUtil::getRegionLanguage().value()) {
case sead::RegionLanguageID::KRko:
case sead::RegionLanguageID::CNzh:
case sead::RegionLanguageID::TWzh:
break;
default:
return true;
}
for (const auto& handle : mExtraLangFontHandles) {
if (!handle.isReady()) {
return false;
}
}
if (!mZeldaGlyphHandle || mZeldaGlyphHandle->isReady()) {
return nn::pl::GetSharedFontLoadState(nn::pl::SharedFontType::STANDARD) ==
nn::pl::LoadState::LOADED;
}
return false;
}
void LayoutResourceMgr::loadVersion() {
res::LoadRequest req;
req.mRequester = "LayoutResourceMgr";
req._26 = false;
mVersionHandle->requestLoad("System/Version.txt", &req, nullptr);
}
bool LayoutResourceMgr::checkVersionReady() {
if (!mVersionHandle) {
return true;
}
if (mVersionHandle->isReady()) {
auto* resource = sead::DynamicCast<sead::DirectResource>(mVersionHandle->getResource());
instance()->mVersionString.copy(reinterpret_cast<const char*>(resource->getRawData()),
static_cast<s32>(resource->getRawSize()));
delete mVersionHandle;
mVersionHandle = nullptr;
return true;
}
return false;
}
void LayoutResourceMgr::loadCommonLayoutArchive(sead::ExpHeap* heap) {
mArcResourceMgr->loadArchive(heap, "Layout/Common.sblarc");
}
void LayoutResourceMgr::loadTitleLayout(sead::Heap* heap) {
mTitleLayout.allocate(heap);
res::LoadRequest req;
req.mRequester = "ui::LayoutResourceMgr";
req.mLoadDataAlignment = 0x1000;
req._22 = false;
req._26 = false;
req._c = 2;
res::Handle::Status status = res::Handle::Status::NoFile;
mTitleLayout.getHandle()->requestLoad("Layout/Title.blarc", &req, &status);
}
bool LayoutResourceMgr::loadTitleLayoutResource() {
return loadArcResource(mTitleLayout, "Title");
}
void LayoutResourceMgr::unloadTitleLayout() {
mTitleLayout.deallocate();
}
bool LayoutResourceMgr::loadHorseLayout(sead::Heap* heap) {
const auto lock = sead::makeScopedLock(mCriticalSection);
if (mHorseLayoutLoadCount++) {
return false;
}
mHorseLayout.allocate(heap);
res::LoadRequest req;
req.mRequester = "ui::LayoutResourceMgr";
req.mLoadDataAlignment = 0x1000;
req._22 = false;
req._26 = true;
req._c = 2;
res::Handle::Status status = res::Handle::Status::NoFile;
mHorseLayout.getHandle()->requestLoad("Layout/Horse.blarc", &req, &status);
return true;
}
bool LayoutResourceMgr::loadHorseLayoutResource() {
const auto lock = sead::makeScopedLock(mCriticalSection);
return loadArcResource(mHorseLayout, "Horse");
}
bool LayoutResourceMgr::hasHorseLayoutLoadFailure() const {
if (mHorseLayout.getHandle()) {
if (mHorseLayout.getHandle()->isReady() && !mHorseLayout.getHandle()->isSuccess()) {
return true;
}
}
return false;
}
bool LayoutResourceMgr::unloadHorseLayout() {
const auto lock = sead::makeScopedLock(mCriticalSection);
int old_count = mHorseLayoutLoadCount--;
if (mHorseLayoutLoadCount == 0) {
mHorseLayout.deallocate();
return true;
}
return old_count < 2;
}
bool LayoutResourceMgr::loadArcResource(Archive& archive, const char* name) {
if (archive.getResource()) {
return true;
}
if (!archive.getHandle()->isReady()) {
return false;
}
if (archive.getHandle()->isSuccess()) {
auto* resource =
sead::DynamicCast<sead::DirectResource>(archive.getHandle()->getResource());
if (resource) {
auto* arc_resource = reinterpret_cast<ArcResource*>(archive.mResourceStorage);
arc_resource->init(mArcResourceMgr, name, resource->getRawData(), archive.mHandle);
archive.mResource = arc_resource;
mArcResourceMgr->addArchive(archive.getResource());
}
}
return true;
}
void LayoutResourceMgr::unloadA8() {
_a8.deallocate();
}
} // namespace ksys::ui

View File

@ -0,0 +1,97 @@
#pragma once
#include <container/seadObjArray.h>
#include <heap/seadDisposer.h>
#include <hostio/seadHostIONode.h>
#include <prim/seadSafeString.h>
#include <thread/seadCriticalSection.h>
#include "KingSystem/Resource/resHandle.h"
#include "KingSystem/System/UI/ArcResource.h"
#include "KingSystem/System/UI/ArcResourceMgr.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::ui {
class LayoutResourceMgr final : public sead::hostio::Node {
SEAD_SINGLETON_DISPOSER(LayoutResourceMgr)
LayoutResourceMgr() = default;
~LayoutResourceMgr() = default;
public:
static constexpr int cExtraLangFontCount = 4;
static constexpr int cExtraLangCount = 3;
private:
class Archive {
friend class LayoutResourceMgr;
public:
void allocate(sead::Heap* heap) {
mHandle = new (heap) res::Handle;
mResourceStorage = new (heap) u8[sizeof(ArcResource)];
}
void deallocate() {
if (mResource) {
delete mResource;
mResource = nullptr;
} else {
delete mHandle;
delete[] mResourceStorage;
}
mHandle = nullptr;
mResourceStorage = nullptr;
}
res::Handle* getHandle() { return mHandle; }
const res::Handle* getHandle() const { return mHandle; }
ArcResource* getResource() { return mResource; }
const ArcResource* getResource() const { return mResource; }
private:
res::Handle* mHandle = nullptr;
ArcResource* mResource = nullptr;
u8* mResourceStorage = nullptr;
};
public:
void init(sead::Heap* heap);
u8* loadMsgPack(u32* size);
void loadLangFont(sead::Heap* heap);
void loadExtraLangFonts(sead::Heap* heap);
bool checkLangFontReady();
bool checkExtraLangFontsReady() const;
void loadVersion();
bool checkVersionReady();
void loadCommonLayoutArchive(sead::ExpHeap* heap);
void loadTitleLayout(sead::Heap* heap);
bool loadTitleLayoutResource();
void unloadTitleLayout();
bool loadHorseLayout(sead::Heap* heap);
bool loadHorseLayoutResource();
bool hasHorseLayoutLoadFailure() const;
bool unloadHorseLayout();
void unloadA8();
void doSomethingWithFontTextureCache(void* texture_cache);
bool loadArcResource(Archive& archive, const char* name);
private:
res::Handle* mMsgPackHandle = nullptr;
res::Handle* mLangFontHandle = nullptr;
res::Handle* mVersionHandle = nullptr;
sead::FixedPtrArray<res::Handle, 8> mExtraLangFontHandles;
res::Handle* mZeldaGlyphHandle = nullptr;
ArcResourceMgr* mArcResourceMgr = nullptr;
sead::DirectResource* mLangFontResource = nullptr;
Archive _a8;
Archive mTitleLayout;
Archive mHorseLayout;
u16 mMaxDefArtLen = 0;
u16 mMaxIndefArtLen = 0;
sead::FixedSafeString<16> mVersionString;
int mHorseLayoutLoadCount = 0;
sead::CriticalSection mCriticalSection;
};
KSYS_CHECK_SIZE_NX150(LayoutResourceMgr, 0x168);
} // namespace ksys::ui

View File

@ -4,7 +4,9 @@
#include "KingSystem/ActorSystem/actBaseProcCreateTaskSelector.h"
#include "KingSystem/ActorSystem/actBaseProcInitializer.h"
#include "KingSystem/ActorSystem/actBaseProcMgr.h"
#include "KingSystem/System/BasicProfiler.h"
#include "KingSystem/System/HavokWorkerMgr.h"
#include "KingSystem/System/UI/LayoutResourceMgr.h"
namespace ksys {
@ -29,4 +31,21 @@ void initBaseProcMgr(sead::Heap* heap) {
act::BaseProcMgr::sConstant4 = u32(act::JobType::Calc4);
}
void preInitializeApp(const InitParams& params) {
ksys::BasicProfiler::Scope profiler_scope("ksys::PreInitializeApp");
// TODO - other parts
{
ksys::BasicProfiler::Scope profiler_scope("RequestFontLoad");
// TODO: FontMgr::createInstance()
ui::LayoutResourceMgr::createInstance(params.king_sys_heap);
ui::LayoutResourceMgr::instance()->init(params.king_sys_heap);
ui::LayoutResourceMgr::instance()->loadLangFont(params.king_sys_heap);
ui::LayoutResourceMgr::instance()->loadExtraLangFonts(params.king_sys_heap);
}
// TODO - other parts
}
} // namespace ksys

View File

@ -6,6 +6,10 @@ class Heap;
namespace ksys {
struct InitParams {
sead::Heap* king_sys_heap;
};
// 0x0000007100f3a4e4
bool isGameOver();
// 0x0000007100f3a4f0
@ -13,4 +17,7 @@ void setIsGameOver(bool is_game_over);
void initBaseProcMgr(sead::Heap* heap);
// 0x0000007100f3a8d8
void preInitializeApp(const InitParams& params);
} // namespace ksys

View File

@ -0,0 +1,26 @@
import os
import csv
DATA_SYMBOLS = os.path.join(os.path.dirname(__file__), '../data/data_symbols.csv')
if __name__ == "__main__":
addr2symbol = {}
with open(DATA_SYMBOLS, "r", encoding="utf-8") as f:
reader = csv.reader(f)
# doesn't come with header
for row in reader:
if not row: # skip empty
continue
addr = int(row[0].strip(), 16)
name = ""
if len(row) > 1:
name = row[1].strip()
addr2symbol[addr] = name
with open(DATA_SYMBOLS, "w", encoding="utf-8") as f:
writer = csv.writer(f, lineterminator="\n")
for hex in sorted(addr2symbol):
writer.writerow([f"0x{hex:016X}", addr2symbol[hex]])
print("data_symbols.csv updated")