Merge branch 'master' into d_a_do

This commit is contained in:
Pheenoh
2023-02-04 16:09:33 -07:00
427 changed files with 8123 additions and 19099 deletions
+7 -1
View File
@@ -21,7 +21,13 @@ enum J2DRotateAxis {
/* 0x7A */ ROTATE_Z = 'z'
};
enum J2DBasePosition {};
enum J2DBasePosition {
J2DBasePosition_0,
J2DBasePosition_1,
J2DBasePosition_2,
J2DBasePosition_3,
J2DBasePosition_4,
};
struct J2DPaneHeader {
/* 0x0 */ u32 mKind;
+19 -3
View File
@@ -55,9 +55,25 @@ struct TVec3<f32> {
void zero() { x = y = z = 0.0f; }
void mul(const TVec3<f32>& a, const TVec3<f32>& b) {
x = a.x * b.x;
y = a.y * b.y;
z = a.z * b.z;
register f32* dst = &x;
const register f32* srca = &a.x;
const register f32* srcb = &b.x;
register f32 a_x_y;
register f32 b_x_y;
register f32 x_y;
register f32 za;
register f32 zb;
register f32 z;
asm {
psq_l a_x_y, 0(srca), 0, 0
psq_l b_x_y, 0(srcb), 0, 0
ps_mul x_y, a_x_y, b_x_y
psq_st x_y, 0(dst), 0, 0
lfs za, 8(srca)
lfs zb, 8(srcb)
fmuls z, za, zb
stfs z, 8(dst)
};
}
inline TVec3<f32>& operator=(const TVec3<f32>& b) {
+4 -4
View File
@@ -53,10 +53,10 @@ public:
f32 get_rndm_zh() {
f32 f = get_rndm_f();
return f - 1.0f;
return f - 0.5f;
}
s16 get_rndm_ss() { return ((s16)get_rndm_u()) >> 16; }
s16 get_rndm_ss() { return (s16)(get_rndm_u() >> 16); }
public:
u32 mSeed;
@@ -161,8 +161,8 @@ struct JPAEmitterWorkData {
/* 0x34 */ f32 mVolumeSize;
/* 0x38 */ f32 mVolumeMinRad;
/* 0x3C */ f32 mVolumeSweep;
/* 0x40 */ u32 mEmitCount;
/* 0x44 */ u32 mVolumeEmitIdx;
/* 0x40 */ s32 mEmitCount;
/* 0x44 */ s32 mVolumeEmitIdx;
/* 0x48 */ Mtx mDirectionMtx;
/* 0x78 */ Mtx mRotationMtx;
/* 0xA8 */ Mtx mGlobalRot;