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

CAnimData: Actually create CParticleData in InitializeEffects

This commit is contained in:
Luke Street 2020-09-16 04:33:36 -04:00
parent ab296ff97e
commit a9ed8c4329
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Character/CAnimData.cpp
View File

@ -101,8 +101,10 @@ void CAnimData::InitializeEffects(CStateManager& mgr, TAreaId aId, const zeus::C
for (const auto& effects : xc_charInfo.GetEffectList()) { for (const auto& effects : xc_charInfo.GetEffectList()) {
for (const auto& effect : effects.second) { for (const auto& effect : effects.second) {
x120_particleDB.CacheParticleDesc(effect.GetParticleTag()); x120_particleDB.CacheParticleDesc(effect.GetParticleTag());
x120_particleDB.AddParticleEffect(effect.GetSegmentName(), effect.GetFlags(), CParticleData(), scale, mgr, aId, const CParticleData data{effect.GetParticleTag(), effect.GetSegmentName(), effect.GetScale(),
true, x21c_particleLightIdx); effect.GetParentedMode()};
x120_particleDB.AddParticleEffect(effect.GetComponentName(), effect.GetFlags(), data, scale, mgr, aId, true,
x21c_particleLightIdx);
x120_particleDB.SetParticleEffectState(effect.GetComponentName(), false, mgr); x120_particleDB.SetParticleEffectState(effect.GetComponentName(), false, mgr);
} }
} }
@ -258,9 +260,7 @@ std::shared_ptr<CAnimationManager> CAnimData::GetAnimationManager() { return x10
void CAnimData::SetPhase(float ph) { x1f8_animRoot->VSetPhase(ph); } void CAnimData::SetPhase(float ph) { x1f8_animRoot->VSetPhase(ph); }
void CAnimData::Touch(const CSkinnedModel& model, int shadIdx) const { void CAnimData::Touch(const CSkinnedModel& model, int shadIdx) const { model.GetModelInst()->Touch(shadIdx); }
model.GetModelInst()->Touch(shadIdx);
}
SAdvancementDeltas CAnimData::GetAdvancementDeltas(const CCharAnimTime& a, const CCharAnimTime& b) const { SAdvancementDeltas CAnimData::GetAdvancementDeltas(const CCharAnimTime& a, const CCharAnimTime& b) const {
return x1f8_animRoot->VGetAdvancementResults(a, b).x8_deltas; return x1f8_animRoot->VGetAdvancementResults(a, b).x8_deltas;

2
Runtime/Character/CParticleData.hpp
View File

@ -22,6 +22,8 @@ private:
public: public:
CParticleData() = default; CParticleData() = default;
CParticleData(const SObjectTag& tag, std::string_view boneName, float scale, EParentedMode mode)
: x4_particle(tag), xc_boneName(boneName), x1c_scale(scale), x20_parentMode(mode) {}
explicit CParticleData(CInputStream& in); explicit CParticleData(CInputStream& in);
u32 GetDuration() const { return x0_duration; } u32 GetDuration() const { return x0_duration; }
const SObjectTag& GetTag() const { return x4_particle; } const SObjectTag& GetTag() const { return x4_particle; }