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

zeus constexpr refactor and thermal visor fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-02-23 21:15:54 -10:00
parent 1186b8097c
commit 8df0a4913c
226 changed files with 1339 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CActorModelParticles.cpp
View File

@@ -61,7 +61,7 @@ void CActorModelParticles::CItem::GeneratePoints(const std::vector<std::pair<zeu
if (v.canBeNormalized()) {
v.normalize();
x78_ashGen->SetOrientation(
zeus::CTransform{v.cross(zeus::CVector3f::skUp), v, zeus::CVector3f::skUp, zeus::CVector3f::skZero});
zeus::CTransform{v.cross(zeus::skUp), v, zeus::skUp, zeus::skZero3f});
}
x78_ashGen->ForceParticleCreation(1);
}
@@ -140,7 +140,7 @@ bool CActorModelParticles::CItem::UpdateOnFire(float dt, CActor* actor, CStateMa
}
if (!x74_sfx) {
x74_sfx = CSfxManager::AddEmitter(SFXsfx0480 + (IsMediumOrLarge(*actor) ? 1 : 0), actor->GetTranslation(),
zeus::CVector3f::skZero, true, true, 0x7f, kInvalidAreaId);
zeus::skZero3f, true, true, 0x7f, kInvalidAreaId);
}
x70_onFire = false;
}
@@ -161,7 +161,7 @@ bool CActorModelParticles::CItem::UpdateOnFire(float dt, CActor* actor, CStateMa
}
if (x74_sfx) {
if (sfxActive) {
CSfxManager::UpdateEmitter(x74_sfx, xf8_iceXf.origin, zeus::CVector3f::skZero, 1.f);
CSfxManager::UpdateEmitter(x74_sfx, xf8_iceXf.origin, zeus::skZero3f, 1.f);
} else {
CSfxManager::RemoveEmitter(x74_sfx);
x74_sfx.reset();
@@ -581,7 +581,7 @@ void CActorModelParticles::StopThermalHotParticles(CActor& act) {
void CActorModelParticles::StartBurnDeath(CActor& act) {
auto iter = FindOrCreateSystem(act);
u16 sfx = SFXeff_x_smallburndeath_lp_00 - s16(IsMediumOrLarge(act));
CSfxManager::AddEmitter(sfx, act.GetTranslation(), zeus::CVector3f::skZero, true, false, 0x7f, kInvalidAreaId);
CSfxManager::AddEmitter(sfx, act.GetTranslation(), zeus::skZero3f, true, false, 0x7f, kInvalidAreaId);
iter->xdc_ashy.Lock();
}