Skip to content

Add precompiled headers for framework and RELs #2597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 1 commit into from
Aug 24, 2025
Merged

Add precompiled headers for framework and RELs #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .clangd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ Diagnostics:
- "bound_member_function"
- "typecheck_subscript_value"
- "unknown_typename"
---
If:
PathMatch: .*\.pch
CompileFlags:
Add: ["--language=c++", "--std=c++98"]
2 changes: 2 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"files.trimFinalNewlines": true,
"files.associations": {
"*.inc": "cpp",
"*.pch": "cpp",
"*.pch++": "cpp",
".clangd": "yaml",
},
// Disable C/C++ IntelliSense, use clangd instead
Expand Down
392 changes: 206 additions & 186 deletions configure.py
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ typedef struct _GXColorS10 GXColorS10;
*/
class J3DMatColorAnm {
public:
/* 8003B2B8 */ ~J3DMatColorAnm() {};
/* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {};
/* 8003B2B8 */ ~J3DMatColorAnm() {}
/* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
J3DMatColorAnm(u16 param_1, J3DAnmColor* param_2) {
field_0x0 = param_1;
mAnmFlag = 1;
Expand Down Expand Up @@ -42,8 +42,8 @@ class J3DMatColorAnm {
*/
class J3DTexNoAnm {
public:
/* 8003B1F8 */ ~J3DTexNoAnm() {};
/* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {};
/* 8003B1F8 */ ~J3DTexNoAnm() {}
/* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* param_2) {
field_0x4 = param_1;
mAnmFlag = 1;
Expand Down Expand Up @@ -73,8 +73,8 @@ class J3DTexNoAnm {
*/
class J3DTexMtxAnm {
public:
/* 8003B264 */ ~J3DTexMtxAnm() {};
/* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {};
/* 8003B264 */ ~J3DTexMtxAnm() {}
/* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* param_2) {
field_0x0 = param_1;
mAnmFlag = 1;
Expand Down Expand Up @@ -174,7 +174,7 @@ class J3DMaterialAnm {
/* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*);
/* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*);

/* 800A4820 */ virtual ~J3DMaterialAnm() {};
/* 800A4820 */ virtual ~J3DMaterialAnm() {}
/* 8032C3C4 */ virtual void calc(J3DMaterial*) const;

const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }
Expand Down
10 changes: 7 additions & 3 deletions include/JSystem/J3DGraphBase/J3DMatBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@ struct J3DColorChan {
u8 getAmbSrc() const { return (GXColorSrc)((u32)(mColorChanID & (1 << 6)) >> 6); }
u8 getMatSrc() const { return (GXColorSrc)(mColorChanID & 1); }
u8 getDiffuseFn() const { return ((u32)(mColorChanID & (3 << 7)) >> 7); }
// This function has to appear in J3DMatBlock.cpp because it generates extra data in .sdata2
inline u8 getAttnFn() const;
u8 getAttnFn() const {
u8 AttnArr[] = {2,0,2,1};
return AttnArr[(u32)(mColorChanID & (3 << 9)) >> 9];
}

void load() const {
J3DGDWrite_u32(setChanCtrlMacro(getEnable(), (GXColorSrc)getAmbSrc(), (GXColorSrc)getMatSrc(), getLightMask(),
Expand Down Expand Up @@ -1549,12 +1551,13 @@ struct J3DAlphaComp {
mRef1 = info.mRef1;
}

J3DAlphaComp& operator=(u16 id) { mID = id; }
J3DAlphaComp& operator=(u16 id) { mID = id; return *this; }

J3DAlphaComp& operator=(const J3DAlphaComp& rhs) {
mID = rhs.mID;
mRef0 = rhs.mRef0;
mRef1 = rhs.mRef1;
return *this;
}

void setAlphaCompInfo(const J3DAlphaCompInfo& info) {
Expand Down Expand Up @@ -1599,6 +1602,7 @@ struct J3DIndTexOrder : public J3DIndTexOrderInfo {
/* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
J3DIndTexOrder& operator=(J3DIndTexOrder const& other) {
*(u32*)this = *(u32*)&other;
return *this;
}
J3DIndTexOrder(J3DIndTexOrderInfo const& info) : J3DIndTexOrderInfo(info) {}
u8 getMap() const { return (GXTexMapID)mMap; }
Expand Down
1 change: 0 additions & 1 deletion include/JSystem/JAudio2/JASBasicWaveBank.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class JASWaveBank {
*/
struct JASBasicWaveBank : public JASWaveBank {
struct TWaveHandle : public JASWaveHandle {
/* 802985E4 */ ~TWaveHandle() {}
/* 80298B64 */ int getWavePtr() const;
/* 80298C18 */ TWaveHandle() { mHeap = NULL; }
/* 80298C64 */ const JASWaveInfo* getWaveInfo() const { return &field_0x4; }
Expand Down
1 change: 0 additions & 1 deletion include/JSystem/JAudio2/JASSimpleWaveBank.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

struct JASSimpleWaveBank : JASWaveBank, JASWaveArc {
struct TWaveHandle : JASWaveHandle {
/* 80298D84 */ ~TWaveHandle() {}
/* 80298F38 */ int getWavePtr() const;
/* 80298F5C */ TWaveHandle();
/* 80298F90 */ const JASWaveInfo* getWaveInfo() const;
Expand Down
2 changes: 1 addition & 1 deletion include/SSystem/SComponent/c_sxyz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct SVec {
class csXyz : public SVec {
public:
static const csXyz Zero;
/* 80018BD0 */ ~csXyz() {};
/* 80018BD0 */ ~csXyz() {}
/* inline */ csXyz() {}
/* inline */ csXyz(const csXyz& other) : SVec(other){};
/* 802673F4 */ csXyz(s16, s16, s16);
Expand Down
2 changes: 1 addition & 1 deletion include/SSystem/SComponent/c_xyz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct cXyz : Vec {
void zero() { set(0.0f, 0.0f, 0.0f); }

f32 getSquareMag() const { return VECSquareMag(this); }
f32 getSquareDistance(const Vec& other) const { return VECSquareDistance(this, &other); }
f32 getSquareDistance(const Vec& other) const { return PSVECSquareDistance(this, &other); }

static f32 getNearZeroValue() { return 8e-11f; }

Expand Down
4 changes: 4 additions & 0 deletions include/Z2AudioLib/Z2Calc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
#define Z2CALC_H

#include "dolphin/types.h"
#include "m_Do/m_Do_lib.h"

namespace Z2Calc {
// hack for f_op_actor, having this present breaks its weak func ordering
static const Vec cNullVec = {0.0f, 0.0f, 0.0f};

enum CurveSign {
CURVE_SIGN_0 = 0,
CURVE_SIGN_1 = 1,
Expand Down
47 changes: 0 additions & 47 deletions include/d/actor/d_a_b_dr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,51 +175,4 @@ class daB_DR_c : public fopEn_enemy_c {

STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860);


class daB_DR_HIO_c : public JORReflexible {
public:
/* 805BAE6C */ daB_DR_HIO_c();
/* 805C6B94 */ virtual ~daB_DR_HIO_c() {}

void genMessage(JORMContext*);

/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 model_size;
/* 0x0C */ f32 fall_accel;
/* 0x10 */ f32 fall_accel_max;
/* 0x14 */ f32 wind_large_attack_lockon_range;
/* 0x18 */ f32 unk_0x18;
/* 0x1C */ f32 wind_small_attack_power;
/* 0x20 */ f32 wind_attack_power;
/* 0x24 */ f32 glide_wind_power;
/* 0x28 */ f32 breath_attack_threshold;
/* 0x2C */ f32 unk_0x2c;
/* 0x30 */ f32 breath_move_speed_max;
/* 0x34 */ f32 breath_move_speed_min;
/* 0x38 */ s16 tail_hit_chance_time;
/* 0x3A */ s16 center_wind_time;
/* 0x3C */ s16 breath_continue_time;
/* 0x3E */ s16 breath_continue_no_armor_time;
/* 0x40 */ s16 breath_feint1_time;
/* 0x42 */ s16 breath_feint2_time;
/* 0x44 */ s16 breath_feint3_time;
/* 0x46 */ s16 no_attack_time;
/* 0x48 */ s16 unk_0x48;
/* 0x4A */ s16 no_attack_no_armor_time;
/* 0x4C */ s16 unk_0x4c;
/* 0x4E */ s16 back_hit_chance_time;
/* 0x50 */ s16 after_breath_chance_time;
/* 0x52 */ s16 neck_search_speed;
/* 0x54 */ s16 neck_search2_speed;
/* 0x56 */ s16 neck_search_speed_max;
/* 0x58 */ s16 body_search_speed;
/* 0x5A */ s16 body_search2_speed;
/* 0x5C */ s16 body_search_speed_max;
/* 0x5E */ s16 body_search_feint_speed_max;
/* 0x60 */ s16 feint_angle;
/* 0x62 */ s16 unk_0x62;
/* 0x64 */ u8 display_range;
/* 0x65 */ u8 breath_feint2_OFF;
};

#endif /* D_A_B_DR_H */
17 changes: 0 additions & 17 deletions include/d/actor/d_a_b_gg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,4 @@ class daB_GG_c : public fopEn_enemy_c {

STATIC_ASSERT(sizeof(daB_GG_c) == 0x116c);

class daB_GG_HIO_c : public JORReflexible {
public:
/* 805DE40C */ daB_GG_HIO_c();
/* 805EC9C4 */ virtual ~daB_GG_HIO_c() {}
void genMessage(JORMContext*) {}

/* 0x04 */ s8 id;
/* 0x08 */ f32 base_size;
/* 0x0C */ s16 takeoff_time;
/* 0x0E */ s16 fly_attack_wait_time;
/* 0x10 */ f32 fly_attack_speed;
/* 0x14 */ s16 takeoff2_time;
/* 0x16 */ s16 max_hp;
/* 0x18 */ f32 field_0x18;
};


#endif /* D_A_B_GG_H */
17 changes: 0 additions & 17 deletions include/d/actor/d_a_b_mgn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@
*
*/

class daB_MGN_HIO_c : public JORReflexible {
public:
/* 8060572C */ daB_MGN_HIO_c();
/* 8060F8D0 */ virtual ~daB_MGN_HIO_c() {}

void genMessage(JORMContext*);

/* 0x04 */ s8 no;
/* 0x08 */ f32 base_size;
/* 0x0C */ f32 dash_speed;
/* 0x10 */ f32 turn_speed;
/* 0x14 */ f32 dash_anim;
/* 0x18 */ f32 jewel_R;
/* 0x1C */ f32 jewel_G;
/* 0x20 */ f32 jewel_B;
};

class daB_MGN_c : public fopEn_enemy_c {
public:
enum daB_MGN_ACTION {
Expand Down
21 changes: 0 additions & 21 deletions include/d/actor/d_a_b_tn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ class daB_TN_c : public fopEn_enemy_c {
/* 8062C7C8 */ int _delete();
/* 8062C868 */ int CreateHeap();
/* 8062CD78 */ int create();
/* 8062D2F0 */ daB_TN_c() {};

private:
/* 0x05AC */ request_of_phase_process_class mPhaseReq1;
Expand Down Expand Up @@ -227,24 +226,4 @@ class daB_TN_c : public fopEn_enemy_c {

STATIC_ASSERT(sizeof(daB_TN_c) == 0x5630);

class daB_TN_HIO_c {
public:
/* 8061EBEC */ daB_TN_HIO_c();
/* 8062D98C */ virtual ~daB_TN_HIO_c() {};

/* 0x04 */ s8 mUnk1;
/* 0x08 */ f32 mScale;
/* 0x0C */ f32 mKColorA;
/* 0x10 */ f32 mTimer3Wolf;
/* 0x14 */ f32 mTimer3HumanType0;
/* 0x18 */ f32 mTimer3HumanType1;
/* 0x1C */ f32 mTimer3NormalType0;
/* 0x20 */ f32 mTimer3NormalType1;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 mTimer1Action1;
/* 0x2C */ f32 mTimer1Action2;
};

STATIC_ASSERT(sizeof(daB_TN_HIO_c) == 0x30);

#endif /* D_A_B_TN_H */
24 changes: 0 additions & 24 deletions include/d/actor/d_a_b_yo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,28 +231,4 @@ class daB_YO_c : public fopEn_enemy_c {

STATIC_ASSERT(sizeof(daB_YO_c) == 0x1B88);

class daB_YO_HIO_c {
public:
/* 8062F46C */ daB_YO_HIO_c();
/* 806395E4 */ virtual ~daB_YO_HIO_c() {}

/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 mScale[8];
/* 0x28 */ f32 mFreezardNum;
/* 0x2C */ f32 mMaxFallSpeed;
/* 0x30 */ f32 mReboundSpeedRatio;
/* 0x34 */ f32 mChaseSpeed;
/* 0x38 */ f32 mReboundSpeedMax;
/* 0x3C */ bool field_0x3c;
/* 0x40 */ f32 mGatherTimer;
/* 0x44 */ f32 mAttackTimer;
/* 0x48 */ f32 mFreezardRadius;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ bool field_0x54;
/* 0x58 */ f32 field_0x58;
};

STATIC_ASSERT(sizeof(daB_YO_HIO_c) == 0x5C);

#endif /* D_A_B_YO_H */
12 changes: 0 additions & 12 deletions include/d/actor/d_a_b_yo_ice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,4 @@ class daB_YOI_c : public fopEn_enemy_c {

STATIC_ASSERT(sizeof(daB_YOI_c) == 0xB3C);

class daB_YOI_HIO_c {
public:
/* 8063A14C */ daB_YOI_HIO_c();
/* 8063DBD0 */ virtual ~daB_YOI_HIO_c() {}

/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 mScaleY;
/* 0xC */ f32 mScaleXZ;
};

STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10);

#endif /* D_A_B_YO_ICE_H */
Loading