2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +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

@@ -3,43 +3,36 @@
#include "CEntity.hpp"
#include "zeus/CTransform.hpp"
namespace urde
{
namespace urde {
struct SRiders;
class CScriptPlatform;
class CScriptActorRotate : public CEntity
{
zeus::CVector3f x34_rotation;
float x40_maxTime;
float x44_currentTime = 0.f;
std::map<TUniqueId, zeus::CTransform> x48_actors;
class CScriptActorRotate : public CEntity {
zeus::CVector3f x34_rotation;
float x40_maxTime;
float x44_currentTime = 0.f;
std::map<TUniqueId, zeus::CTransform> x48_actors;
union
{
struct
{
bool x58_24_updateRotation : 1;
bool x58_25_skipSpiderBallWaypoints : 1;
bool x58_26_updateActors : 1;
bool x58_27_updateOnCreation : 1;
};
u32 dummy = 0;
union {
struct {
bool x58_24_updateRotation : 1;
bool x58_25_skipSpiderBallWaypoints : 1;
bool x58_26_updateActors : 1;
bool x58_27_updateOnCreation : 1;
};
u32 dummy = 0;
};
void UpdateActors(bool, CStateManager&);
void UpdateSpiderBallWaypoints(CStateManager&);
void UpdatePlatformRiders(CScriptPlatform&, const zeus::CTransform&, CStateManager&);
void UpdatePlatformRiders(std::vector<SRiders>&, CScriptPlatform&, const zeus::CTransform&, CStateManager&);
void UpdateActors(bool, CStateManager&);
void UpdateSpiderBallWaypoints(CStateManager&);
void UpdatePlatformRiders(CScriptPlatform&, const zeus::CTransform&, CStateManager&);
void UpdatePlatformRiders(std::vector<SRiders>&, CScriptPlatform&,
const zeus::CTransform&, CStateManager&);
public:
CScriptActorRotate(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CVector3f&, float, bool, bool,
bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
CScriptActorRotate(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CVector3f&, float, bool, bool, bool);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
};
}
} // namespace urde