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

@@ -2,38 +2,33 @@
#include "CEntity.hpp"
namespace urde
{
class CScriptActorKeyframe : public CEntity
{
namespace urde {
class CScriptActorKeyframe : public CEntity {
private:
s32 x34_animationId;
float x38_initialLifetime;
float x3c_playbackRate;
float x40_lifetime;
union {
struct
{
bool x44_24_looping : 1;
bool x44_25_isPassive : 1;
bool x44_26_fadeOut : 1;
bool x44_27_timedLoop : 1;
bool x44_28_playing : 1;
bool x44_29_ : 1;
};
u8 _dummy = 0;
s32 x34_animationId;
float x38_initialLifetime;
float x3c_playbackRate;
float x40_lifetime;
union {
struct {
bool x44_24_looping : 1;
bool x44_25_isPassive : 1;
bool x44_26_fadeOut : 1;
bool x44_27_timedLoop : 1;
bool x44_28_playing : 1;
bool x44_29_ : 1;
};
u8 _dummy = 0;
};
public:
CScriptActorKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 animId,
bool looping, float lifetime, bool isPassive, u32 fadeOut, bool active,
float totalPlayback);
CScriptActorKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 animId, bool looping,
float lifetime, bool isPassive, u32 fadeOut, bool active, float totalPlayback);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Think(float, CStateManager&);
void UpdateEntity(TUniqueId, CStateManager&);
bool IsPassive() const { return x44_25_isPassive; }
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Think(float, CStateManager&);
void UpdateEntity(TUniqueId, CStateManager&);
bool IsPassive() const { return x44_25_isPassive; }
};
}
} // namespace urde