2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:07:44 +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

@@ -6,68 +6,56 @@
#include "CDecalDescription.hpp"
#include "CRandom16.hpp"
namespace urde
{
namespace urde {
struct SQuadDescr;
struct CQuadDecal
{
union
{
struct
{
bool x0_24_invalid : 1;
};
u32 _dummy = 0;
struct CQuadDecal {
union {
struct {
bool x0_24_invalid : 1;
};
s32 x4_lifetime = 0;
float x8_rotation = 0.f;
const SQuadDescr* m_desc = nullptr;
CQuadDecal() = default;
CQuadDecal(s32 i, float f)
: x4_lifetime(i),
x8_rotation(f)
{
x0_24_invalid = true;
}
u32 _dummy = 0;
};
s32 x4_lifetime = 0;
float x8_rotation = 0.f;
const SQuadDescr* m_desc = nullptr;
CQuadDecal() = default;
CQuadDecal(s32 i, float f) : x4_lifetime(i), x8_rotation(f) { x0_24_invalid = true; }
boo::ObjToken<boo::IGraphicsBufferD> m_instBuf;
boo::ObjToken<boo::IGraphicsBufferD> m_uniformBuf;
boo::ObjToken<boo::IShaderDataBinding> m_normalDataBind;
boo::ObjToken<boo::IShaderDataBinding> m_redToAlphaDataBind;
boo::ObjToken<boo::IGraphicsBufferD> m_instBuf;
boo::ObjToken<boo::IGraphicsBufferD> m_uniformBuf;
boo::ObjToken<boo::IShaderDataBinding> m_normalDataBind;
boo::ObjToken<boo::IShaderDataBinding> m_redToAlphaDataBind;
};
class CDecal
{
friend class CDecalManager;
static bool sMoveRedToAlphaBuffer;
static CRandom16 sDecalRandom;
class CDecal {
friend class CDecalManager;
static bool sMoveRedToAlphaBuffer;
static CRandom16 sDecalRandom;
TLockedToken<CDecalDescription> x0_description;
zeus::CTransform xc_transform;
CQuadDecal x3c_decalQuads[2];
s32 x54_modelLifetime = 0;
s32 x58_frameIdx = 0;
union
{
struct
{
bool x5c_31_quad1Invalid : 1;
bool x5c_30_quad2Invalid : 1;
bool x5c_29_modelInvalid : 1;
};
u32 x5c_dummy = 0;
TLockedToken<CDecalDescription> x0_description;
zeus::CTransform xc_transform;
CQuadDecal x3c_decalQuads[2];
s32 x54_modelLifetime = 0;
s32 x58_frameIdx = 0;
union {
struct {
bool x5c_31_quad1Invalid : 1;
bool x5c_30_quad2Invalid : 1;
bool x5c_29_modelInvalid : 1;
};
zeus::CVector3f x60_rotation;
bool InitQuad(CQuadDecal& quad, const SQuadDescr& desc);
u32 x5c_dummy = 0;
};
zeus::CVector3f x60_rotation;
bool InitQuad(CQuadDecal& quad, const SQuadDescr& desc);
public:
CDecal(const TToken<CDecalDescription>& desc, const zeus::CTransform& xf);
void RenderQuad(CQuadDecal& decal, const SQuadDescr& desc) const;
void RenderMdl() const;
void Render() const;
void Update(float dt);
CDecal(const TToken<CDecalDescription>& desc, const zeus::CTransform& xf);
void RenderQuad(CQuadDecal& decal, const SQuadDescr& desc) const;
void RenderMdl() const;
void Render() const;
void Update(float dt);
static void SetGlobalSeed(u16);
static void SetMoveRedToAlphaBuffer(bool);
static void SetGlobalSeed(u16);
static void SetMoveRedToAlphaBuffer(bool);
};
}
} // namespace urde