Add a precompiled header for RELs

Author: caseif

.clangd

@@ -14,3 +14,8 @@ Diagnostics:
     - "bound_member_function"
     - "typecheck_subscript_value"
     - "unknown_typename"
+---
+If:
+  PathMatch: .*\.pch
+CompileFlags:
+  Add: ["--language=c++", "--std=c++98"]

.vscode/settings.json

@@ -16,6 +16,8 @@
   "files.trimFinalNewlines": true,
   "files.associations": {
     "*.inc": "cpp",
+    "*.pch": "cpp",
+    "*.pch++": "cpp",
     ".clangd": "yaml",
   },
   // Disable C/C++ IntelliSense, use clangd instead

configure.py

@@ -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;
@@ -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;
@@ -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;
@@ -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]; }

include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h

@@ -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(),
@@ -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) {
@@ -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; }

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -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; }

include/JSystem/JAudio2/JASBasicWaveBank.h

@@ -7,7 +7,6 @@
 
 struct JASSimpleWaveBank : JASWaveBank, JASWaveArc {
     struct TWaveHandle : JASWaveHandle {
-        /* 80298D84 */ ~TWaveHandle() {}
         /* 80298F38 */ int getWavePtr() const;
         /* 80298F5C */ TWaveHandle();
         /* 80298F90 */ const JASWaveInfo* getWaveInfo() const;

include/JSystem/JAudio2/JASSimpleWaveBank.h

@@ -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);

include/SSystem/SComponent/c_sxyz.h

@@ -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; }
 

include/SSystem/SComponent/c_xyz.h

@@ -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,