Skip to content

Commit

Permalink
some cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@magcius
magcius committed Oct 11, 2023
1 parent 26f4f37 commit fdd914e
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
16 changes: 8 additions & 8 deletions include/JSystem/J3DGraphAnimator/J3DAnimation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,8 @@ class J3DAnmTexPattern : public J3DAnmBase {
class J3DAnmTevRegKey : public J3DAnmBase {
public:
J3DAnmTevRegKey();
void getTevColorReg(u16, _GXColorS10*) const;
void getTevKonstReg(u16, _GXColor*) const;
void getTevColorReg(u16, GXColorS10*) const;
void getTevKonstReg(u16, GXColor*) const;
void searchUpdateMaterialID(J3DMaterialTable*);
void searchUpdateMaterialID(J3DModelData*);

Expand Down Expand Up @@ -489,7 +489,7 @@ class J3DAnmColor : public J3DAnmBase {

virtual ~J3DAnmColor();
virtual s32 getKind() const;
virtual void getColor(u16, _GXColor*) const;
virtual void getColor(u16, GXColor*) const;

u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
bool isValidUpdateMaterialID(u16 id) const { return mUpdateMaterialID[id] != 0xFFFF; }
Expand All @@ -512,7 +512,7 @@ class J3DAnmColorKey : public J3DAnmColor {

virtual ~J3DAnmColorKey();
virtual s32 getKind() const;
virtual void getColor(u16, _GXColor*) const;
virtual void getColor(u16, GXColor*) const;

private:
/* 0x2C */ int field_0x2c;
Expand All @@ -528,7 +528,7 @@ class J3DAnmColorFull : public J3DAnmColor {

virtual ~J3DAnmColorFull();
virtual s32 getKind() const;
virtual void getColor(u16, _GXColor*) const;
virtual void getColor(u16, GXColor*) const;

private:
/* 0x2C */ int field_0x2c;
Expand All @@ -544,7 +544,7 @@ class J3DAnmVtxColor : public J3DAnmBase {

virtual ~J3DAnmVtxColor();
virtual s32 getKind() const;
virtual void getColor(u8, u16, _GXColor*) const;
virtual void getColor(u8, u16, GXColor*) const;

private:
/* 0x0C */ s16 mAnmTableNum[2];
Expand All @@ -557,7 +557,7 @@ class J3DAnmVtxColorKey : public J3DAnmVtxColor {

virtual ~J3DAnmVtxColorKey();
virtual s32 getKind() const;
virtual void getColor(u8, u16, _GXColor*) const;
virtual void getColor(u8, u16, GXColor*) const;

private:
/* 0x18 */ int field_0x18[2];
Expand All @@ -568,7 +568,7 @@ class J3DAnmVtxColorFull : public J3DAnmVtxColor {

virtual ~J3DAnmVtxColorFull();
virtual s32 getKind() const;
virtual void getColor(u8, u16, _GXColor*) const;
virtual void getColor(u8, u16, GXColor*) const;

private:
/* 0x18 */ int field_0x18[2];
Expand Down
6 changes: 3 additions & 3 deletions include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class J3DMatColorAnm {
void setAnmFlag(bool flag) { mAnmFlag = flag; }
bool getAnmFlag() const { return mAnmFlag; }
void setAnmColor(J3DAnmColor* anmColor) { mAnmColor = anmColor; }
void calc(_GXColor* pColor) const { mAnmColor->getColor(mAnmIndex, pColor); }
void calc(GXColor* pColor) const { mAnmColor->getColor(mAnmIndex, pColor); }

private:
/* 0x0 */ u16 mAnmIndex;
Expand Down Expand Up @@ -117,7 +117,7 @@ class J3DTevKColorAnm {
void setAnmFlag(bool flag) { mAnmFlag = flag; }
bool getAnmFlag() const { return mAnmFlag; }
void setAnmTevReg(J3DAnmTevRegKey* tevReg) { mAnmTevReg = tevReg; }
void calc(_GXColor* pColor) const { mAnmTevReg->getTevKonstReg(mAnmIndex, pColor); }
void calc(GXColor* pColor) const { mAnmTevReg->getTevKonstReg(mAnmIndex, pColor); }

private:
/* 0x0 */ u16 mAnmIndex;
Expand Down Expand Up @@ -147,7 +147,7 @@ class J3DTevColorAnm {
void setAnmFlag(bool flag) { mAnmFlag = flag; }
bool getAnmFlag() const { return mAnmFlag; }
void setAnmTevReg(J3DAnmTevRegKey* tevReg) { mAnmTevReg = tevReg; }
void calc(_GXColorS10* pColor) const { mAnmTevReg->getTevColorReg(mAnmIndex, pColor); }
void calc(GXColorS10* pColor) const { mAnmTevReg->getTevColorReg(mAnmIndex, pColor); }

private:
/* 0x0 */ u16 mAnmIndex;
Expand Down
4 changes: 2 additions & 2 deletions include/JSystem/J3DGraphBase/J3DSys.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct J3DSys {
void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }

void* getVtxCol() const { return mVtxCol; }
void setVtxCol(_GXColor* pVtxCol) { mVtxCol = pVtxCol; }
void setVtxCol(GXColor* pVtxCol) { mVtxCol = pVtxCol; }

void setModel(J3DModel* pModel) { mModel = pModel; }
void setShapePacket(J3DShapePacket* pPacket) { mShapePacket = pPacket; }
Expand Down Expand Up @@ -129,7 +129,7 @@ struct J3DSys {
/* 0x10C */ Mtx33* mModelNrmMtx;
/* 0x110 */ void* mVtxPos;
/* 0x114 */ void* mVtxNrm;
/* 0x118 */ _GXColor* mVtxCol;
/* 0x118 */ GXColor* mVtxCol;
/* 0x11C */ void* field_0x11c;
/* 0x120 */ void* field_0x120;
/* 0x124 */ Vec* mNBTScale;
Expand Down
2 changes: 1 addition & 1 deletion include/JSystem/JFramework/JFWDisplay.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class JFWDisplay {
void clearEfb_init();
void clearEfb(int param_0, int param_1, int param_2, int param_3, GXColor color);
void clearEfb();
void clearEfb(_GXColor color);
void clearEfb(GXColor color);
void calcCombinationRatio();

virtual void beginRender();
Expand Down
4 changes: 2 additions & 2 deletions include/JSystem/JParticle/JPADraw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class JPADraw {
/* 0x8F */ u8 mCalcChldVisNum;
/* 0x90 */ JPADrawContext mDrawContext;
/* 0xB4 */ f32 mScaleOut;
/* 0xB8 */ _GXColor mPrmColor;
/* 0xBC */ _GXColor mEnvColor;
/* 0xB8 */ GXColor mPrmColor;
/* 0xBC */ GXColor mEnvColor;
/* 0xC0 */ s16 mTexIdx;
/* 0xC2 */ u8 field_0xc2;
/* 0xC3 */ u8 field_0xC3[0xC4 - 0xC3];
Expand Down
28 changes: 14 additions & 14 deletions include/JSystem/JParticle/JPAEmitter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class JPACallBackBase {
public:
JPACallBackBase() {}
virtual ~JPACallBackBase() {}

inline virtual void init(T);
inline virtual void execute(T);
inline virtual void executeAfter(T);
Expand All @@ -41,7 +41,7 @@ class JPACallBackBase2 {
public:
JPACallBackBase2() {}
virtual ~JPACallBackBase2() {}

inline virtual void init(T, U);
inline virtual void execute(T, U);
inline virtual void draw(T, U);
Expand All @@ -50,7 +50,7 @@ class JPACallBackBase2 {
class JPABaseEmitter {
public:
typedef void (JPABaseEmitter::*VolumeFunc)();

void calcVolumePoint();
void calcVolumeLine();
void calcVolumeCircle();
Expand Down Expand Up @@ -81,22 +81,22 @@ class JPABaseEmitter {
void clearStatus(u32 status) { mFlags &= ~status; }
bool checkStatus(u32 status) { return mFlags & status; }
void initStatus(u32 status);

u8 getGlobalAlpha() { return mGlobalPrmColor.a; }
void setGlobalAlpha(u8 alpha) { mGlobalPrmColor.a = alpha; }
void setGlobalRTMatrix(MtxP mtx) {
JPASetRMtxTVecfromMtx(mtx, mGlobalRotation, mGlobalTranslation);
}
void setGlobalTranslation(f32 x, f32 y, f32 z) { mGlobalTranslation.set(x, y, z); }
void setGlobalScale(const JGeometry::TVec3<float>& scale) {
mGlobalScale.set(scale);
mGlobalScale2D.set(scale);
mGlobalDynamicsScale.set(scale);
mGlobalParticleScale.set(scale);
}
void setGlobalParticleScale(const JGeometry::TVec3<float>& scale) {
mGlobalScale2D.set(scale);
mGlobalParticleScale.set(scale);
}
void setGlobalDynamicsScale(const JGeometry::TVec3<float>& scale) {
mGlobalScale.set(scale);
mGlobalDynamicsScale.set(scale);
}
void setDirection(const JGeometry::TVec3<float>& dir) {
mEmitterDir.set(dir);
Expand All @@ -115,14 +115,14 @@ class JPABaseEmitter {
mMaxFrame = -1;
stopCreateParticle();
}

void setEmitterCallBackPtr(JPACallBackBase<JPABaseEmitter*>* callback) {
mpEmitterCallBack = callback;
}
void setParticleCallBackPtr(JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>* callback) {
mpParticleCallBack = callback;
}

/* 0x000 */ VolumeFunc mVolumeFunc;
/* 0x00C */ cXyz mEmitterScale;
/* 0x018 */ cXyz mEmitterTranslation;
Expand Down Expand Up @@ -167,11 +167,11 @@ class JPABaseEmitter {
/* 0x1A0 */ JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>* mpParticleCallBack;
/* 0x1A4 */ JMath::TRandom_fast_ mRandomSeed;
/* 0x1A8 */ Mtx mGlobalRotation;
/* 0x1D8 */ JGeometry::TVec3<f32> mGlobalScale;
/* 0x1D8 */ JGeometry::TVec3<f32> mGlobalDynamicsScale;
/* 0x1E4 */ JGeometry::TVec3<f32> mGlobalTranslation;
/* 0x1F0 */ JGeometry::TVec3<f32> mGlobalScale2D;
/* 0x1FC */ _GXColor mGlobalPrmColor;
/* 0x200 */ _GXColor mGlobalEnvColor;
/* 0x1F0 */ JGeometry::TVec3<f32> mGlobalParticleScale;
/* 0x1FC */ GXColor mGlobalPrmColor;
/* 0x200 */ GXColor mGlobalEnvColor;
/* 0x204 */ f32 mEmitCount;
/* 0x208 */ f32 mRateStepTimer;
/* 0x20C */ u32 mFlags;
Expand Down
2 changes: 1 addition & 1 deletion include/d/actor/d_a_player.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class daPy_mtxFollowEcallBack_c : public dPa_levelEcallBack {
void execute(JPABaseEmitter*);
void end();
void makeEmitter(u16, MtxP, const cXyz*, const cXyz*);
void makeEmitterColor(u16, MtxP, const cXyz*, const _GXColor*, const _GXColor*);
void makeEmitterColor(u16, MtxP, const cXyz*, const GXColor*, const GXColor*);
void setup(JPABaseEmitter* emitter, const cXyz*, const csXyz*, s8) { mpEmitter = emitter; }

/* 0x04 */ JPABaseEmitter* mpEmitter;
Expand Down
2 changes: 1 addition & 1 deletion include/d/actor/d_a_player_link.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class daPy_dmEcallBack_c {

class daPy_mtxPosFollowEcallBack_c {
public:
void makeEmitterColor(unsigned short, float(*)[4], const cXyz*, const csXyz*, const _GXColor*, const _GXColor*);
void makeEmitterColor(unsigned short, float(*)[4], const cXyz*, const csXyz*, const GXColor*, const GXColor*);
void execute(JPABaseEmitter*);
daPy_mtxPosFollowEcallBack_c();
~daPy_mtxPosFollowEcallBack_c();
Expand Down
2 changes: 1 addition & 1 deletion include/d/d_drawlist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ struct dDlst_alphaModel_c {
s32 getNum() { return mNum; }

public:
/* 0x00 */ _GXColor mColor;
/* 0x00 */ GXColor mColor;
/* 0x04 */ s16 mCapacity;
/* 0x06 */ s16 mNum;
/* 0x08 */ dDlst_alphaModelData_c* mpData;
Expand Down
4 changes: 2 additions & 2 deletions include/d/d_particle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class dPa_smokeEcallBack : public dPa_followEcallBack {
public:
dPa_smokeEcallBack(u8=1);
dPa_smokeEcallBack(u8, u8, u8, u8);
dPa_smokeEcallBack(const _GXColor&, dKy_tevstr_c*, u8);
dPa_smokeEcallBack(const GXColor&, dKy_tevstr_c*, u8);
virtual ~dPa_smokeEcallBack() {}

virtual void draw(JPABaseEmitter*);
Expand All @@ -73,7 +73,7 @@ class dPa_smokeEcallBack : public dPa_followEcallBack {

/* 0x14 */ s8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ _GXColor field_0x16;
/* 0x16 */ GXColor field_0x16;
/* 0x1A */ u8 field_0x1A[0x1C - 0x1A];
/* 0x1C */ dKy_tevstr_c* mTevstr;
};
Expand Down

0 comments on commit fdd914e

Please sign in to comment.