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

Runtime/Particle: Replace bitfield unions with constructor initializers

Browse Source
This commit is contained in:
Luke Street
2020-04-11 00:39:49 -04:00
parent f483f5c1e6
commit c7ca8dc3a7
11 changed files with 134 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Runtime/Particle/CGenDescription.hpp
View File

@@ -39,30 +39,25 @@ public:
// std::unique_ptr<CVectorElement> x38_ILOC;
// std::unique_ptr<CVectorElement> x3c_IVEC;
std::unique_ptr<CEmitterElement> x40_x2c_EMTR;
union {
struct {
bool x44_28_x30_28_SORT : 1;
bool x44_30_x31_24_MBLR : 1;
bool x44_24_x30_24_LINE : 1;
bool x44_29_x30_29_LIT_ : 1;
bool x44_26_x30_26_AAPH : 1;
bool x44_27_x30_27_ZBUF : 1;
bool x44_25_x30_25_FXLL : 1;
bool x44_31_x31_25_PMAB : 1;
bool x45_29_x31_31_VMD4 : 1;
bool x45_28_x31_30_VMD3 : 1;
bool x45_27_x31_29_VMD2 : 1;
bool x45_26_x31_28_VMD1 : 1;
bool x45_31_x32_25_OPTS : 1;
bool x45_24_x31_26_PMUS : 1;
bool x45_25_x31_27_PMOO : 1;
bool x45_30_x32_24_CIND : 1;
/* 0-00 additions */
bool x30_30_ORNT : 1;
bool x30_31_RSOP : 1;
};
u32 dummy1 = 0;
};
bool x44_28_x30_28_SORT : 1;
bool x44_30_x31_24_MBLR : 1;
bool x44_24_x30_24_LINE : 1;
bool x44_29_x30_29_LIT_ : 1;
bool x44_26_x30_26_AAPH : 1;
bool x44_27_x30_27_ZBUF : 1;
bool x44_25_x30_25_FXLL : 1;
bool x44_31_x31_25_PMAB : 1;
bool x45_29_x31_31_VMD4 : 1;
bool x45_28_x31_30_VMD3 : 1;
bool x45_27_x31_29_VMD2 : 1;
bool x45_26_x31_28_VMD1 : 1;
bool x45_31_x32_25_OPTS : 1;
bool x45_24_x31_26_PMUS : 1;
bool x45_25_x31_27_PMOO : 1;
bool x45_30_x32_24_CIND : 1;
/* 0-00 additions */
bool x30_30_ORNT : 1;
bool x30_31_RSOP : 1;
std::unique_ptr<CIntElement> x48_x34_MBSP;
std::unique_ptr<CRealElement> x4c_x38_SIZE;
std::unique_ptr<CRealElement> x50_x3c_ROTA;
@@ -112,7 +107,25 @@ public:
/* Custom additions */
std::unique_ptr<CColorElement> m_bevelGradient; /* FourCC BGCL */
CGenDescription() { x45_25_x31_27_PMOO = true; }
CGenDescription()
: x44_28_x30_28_SORT(false)
, x44_30_x31_24_MBLR(false)
, x44_24_x30_24_LINE(false)
, x44_29_x30_29_LIT_(false)
, x44_26_x30_26_AAPH(false)
, x44_27_x30_27_ZBUF(false)
, x44_25_x30_25_FXLL(false)
, x44_31_x31_25_PMAB(false)
, x45_29_x31_31_VMD4(false)
, x45_28_x31_30_VMD3(false)
, x45_27_x31_29_VMD2(false)
, x45_26_x31_28_VMD1(false)
, x45_31_x32_25_OPTS(false)
, x45_24_x31_26_PMUS(false)
, x45_25_x31_27_PMOO(true)
, x45_30_x32_24_CIND(false)
, x30_30_ORNT(false)
, x30_31_RSOP(false) {}
};
} // namespace urde