AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CGameProjectile: Implement Render

This commit is contained in:
Luke Street 2020-09-26 01:34:13 -04:00
parent e305fbffab
commit edea2e3745
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Weapon/CGameProjectile.cpp
View File

@ -95,6 +95,11 @@ void CGameProjectile::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId /*uid*
DeleteProjectileLight(mgr); DeleteProjectileLight(mgr);
} }
void CGameProjectile::Render(CStateManager& mgr) {
x170_projectile.Render();
CWeapon::Render(mgr);
}
EProjectileAttrib CGameProjectile::GetBeamAttribType(EWeaponType wType) { EProjectileAttrib CGameProjectile::GetBeamAttribType(EWeaponType wType) {
if (wType == EWeaponType::Ice) if (wType == EWeaponType::Ice)
return EProjectileAttrib::Ice; return EProjectileAttrib::Ice;

4
Runtime/Weapon/CGameProjectile.hpp
View File

@ -24,8 +24,7 @@ class CProjectileTouchResult {
std::optional<CRayCastResult> x4_result; std::optional<CRayCastResult> x4_result;
public: public:
CProjectileTouchResult(TUniqueId id, const std::optional<CRayCastResult>& result) CProjectileTouchResult(TUniqueId id, const std::optional<CRayCastResult>& result) : x0_id(id), x4_result(result) {}
: x0_id(id), x4_result(result) {}
TUniqueId GetActorId() const { return x0_id; } TUniqueId GetActorId() const { return x0_id; }
bool HasRayCastResult() const { return x4_result.operator bool(); } bool HasRayCastResult() const { return x4_result.operator bool(); }
const CRayCastResult& GetRayCastResult() const { return *x4_result; } const CRayCastResult& GetRayCastResult() const { return *x4_result; }
@ -65,6 +64,7 @@ public:
void Accept(IVisitor& visitor) override; void Accept(IVisitor& visitor) override;
virtual void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, CStateManager& mgr); virtual void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Render(CStateManager& mgr) override;
static EProjectileAttrib GetBeamAttribType(EWeaponType wType); static EProjectileAttrib GetBeamAttribType(EWeaponType wType);
void DeleteProjectileLight(CStateManager&); void DeleteProjectileLight(CStateManager&);
void CreateProjectileLight(std::string_view, const CLight&, CStateManager&); void CreateProjectileLight(std::string_view, const CLight&, CStateManager&);