d_magma work

This commit is contained in:
Jasper St. Pierre
2024-06-28 22:55:46 -07:00
parent 137dba66e3
commit 0fb34d24db
3 changed files with 121 additions and 38 deletions
+18 -9
View File
@@ -7,20 +7,29 @@
class dMagma_ball_c {
public:
dMagma_ball_c();
virtual ~dMagma_ball_c();
dMagma_ball_c() {}
virtual ~dMagma_ball_c() {}
virtual void calc(f32, u8, int) = 0;
virtual void update() = 0;
virtual void setup(f32, u8, int) = 0;
void draw();
BOOL rangeCheck(cXyz&, f32*);
public:
/* 0x04 */ cXyz mPos;
/* 0x10 */ f32 mScale;
/* 0x14 */ f32 mBaseY;
/* 0x18 */ s16 mWave;
/* 0x1C */ Mtx mPosMtx;
/* 0x4C */ Mtx mTexProjMtx;
/* 0x7C */ u8 mWaveTimer;
};
class dMagma_ballPath_c : public dMagma_ball_c {
public:
dMagma_ballPath_c();
virtual ~dMagma_ballPath_c();
dMagma_ballPath_c() {}
virtual ~dMagma_ballPath_c() {}
virtual void calc(f32, u8, int);
virtual void update();
virtual void setup(f32, u8, int);
@@ -28,7 +37,7 @@ public:
class dMagma_ballBoss_c : public dMagma_ball_c {
public:
dMagma_ballBoss_c();
dMagma_ballBoss_c() {}
virtual ~dMagma_ballBoss_c();
virtual void calc(f32, u8, int);
virtual void update();
@@ -50,12 +59,12 @@ public:
/* 0x04 */ u8 mBallNum;
/* 0x05 */ u8 mPathNo;
/* 0x06 */ u8 field_0x06[0x08 - 0x06];
/* 0x08 */ cXyz mBallPos;
/* 0x14 */ f32 mDistX;
/* 0x18 */ f32 mDistZ;
/* 0x08 */ cXyz mPos;
/* 0x14 */ f32 mScaleX;
/* 0x18 */ f32 mScaleZ;
/* 0x1C */ Mtx mPosMtx;
/* 0x4C */ Mtx mTexMtx0;
/* 0x7C */ Mtx mBallPostMtx0;
/* 0x7C */ Mtx mPostMtx0;
/* 0xAC */ dMagma_floor_c* mpNext;
};