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

More CPlayer imps

Browse Source
This commit is contained in:
Jack Andersen
2017-07-30 19:19:05 -10:00
parent c06c1e464b
commit 925aa3fe1a
30 changed files with 816 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Weapon/CGrappleArm.cpp
View File

@@ -31,4 +31,9 @@ void CGrappleArm::GrappleBeamConnected()
}
void CGrappleArm::RenderGrappleBeam(const CStateManager& mgr, const zeus::CVector3f& pos)
{
}
}

5
Runtime/Weapon/CGrappleArm.hpp
View File

@@ -22,6 +22,8 @@ public:
Six,
Seven,
Eight,
Nine,
Ten
};
private:
CModelData x0_modelData;
@@ -31,6 +33,7 @@ private:
{
struct
{
bool x3b2_24_inGrappleCycle : 1;
bool x3b2_25_beamActive : 1;
bool x3b2_27_armMoving : 1;
};
@@ -44,11 +47,13 @@ public:
const zeus::CTransform& GetTransform() const { return x220_xf; }
void SetAnimState(EArmState state);
EArmState GetAnimState() const { return x334_animState; }
bool InGrappleCycle() const { return x3b2_24_inGrappleCycle; }
bool BeamActive() const { return x3b2_25_beamActive; }
bool IsArmMoving() const { return x3b2_27_armMoving; }
void Activate(bool);
void GrappleBeamDisconnected();
void GrappleBeamConnected();
void RenderGrappleBeam(const CStateManager& mgr, const zeus::CVector3f& pos);
};
}

17
Runtime/Weapon/CPlayerGun.cpp
View File

@@ -35,7 +35,7 @@ void CPlayerGun::AsyncLoadSuit(CStateManager& mgr)
x740_grappleArm->AsyncLoadSuit(mgr);
}
void CPlayerGun::TouchModel(CStateManager& stateMgr)
void CPlayerGun::TouchModel(const CStateManager& stateMgr)
{
}
@@ -68,4 +68,19 @@ float CPlayerGun::GetBeamVelocity() const
return 10.f;
}
void CPlayerGun::PreRender(const CStateManager& mgr, const zeus::CFrustum& frustum, const zeus::CVector3f& camPos)
{
}
void CPlayerGun::Render(const CStateManager& mgr, const zeus::CVector3f& pos, const CModelFlags& flags) const
{
}
void CPlayerGun::AddToRenderer(const zeus::CFrustum& frustum, const CStateManager& mgr) const
{
}
}

5
Runtime/Weapon/CPlayerGun.hpp
View File

@@ -210,7 +210,7 @@ public:
void AcceptScriptMessage(EScriptObjectMessage, TUniqueId, CStateManager&);
void AsyncLoadSuit(CStateManager& mgr);
void TouchModel(CStateManager& stateMgr);
void TouchModel(const CStateManager& stateMgr);
EMissleMode GetMissleMode() const { return x31c_missileMode; }
bool IsFidgeting() const { return x833_24_isFidgeting; }
bool IsCharging() const { return x834_24_charging; }
@@ -229,6 +229,9 @@ public:
void ResetIdle(CStateManager& mgr);
void CancelFiring(CStateManager& mgr);
float GetBeamVelocity() const;
void PreRender(const CStateManager& mgr, const zeus::CFrustum& frustum, const zeus::CVector3f& camPos);
void Render(const CStateManager& mgr, const zeus::CVector3f& pos, const CModelFlags& flags) const;
void AddToRenderer(const zeus::CFrustum& frustum, const CStateManager& mgr) const;
};
}