d_particle OK

2 files changed, 11 insertions, 9 deletions

diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h
index f1811246..73a7a6f6 100644
--- a/include/JSystem/JParticle/JPADynamicsBlock.h
+++ b/include/JSystem/JParticle/JPADynamicsBlock.h
@@ -3,8 +3,8 @@
 
 #include "common.h"
 
-#include "JSystem/JGeometry.h"
 #include "egg/math/eggVector.h"
+#include "m/m_angle.h"
 
 
 class JPAEmitterWorkData;
@@ -36,7 +36,7 @@ struct JPADynamicsBlockData {
     /* 0x5C */ f32 mVolumeMinRad;
     /* 0x60 */ f32 mAirResist;
     /* 0x64 */ f32 mMoment;
-    /* 0x68 */ JGeometry::TVec3<s16> mEmitterRot;
+    /* 0x68 */ mAng3_c mEmitterRot;
     /* 0x6E */ s16 mMaxFrame;
     /* 0x70 */ s16 mStartFrame;
     /* 0x72 */ s16 mLifeTime;
@@ -83,7 +83,7 @@ public:
     void getEmitterDir(EGG::Vector3f* vec) const { 
         vec->set(mpData->mEmitterDir.x, mpData->mEmitterDir.y, mpData->mEmitterDir.z); 
     }
-    void getEmitterRot(JGeometry::TVec3<s16>* vec) const { 
+    void getEmitterRot(mAng3_c* vec) const { 
         vec->set(mpData->mEmitterRot.x, mpData->mEmitterRot.y, mpData->mEmitterRot.z); 
     } 
     s16 getMaxFrame() { return mpData->mMaxFrame; }
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index d8900bff..6e49752f 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -9,6 +9,8 @@
 #include "JSystem/JParticle/JPAMath.h"
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JSupport/JSUList.h"
+#include "egg/math/eggVector.h"
+#include "m/m_angle.h"
 
 class JPAResourceManager;
 class JPABaseEmitter;
@@ -47,8 +49,8 @@ struct JPAEmitterWorkData {
     /* 0x120 */ EGG::Vector3f mGlobalEmtrDir;
     /* 0x12C */ EGG::Vector3f mPublicScale;
     /* 0x138 */ EGG::Vector3f mGlobalPos;
-    /* 0x144 */ JGeometry::TVec2<f32> mGlobalPtclScl;
-    /* 0x14C */ JGeometry::TVec2<f32> mPivot;
+    /* 0x144 */ EGG::Vector2f mGlobalPtclScl;
+    /* 0x14C */ EGG::Vector2f mPivot;
     /* 0x154 */ Mtx mYBBCamMtx;
     /* 0x184 */ Mtx mPosCamMtx;
     /* 0x1B4 */ Mtx mPrjMtx;
@@ -136,7 +138,7 @@ public:
     void setGlobalTranslation(f32 x, f32 y, f32 z) { mGlobalTrs.set(x, y, z); }
     void setGlobalTranslation(const EGG::Vector3f& trs) { mGlobalTrs.set(trs); }
     void getLocalTranslation(EGG::Vector3f& vec) { vec.set(mLocalTrs); }
-    void setGlobalRotation(const JGeometry::TVec3<s16>& rot) {
+    void setGlobalRotation(const mAng3_c& rot) {
         JPAGetXYZRotateMtx(rot.x, rot.y, rot.z, mGlobalRot); 
     }
     void getGlobalTranslation(EGG::Vector3f* out) const { out->set(mGlobalTrs); }
@@ -152,7 +154,7 @@ public:
     void setAwayFromAxisSpeed(f32 i_speed) { mAwayFromAxisSpeed = i_speed; }
     void setSpread(f32 i_spread) { mSpread = i_spread; }
     void setLocalTranslation(const EGG::Vector3f& i_trans) { mLocalTrs.set(i_trans); }
-    void setLocalRotation(const JGeometry::TVec3<s16>& i_rot) { mLocalRot.set(i_rot.x * 0.005493248f, i_rot.y * 0.005493248f, i_rot.z * 0.005493248f); }
+    void setLocalRotation(const mAng3_c& i_rot) { mLocalRot.set(i_rot.x * 0.005493248f, i_rot.y * 0.005493248f, i_rot.z * 0.005493248f); }
     void setRateStep(u8 i_step) { mRateStep = i_step; }
 
     void setGlobalParticleHeightScale(f32 height) {
@@ -232,7 +234,7 @@ public:
     /* 0x40 */ f32 mSpread;
     /* 0x44 */ f32 mRndmDirSpeed;
     /* 0x48 */ f32 mAirResist;
-    /* 0x4C */ JGeometry::TVec3<s16> mLocalRot;
+    /* 0x4C */ mAng3_c mLocalRot;
     /* 0x52 */ s16 mLifeTime;
     /* 0x54 */ u16 mVolumeSize;
     /* 0x56 */ u8 mRateStep;
@@ -240,7 +242,7 @@ public:
     /* 0x68 */ Mtx mGlobalRot;
     /* 0x98 */ EGG::Vector3f mGlobalScl;
     /* 0xA4 */ EGG::Vector3f mGlobalTrs;
-    /* 0xB0 */ JGeometry::TVec2<f32> mGlobalPScl;
+    /* 0xB0 */ EGG::Vector2f mGlobalPScl;
     /* 0xB8 */ GXColor mGlobalPrmClr;
     /* 0xBC */ GXColor mGlobalEnvClr;
     /* 0xC0 */ s32 mpUserWork;