diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-04-14 10:13:24 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-04-14 10:13:40 -0700 |
| commit | ecb0ece9912fed025907336cd60c258eb21686e8 (patch) | |
| tree | 364b4f4f93f141e9fc916ec2e95a7643f7a6e904 /include/JSystem | |
| parent | d3985aa24da4d93834e8e647f07cdd65fbc104a2 (diff) | |
JPAField work
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JGeometry.h | 8 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAField.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 0a711c9f..f9e9f68d 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -164,7 +164,7 @@ struct TVec3<f32> : public Vec { } f32 dot(const TVec3<f32>& b) const { - return x*b.x + y*b.y * z*b.z; + return x*b.x + y*b.y + z*b.z; } f32 squared() const { @@ -195,7 +195,11 @@ struct TVec3<f32> : public Vec { } void cross(const TVec3<f32>& a, const TVec3<f32>& b) { - VECCrossProduct(a, b, *this); + set( + a.y * b.z - a.z * b.y, + a.z * b.x - a.x * b.z, + a.x * b.y - a.y * b.x + ); } void setLength(f32 len) { diff --git a/include/JSystem/JParticle/JPAField.h b/include/JSystem/JParticle/JPAField.h index 4cfaa882..d455b2c5 100644 --- a/include/JSystem/JParticle/JPAField.h +++ b/include/JSystem/JParticle/JPAField.h @@ -37,11 +37,7 @@ public: /* 0x04 */ JPABaseField * mpBaseField; /* 0x08 */ JSULink<JPAFieldData> mLink; /* 0x18 */ JGeometry::TVec3<f32> mVel; - /* 0x24 */ JGeometry::TVec3<f32> mLocalPos; - /* 0x30 */ f32 mAirMinDist; - /* 0x34 */ u32 field_0x34; - /* 0x38 */ u32 field_0x38; - /* 0x3C */ JGeometry::TVec3<f32> mLocalDir; + /* 0x24 */ JGeometry::TVec3<f32> mWork[3]; /* 0x48 */ f32 mMaxDistSq; /* 0x4C */ f32 mFadeOutRate; /* 0x50 */ f32 mFadeInRate; |