2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 07:07:42 +00:00

HLSL shader sync, Windows build fixes

This commit is contained in:
Jack Andersen
2016-08-17 10:05:23 -10:00
parent e401a497ef
commit 9ca7f9c9e4
20 changed files with 282 additions and 42 deletions

View File

@@ -85,10 +85,10 @@ public:
void AsyncLoadSuit(CStateManager& mgr);
void LoadAnimationTokens();
bool CanRenderUnsorted(CStateManager& mgr) const;
const CDamageVulnerability& GetDamageVulnerability(const zeus::CVector3f& v1,
const CDamageVulnerability* GetDamageVulnerability(const zeus::CVector3f& v1,
const zeus::CVector3f& v2,
const CDamageInfo& info) const;
const CDamageVulnerability& GetDamageVulnerability() const;
const CDamageVulnerability* GetDamageVulnerability() const;
zeus::CVector3f GetHomingPosition(CStateManager& mgr, float) const;
zeus::CVector3f GetAimPosition(CStateManager& mgr, float) const;
void FluidFXThink(CActor::EFluidState, CScriptWater& water, CStateManager& mgr);
@@ -98,7 +98,7 @@ public:
bool WasDamaged() const;
void TakeDamage(bool, const zeus::CVector3f&, float, EWeaponType, CStateManager& mgr);
void Accept(IVisitor& visitor);
CHealthInfo& HealthInfo(CStateManager& mgr);
CHealthInfo* HealthInfo(CStateManager& mgr);
bool IsUnderBetaMetroidAttack(CStateManager& mgr) const;
rstl::optional_object<zeus::CAABox> GetTouchBounds() const;
void Touch(CActor&, CStateManager& mgr);