2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 08:27:42 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -7,53 +7,49 @@
#include "CModVectorElement.hpp"
#include "CColorElement.hpp"
namespace urde
{
namespace urde {
class CCollisionResponseData;
struct SCollisionResponseData
{
TToken<CCollisionResponseData> m_res;
bool m_found = false;
SCollisionResponseData() = default;
SCollisionResponseData(CToken&& tok, bool found)
: m_res(std::move(tok)), m_found(found) {}
operator bool() const { return m_found; }
struct SCollisionResponseData {
TToken<CCollisionResponseData> m_res;
bool m_found = false;
SCollisionResponseData() = default;
SCollisionResponseData(CToken&& tok, bool found) : m_res(std::move(tok)), m_found(found) {}
operator bool() const { return m_found; }
};
class CWeaponDescription
{
class CWeaponDescription {
public:
std::unique_ptr<CVectorElement> x0_IORN;
std::unique_ptr<CVectorElement> x4_IVEC;
std::unique_ptr<CVectorElement> x8_PSOV;
std::unique_ptr<CModVectorElement> xc_PSVM;
bool x10_VMD2;
std::unique_ptr<CIntElement> x14_PSLT;
std::unique_ptr<CVectorElement> x18_PSCL;
std::unique_ptr<CColorElement> x1c_PCOL;
std::unique_ptr<CVectorElement> x20_POFS;
std::unique_ptr<CVectorElement> x24_OFST;
bool x28_APSO;
bool x29_HOMG;
bool x2a_AP11;
bool x2b_AP21;
bool x2c_AS11;
bool x2d_AS12;
bool x2e_AS13;
std::unique_ptr<CRealElement> x30_TRAT;
SChildGeneratorDesc x34_APSM;
SChildGeneratorDesc x44_APS2;
SSwooshGeneratorDesc x54_ASW1;
SSwooshGeneratorDesc x64_ASW2;
SSwooshGeneratorDesc x74_ASW3;
SParticleModel x84_OHEF;
SCollisionResponseData x94_COLR;
bool xa4_EWTR = true;
bool xa5_LWTR = true;
bool xa6_SWTR = true;
s32 xa8_PJFX = -1;
std::unique_ptr<CRealElement> xac_RNGE;
std::unique_ptr<CRealElement> xb0_FOFF;
std::unique_ptr<CVectorElement> x0_IORN;
std::unique_ptr<CVectorElement> x4_IVEC;
std::unique_ptr<CVectorElement> x8_PSOV;
std::unique_ptr<CModVectorElement> xc_PSVM;
bool x10_VMD2;
std::unique_ptr<CIntElement> x14_PSLT;
std::unique_ptr<CVectorElement> x18_PSCL;
std::unique_ptr<CColorElement> x1c_PCOL;
std::unique_ptr<CVectorElement> x20_POFS;
std::unique_ptr<CVectorElement> x24_OFST;
bool x28_APSO;
bool x29_HOMG;
bool x2a_AP11;
bool x2b_AP21;
bool x2c_AS11;
bool x2d_AS12;
bool x2e_AS13;
std::unique_ptr<CRealElement> x30_TRAT;
SChildGeneratorDesc x34_APSM;
SChildGeneratorDesc x44_APS2;
SSwooshGeneratorDesc x54_ASW1;
SSwooshGeneratorDesc x64_ASW2;
SSwooshGeneratorDesc x74_ASW3;
SParticleModel x84_OHEF;
SCollisionResponseData x94_COLR;
bool xa4_EWTR = true;
bool xa5_LWTR = true;
bool xa6_SWTR = true;
s32 xa8_PJFX = -1;
std::unique_ptr<CRealElement> xac_RNGE;
std::unique_ptr<CRealElement> xb0_FOFF;
};
}
} // namespace urde