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

More particle bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-13 13:27:47 -10:00
parent faf0ac7d27
commit 9130b9459a
10 changed files with 148 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Runtime/Character/CParticleGenInfo.hpp
View File

@@ -12,10 +12,10 @@ struct SObjectTag;
class CParticleGen;
class CStateManager;
enum class EParticleGenState
enum class EParticleGenType
{
NotStarted,
Started
Normal,
Auxiliary
};
class CParticleGenInfo
@@ -32,12 +32,12 @@ class CParticleGenInfo
bool x40_grabInitialData = false;
zeus::CTransform x44_transform;
zeus::CVector3f x74_offset;
EParticleGenState x80_state;
EParticleGenType x80_type;
public:
CParticleGenInfo(const SObjectTag& part, int frameCount, std::string_view boneName,
const zeus::CVector3f& scale, CParticleData::EParentedMode parentMode,
int flags, EParticleGenState state);
int flags, EParticleGenType type);
virtual ~CParticleGenInfo() = default;
virtual void AddToRenderer() = 0;
@@ -77,8 +77,7 @@ public:
float GetFinishTime() const { return x3c_finishTime; }
float GetCurrentTime() const { return x20_curTime; }
void SetCurrentTime(float t) { x20_curTime = t; }
EParticleGenState GetState() const { return x80_state; }
void SetState(EParticleGenState s) { x80_state = s; }
EParticleGenType GetType() const { return x80_type; }
CParticleData::EParentedMode GetParentedMode() const { return x28_parentMode; }
std::string_view GetLocatorName() const { return x10_boneName; }
@@ -93,7 +92,7 @@ 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,
int lightId, EParticleGenState state);
int lightId, EParticleGenType state);
void AddToRenderer();
void Render();