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

Merge pull request #116 from lioncash/name 

CParticleGenInfo: Use slightly more full names for parameters where applicable
This commit is contained in:
Phillip Stephens 2019-10-26 17:51:57 -07:00 committed by GitHub
parent 83c0ad1e72 bbdfe3d962
commit 0042e44521
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/Character/CParticleGenInfo.cpp
View File

@ -102,13 +102,14 @@ void CParticleGenInfoGeneric::SetGlobalTranslation(const zeus::CVector3f& trans,
void CParticleGenInfoGeneric::SetGlobalScale(const zeus::CVector3f& scale) { x84_system->SetGlobalScale(scale); }
void CParticleGenInfoGeneric::SetParticleEmission(bool emission, CStateManager& stateMgr) {
x84_system->SetParticleEmission(emission);
void CParticleGenInfoGeneric::SetParticleEmission(bool isActive, CStateManager& stateMgr) {
x84_system->SetParticleEmission(isActive);
TCastToPtr<CGameLight> gl(stateMgr.ObjectById(x88_lightId));
if (gl)
gl->SetActive(emission);
if (gl) {
gl->SetActive(isActive);
}
}
bool CParticleGenInfoGeneric::IsSystemDeletable() const { return x84_system->IsSystemDeletable(); }

16
Runtime/Character/CParticleGenInfo.hpp
View File

@ -44,7 +44,7 @@ public:
virtual void SetGlobalOrientation(const zeus::CTransform& xf, CStateManager& stateMgr) = 0;
virtual void SetGlobalTranslation(const zeus::CVector3f& trans, CStateManager& stateMgr) = 0;
virtual void SetGlobalScale(const zeus::CVector3f& scale) = 0;
virtual void SetParticleEmission(bool, CStateManager& stateMgr) = 0;
virtual void SetParticleEmission(bool isActive, CStateManager& stateMgr) = 0;
virtual bool IsSystemDeletable() const = 0;
virtual std::optional<zeus::CAABox> GetBounds() const = 0;
virtual bool HasActiveParticles() const = 0;
@ -54,12 +54,12 @@ public:
virtual void DeleteLight(CStateManager& stateMgr) = 0;
virtual void SetModulationColor(const zeus::CColor& color) = 0;
void SetFlags(s32 f) { x2c_flags = f; }
void SetFlags(s32 flags) { x2c_flags = flags; }
s32 GetFlags() const { return x2c_flags; }
void SetIsGrabInitialData(bool g) { x40_grabInitialData = g; }
void SetIsGrabInitialData(bool grabInitialData) { x40_grabInitialData = grabInitialData; }
bool GetIsGrabInitialData() const { return x40_grabInitialData; }
bool GetIsActive() const { return x24_active; }
void SetIsActive(bool a) { x24_active = a; }
void SetIsActive(bool isActive) { x24_active = isActive; }
void OffsetTime(float dt) { x20_curTime += dt; }
const zeus::CVector3f& GetCurOffset() const { return x74_offset; }
void SetCurOffset(const zeus::CVector3f& offset) { x74_offset = offset; }
@ -67,12 +67,12 @@ public:
void SetCurTransform(const zeus::CTransform& xf) { x44_transform = xf; }
const zeus::CVector3f& GetCurScale() const { return x30_particleScale; }
void SetCurScale(const zeus::CVector3f& scale) { x30_particleScale = scale; }
void SetInactiveStartTime(float s) { xc_seconds = s; }
void SetInactiveStartTime(float seconds) { xc_seconds = seconds; }
float GetInactiveStartTime() const { return xc_seconds; }
void MarkFinishTime() { x3c_finishTime = x20_curTime; }
float GetFinishTime() const { return x3c_finishTime; }
float GetCurrentTime() const { return x20_curTime; }
void SetCurrentTime(float t) { x20_curTime = t; }
void SetCurrentTime(float time) { x20_curTime = time; }
EParticleGenType GetType() const { return x80_type; }
CParticleData::EParentedMode GetParentedMode() const { return x28_parentMode; }
@ -86,7 +86,7 @@ class CParticleGenInfoGeneric : public CParticleGenInfo {
public:
CParticleGenInfoGeneric(const SObjectTag& part, const std::weak_ptr<CParticleGen>& system, int frames,
std::string_view boneName, const zeus::CVector3f& scale,
CParticleData::EParentedMode parentMode, int flags, CStateManager& stateMgr, TAreaId,
CParticleData::EParentedMode parentMode, int flags, CStateManager& stateMgr, TAreaId areaId,
int lightId, EParticleGenType state);
void AddToRenderer() override;
@ -97,7 +97,7 @@ public:
void SetGlobalOrientation(const zeus::CTransform& xf, CStateManager& stateMgr) override;
void SetGlobalTranslation(const zeus::CVector3f& trans, CStateManager& stateMgr) override;
void SetGlobalScale(const zeus::CVector3f& scale) override;
void SetParticleEmission(bool, CStateManager& stateMgr) override;
void SetParticleEmission(bool isActive, CStateManager& stateMgr) override;
bool IsSystemDeletable() const override;
std::optional<zeus::CAABox> GetBounds() const override;
bool HasActiveParticles() const override;