falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clang-format

This commit is contained in:
Pistonight 2024-08-07 23:00:47 -07:00
parent 62f972da86
commit 3ff5c64f9d
4 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/KingSystem/System/UI/ArcResourceMgr.h
View File

@ -9,6 +9,7 @@ class ArcResourceMgr {
public: public:
ArcResourceMgr() = default; ArcResourceMgr() = default;
virtual ~ArcResourceMgr(); virtual ~ArcResourceMgr();
private: private:
// TODO: fields // TODO: fields
/* sead::TList */ /* sead::TList */
@ -18,4 +19,4 @@ private:
}; };
KSYS_CHECK_SIZE_NX150(ArcResourceMgr, 0x20); KSYS_CHECK_SIZE_NX150(ArcResourceMgr, 0x20);
} } // namespace ksys::ui

48
src/KingSystem/System/UI/LayoutResourceMgr.cpp
View File

@ -17,14 +17,14 @@ void LayoutResourceMgr::init(sead::Heap* heap) {
int count; int count;
// value() needed because operator int() is volatile // value() needed because operator int() is volatile
switch (sead::EnvUtil::getRegionLanguage().value()) { switch (sead::EnvUtil::getRegionLanguage().value()) {
case sead::RegionLanguageID::KRko: case sead::RegionLanguageID::KRko:
case sead::RegionLanguageID::CNzh: case sead::RegionLanguageID::CNzh:
case sead::RegionLanguageID::TWzh: case sead::RegionLanguageID::TWzh:
count = 4; count = 4;
break; break;
default: default:
count = 0; count = 0;
break; break;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
mExtraLangFontHandles.pushBack(new (heap) res::Handle); mExtraLangFontHandles.pushBack(new (heap) res::Handle);
@ -50,9 +50,8 @@ u8* LayoutResourceMgr::loadMsgPack(u32* size) {
path.format("Message/Msg_%s.product.sarc", sead::EnvUtil::getRegionLanguage().text()); path.format("Message/Msg_%s.product.sarc", sead::EnvUtil::getRegionLanguage().text());
res::Handle::Status status; res::Handle::Status status;
auto* resource = sead::DynamicCast<sead::DirectResource>( auto* resource =
mMsgPackHandle->load(path, &req, &status) sead::DynamicCast<sead::DirectResource>(mMsgPackHandle->load(path, &req, &status));
);
*size = resource->getRawSize(); *size = resource->getRawSize();
return resource->getRawData(); return resource->getRawData();
@ -77,19 +76,8 @@ void LayoutResourceMgr::loadLangFont(sead::Heap* heap) {
} }
constexpr const char* cExtraFontFiles[12] = { constexpr const char* cExtraFontFiles[12] = {
"AsiaKCUBE-R", "AsiaKCUBE-R", "AsiaKDREAM2R", "AsiaKDREAM4R", "AsiaKDREAM7R", "DFP_GBZY9", "DFP_GB_H3",
"AsiaKDREAM2R", "DFP_GB_H5", "DFHEI5A", "DFT_ZY9", "DFT_B3", "DFT_B5", "DFT_B9"};
"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) { void LayoutResourceMgr::loadExtraLangFonts(sead::Heap* heap) {
sead::RegionLanguageID lang_id = sead::EnvUtil::getRegionLanguage(); sead::RegionLanguageID lang_id = sead::EnvUtil::getRegionLanguage();
@ -133,12 +121,12 @@ bool LayoutResourceMgr::checkLangFontReady() {
bool LayoutResourceMgr::checkExtraLangFontsReady() const { bool LayoutResourceMgr::checkExtraLangFontsReady() const {
switch (sead::EnvUtil::getRegionLanguage().value()) { switch (sead::EnvUtil::getRegionLanguage().value()) {
case sead::RegionLanguageID::KRko: case sead::RegionLanguageID::KRko:
case sead::RegionLanguageID::CNzh: case sead::RegionLanguageID::CNzh:
case sead::RegionLanguageID::TWzh: case sead::RegionLanguageID::TWzh:
break; break;
default: default:
return true; return true;
} }
for (const auto& handle : mExtraLangFontHandles) { for (const auto& handle : mExtraLangFontHandles) {
if (!handle.isReady()) { if (!handle.isReady()) {

11
src/KingSystem/System/UI/LayoutResourceMgr.h
View File

@ -1,21 +1,19 @@
#pragma once #pragma once
#include <container/seadObjArray.h>
#include <heap/seadDisposer.h> #include <heap/seadDisposer.h>
#include <prim/seadSafeString.h> #include <prim/seadSafeString.h>
#include <thread/seadCriticalSection.h> #include <thread/seadCriticalSection.h>
#include <container/seadObjArray.h>
#include "KingSystem/Resource/resHandle.h" #include "KingSystem/Resource/resHandle.h"
#include "KingSystem/Utils/Types.h" #include "KingSystem/Utils/Types.h"
#include "ArcResourceMgr.h" #include "ArcResourceMgr.h"
namespace nn::pl { namespace nn::pl {
enum SharedFontType : int { enum SharedFontType : int { Unknown = 0 };
Unknown = 0
};
u64 RequestSharedFontLoad(nn::pl::SharedFontType type); u64 RequestSharedFontLoad(nn::pl::SharedFontType type);
u32 GetSharedFontLoadState(nn::pl::SharedFontType type); u32 GetSharedFontLoadState(nn::pl::SharedFontType type);
} } // namespace nn::pl
namespace ksys::ui { namespace ksys::ui {
@ -25,7 +23,6 @@ class LayoutResourceMgr {
virtual ~LayoutResourceMgr(); virtual ~LayoutResourceMgr();
public: public:
void init(sead::Heap* heap); void init(sead::Heap* heap);
u8* loadMsgPack(u32* size); u8* loadMsgPack(u32* size);
void loadLangFont(sead::Heap* heap); void loadLangFont(sead::Heap* heap);
@ -58,4 +55,4 @@ private:
}; };
KSYS_CHECK_SIZE_NX150(LayoutResourceMgr, 0x168); KSYS_CHECK_SIZE_NX150(LayoutResourceMgr, 0x168);
} } // namespace ksys::ui