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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/Particle/CFlameWarp.cpp
View File

@@ -65,17 +65,24 @@ void CFlameWarp::ModifyParticles(std::vector<CParticle>& particles) {
for (int i = 0; i < 9; ++i) {
CParticle& part = particles[vec[i].second];
x4_vecs[i] = part.x4_pos;
x4_points[i] = part.x4_pos;
if (i > 0) {
zeus::CVector3f delta = x4_vecs[i] - x4_vecs[i - 1];
zeus::CVector3f delta = x4_points[i] - x4_points[i - 1];
if (delta.magnitude() < 0.0011920929f)
x4_vecs[i] += delta.normalized() * 0.0011920929f;
x4_points[i] += delta.normalized() * 0.0011920929f;
}
}
x4_vecs[0] = x74_warpPoint;
x80_floatingPoint = x4_vecs[8];
x4_points[0] = x74_warpPoint;
x80_floatingPoint = x4_points[8];
xa0_26_processed = true;
}
zeus::CAABox CFlameWarp::CalculateBounds() const {
zeus::CAABox ret;
for (const auto& v : x4_points)
ret.accumulateBounds(v);
return ret;
}
} // namespace urde