AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Refactor ResId into CAssetId

Browse Source
This commit is contained in:
Phillip Stephens
2017-08-12 22:26:14 -07:00
parent e0efcc0e5c
commit 870e8c80ee
176 changed files with 800 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Runtime/Character/CCharacterInfo.hpp
View File

@@ -15,18 +15,18 @@ class CCharacterInfo
public:
struct CParticleResData
{
std::vector<ResId> x0_part;
std::vector<ResId> x10_swhc;
std::vector<ResId> x20_elsc;
std::vector<ResId> x30_elsc;
std::vector<CAssetId> x0_part;
std::vector<CAssetId> x10_swhc;
std::vector<CAssetId> x20_elsc;
std::vector<CAssetId> x30_elsc;
CParticleResData(CInputStream& in, u16 tableCount);
};
private:
u16 x0_tableCount;
std::string x4_name;
ResId x14_cmdl;
ResId x18_cskr;
ResId x1c_cinf;
CAssetId x14_cmdl;
CAssetId x18_cskr;
CAssetId x1c_cinf;
std::vector<std::pair<u32, std::pair<std::string, std::string>>> x20_animInfo;
CPASDatabase x30_pasDatabase;
CParticleResData x44_partRes;
@@ -34,8 +34,8 @@ private:
std::vector<std::pair<std::string, zeus::CAABox>> x88_aabbs;
std::vector<std::pair<std::string, std::vector<CEffectComponent>>> x98_effects;
ResId xa8_cmdlOverlay = 0;
ResId xac_cskrOverlay = 0;
CAssetId xa8_cmdlOverlay = 0;
CAssetId xac_cskrOverlay = 0;
std::vector<u32> xb0_animIdxs;
@@ -43,14 +43,14 @@ public:
CCharacterInfo(CInputStream& in);
const std::string& GetCharacterName() const { return x4_name; }
ResId GetModelId() const {return x14_cmdl;}
ResId GetSkinRulesId() const {return x18_cskr;}
ResId GetCharLayoutInfoId() const {return x1c_cinf;}
CAssetId GetModelId() const {return x14_cmdl;}
CAssetId GetSkinRulesId() const {return x18_cskr;}
CAssetId GetCharLayoutInfoId() const {return x1c_cinf;}
const std::vector<std::pair<std::string, zeus::CAABox>>& GetAnimBBoxList() const { return x88_aabbs; }
ResId GetIceModelId() const {return xa8_cmdlOverlay;}
ResId GetIceSkinRulesId() const {return xac_cskrOverlay;}
CAssetId GetIceModelId() const {return xa8_cmdlOverlay;}
CAssetId GetIceSkinRulesId() const {return xac_cskrOverlay;}
const CParticleResData& GetParticleResData() const {return x44_partRes;}
u32 GetAnimationIndex(u32 idx) const { return xb0_animIdxs.at(idx); }