match 3 JPA TUs

This commit is contained in:
LagoLunatic
2023-11-07 17:54:55 -05:00
parent ba0374420c
commit 14d71dae68
5 changed files with 17 additions and 25 deletions
+2 -6
View File
@@ -25,9 +25,7 @@ struct TVec3<s16> {
s16 x, y, z;
TVec3& operator=(const TVec3& b) {
x = b.x;
y = b.y;
z = b.z;
set(b.x, b.y, b.z);
return *this;
}
@@ -142,9 +140,7 @@ struct TVec3<f32> {
// }
inline TVec3<f32>& operator=(const TVec3<f32>& b) {
x = b.x;
y = b.y;
z = b.z;
set(b.x, b.y, b.z);
return *this;
}
+6 -6
View File
@@ -44,6 +44,12 @@ public:
virtual void getEmitterRot(JGeometry::TVec3<s16>&) = 0;
virtual void getEmitterTrs(JGeometry::TVec3<f32>&) = 0;
virtual void getEmitterDir(JGeometry::TVec3<f32>&) = 0;
virtual f32 getInitVelOmni() = 0;
virtual f32 getInitVelAxis() = 0;
virtual f32 getInitVelRndm() = 0;
virtual f32 getInitVelDir() = 0;
virtual f32 getSpread() = 0;
virtual f32 getInitVelRatio() = 0;
virtual u32 getVolumeType() = 0;
virtual u32 getVolumeSize() = 0;
virtual f32 getVolumeSweep() = 0;
@@ -56,12 +62,6 @@ public:
virtual u32 getStartFrame() = 0;
virtual u32 getLifeTime() = 0;
virtual f32 getLifeTimeRndm() = 0;
virtual f32 getInitVelOmni() = 0;
virtual f32 getInitVelAxis() = 0;
virtual f32 getInitVelRndm() = 0;
virtual f32 getInitVelDir() = 0;
virtual f32 getSpread() = 0;
virtual f32 getInitVelRatio() = 0;
virtual f32 getAccel() = 0;
virtual f32 getAccelRndm() = 0;
virtual f32 getAirResist() = 0;
+3 -3
View File
@@ -24,10 +24,10 @@ class JPAFieldBlock {
public:
virtual ~JPAFieldBlock() {}
virtual u32 getType() = 0;
virtual u32 getVelType() = 0;
virtual u32 getSttFlag() = 0;
virtual u32 getCycle() = 0;
virtual u32 getID() = 0;
virtual u32 getVelType() = 0;
virtual u32 getCycle() = 0;
virtual u32 getSttFlag() = 0;
virtual void getPos(JGeometry::TVec3<float>&) = 0;
virtual void getDir(JGeometry::TVec3<float>&) = 0;
virtual f32 getMag() = 0;