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

New code style refactor

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

77
Runtime/Weapon/CGunController.hpp
View File

@@ -5,54 +5,39 @@
#include "CGSComboFire.hpp"
#include "CGSFidget.hpp"
namespace urde
{
enum class EGunState
{
Inactive,
Default,
FreeLook,
ComboFire,
Idle,
Fidget,
Strike,
BigStrike
};
namespace urde {
enum class EGunState { Inactive, Default, FreeLook, ComboFire, Idle, Fidget, Strike, BigStrike };
class CGunController
{
CModelData& x0_modelData;
CGSFreeLook x4_freeLook;
CGSComboFire x1c_comboFire;
CGSFidget x30_fidget;
EGunState x50_gunState = EGunState::Inactive;
s32 x54_curAnimId = -1;
bool x58_24_animDone : 1;
bool x58_25_enteredComboFire : 1;
class CGunController {
CModelData& x0_modelData;
CGSFreeLook x4_freeLook;
CGSComboFire x1c_comboFire;
CGSFidget x30_fidget;
EGunState x50_gunState = EGunState::Inactive;
s32 x54_curAnimId = -1;
bool x58_24_animDone : 1;
bool x58_25_enteredComboFire : 1;
public:
CGunController(CModelData& modelData)
: x0_modelData(modelData)
{
x58_24_animDone = true;
x58_25_enteredComboFire = false;
}
CGunController(CModelData& modelData) : x0_modelData(modelData) {
x58_24_animDone = true;
x58_25_enteredComboFire = false;
}
void UnLoadFidget() { x30_fidget.UnLoadAnim(); }
void LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 gunId, s32 animSet);
void EnterFidget(CStateManager& mgr, s32 type, s32 gunId, s32 animSet);
bool IsFidgetLoaded() const { return x30_fidget.IsAnimLoaded(); }
s32 GetFreeLookSetId() const { return x4_freeLook.GetSetId(); }
bool IsComboOver() const { return x1c_comboFire.IsComboOver(); }
void EnterFreeLook(CStateManager& mgr, s32 gunId, s32 setId);
void EnterComboFire(CStateManager& mgr, s32 gunId);
void EnterStruck(CStateManager& mgr, float angle, bool bigStrike, bool b2);
void EnterIdle(CStateManager& mgr);
bool Update(float dt, CStateManager& mgr);
void ReturnToDefault(CStateManager& mgr, float dt, bool setState);
void ReturnToBasePosition(CStateManager&, float);
void Reset();
s32 GetCurAnimId() const { return x54_curAnimId; }
void UnLoadFidget() { x30_fidget.UnLoadAnim(); }
void LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 gunId, s32 animSet);
void EnterFidget(CStateManager& mgr, s32 type, s32 gunId, s32 animSet);
bool IsFidgetLoaded() const { return x30_fidget.IsAnimLoaded(); }
s32 GetFreeLookSetId() const { return x4_freeLook.GetSetId(); }
bool IsComboOver() const { return x1c_comboFire.IsComboOver(); }
void EnterFreeLook(CStateManager& mgr, s32 gunId, s32 setId);
void EnterComboFire(CStateManager& mgr, s32 gunId);
void EnterStruck(CStateManager& mgr, float angle, bool bigStrike, bool b2);
void EnterIdle(CStateManager& mgr);
bool Update(float dt, CStateManager& mgr);
void ReturnToDefault(CStateManager& mgr, float dt, bool setState);
void ReturnToBasePosition(CStateManager&, float);
void Reset();
s32 GetCurAnimId() const { return x54_curAnimId; }
};
}
} // namespace urde