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

Merge remote-tracking branch 'origin/master' into omegapirate

Browse Source
This commit is contained in:
Luke Street
2020-04-09 20:06:33 -04:00
parent 416ca4653b c796cf5315
commit 6b814262fc
157 changed files with 707 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CActor.hpp
View File

@@ -108,8 +108,8 @@ public:
CEntity::SetActive(active);
}
virtual void PreRender(CStateManager&, const zeus::CFrustum&);
virtual void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const;
virtual void Render(const CStateManager&) const;
virtual void AddToRenderer(const zeus::CFrustum&, CStateManager&);
virtual void Render(CStateManager&);
virtual bool CanRenderUnsorted(const CStateManager&) const;
virtual void CalculateRenderBounds();
virtual CHealthInfo* HealthInfo(CStateManager&);
@@ -168,8 +168,8 @@ public:
float GetYaw() const;
const CModelData* GetModelData() const { return x64_modelData.get(); }
CModelData* GetModelData() { return x64_modelData.get(); }
void EnsureRendered(const CStateManager&) const;
void EnsureRendered(const CStateManager&, const zeus::CVector3f&, const zeus::CAABox&) const;
void EnsureRendered(const CStateManager&);
void EnsureRendered(const CStateManager&, const zeus::CVector3f&, const zeus::CAABox&);
void ProcessSoundEvent(u32 sfxId, float weight, u32 flags, float falloff, float maxDist, float minVol, float maxVol,
const zeus::CVector3f& toListener, const zeus::CVector3f& position, TAreaId aid,
CStateManager& mgr, bool translateId);