diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-08-17 08:19:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-16 22:19:53 -0700 |
| commit | 18f4489dd6e7996152bc385ec89a340dccaafe8a (patch) | |
| tree | 5800d04bb9c99f47ecdf03cf0521df9a3e3772bc /include/JSystem | |
| parent | edd2d30a337a69c6a0228a172108ce17d3253697 (diff) | |
d_particle almost finished (#2193)
* d_particle almost finished
* Remove dolasm.h include from JKRDvdRipper
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JGeometry.h | 13 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAParticle.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index bbc4eae903..079fcf8d1b 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -305,6 +305,19 @@ struct TVec3<f32> : public Vec { }; return res; } + + void cubic(const TVec3<f32>& param_1, const TVec3<f32>& param_2, const TVec3<f32>& param_3, + const TVec3<f32>& param_4, f32 param_5) { + f32 fVar5 = param_5 * param_5; + f32 fVar6 = fVar5 * param_5; + f32 fVar8 = 1.0f + (2.0f * fVar6 - 3.0f * fVar5); + f32 fVar9 = -2.0f * fVar6 + 3.0f * fVar5; + f32 fVar7 = param_5 + (fVar6 - 2.0f * fVar5); + f32 fVar4 = fVar6 - fVar5; + x = fVar8 * param_1.x + fVar9 * param_4.x + fVar7 * param_2.x + fVar4 * param_3.x; + y = fVar8 * param_1.y + fVar9 * param_4.y + fVar7 * param_2.y + fVar4 * param_3.y; + z = fVar8 * param_1.z + fVar9 * param_4.z + fVar7 * param_2.z + fVar4 * param_3.z; + } }; template <typename T> diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index ebedcc6549..5d057476d9 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -43,6 +43,7 @@ public: void setDeleteParticleFlag() { setStatus(2); } void getVelVec(JGeometry::TVec3<f32>& vec) const { vec.set(mVelocity); } void getLocalPosition(JGeometry::TVec3<f32>& vec) const { vec.set(mLocalPosition); } + void getBaseAxis(JGeometry::TVec3<f32>& vec) const { vec.set(mBaseAxis); } public: /* 0x00 */ JGeometry::TVec3<f32> mPosition; |