Merge remote-tracking branch 'upstream/main' into d_menu_dmap

include/JSystem/J2DGraph/J2DWindow.h

@@ -44,14 +44,10 @@ public:
         param_0.mBR = mColorBR;
     }
     const JUtility::TColor& getWhite() const { return mWhite; }
-    bool setBlack(JUtility::TColor black) { mBlack = black; return true; }
-    void setContentsColor(TContentsColor c) {
-        setContentsColor(c.mTL, c.mTR, c.mBL, c.mBR);
-    }
-    void setContentsColor(JUtility::TColor c) {
-        setContentsColor(c, c, c, c);
-    }
-    bool setWhite(JUtility::TColor white) { mWhite = white; return true; }
+    void setBlack(JUtility::TColor black) { mBlack = black; }
+    void setContentsColor(TContentsColor param_0) { setContentsColor(param_0.mTL, param_0.mTR, param_0.mBL, param_0.mBR); }
+    void setContentsColor(JUtility::TColor param_0) { setContentsColor(param_0, param_0, param_0, param_0); }
+    void setWhite(JUtility::TColor white) { mWhite = white; }
 
 public:
     /* 0x0CC */ JUTTexture* mpFrameTexture1;

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -430,7 +430,7 @@ public:
     }
     u16 getUpdateMaterialNum() const { return mTrackNum / 3; }
     JUTNameTab * getUpdateMaterialName() { return &mUpdateMaterialName; }
-    u16 getUpdateTexMtxID(u16 idx) const {
+    int getUpdateTexMtxID(u16 idx) const {
         J3D_ASSERT(1017, idx < (mTrackNum / 3), "Error : range over.");
         return mUpdateTexMtxID[idx];
     }

include/JSystem/J3DGraphAnimator/J3DJoint.h

@@ -119,7 +119,6 @@ class J3DMtxCalcMayaAnm : public J3DMtxCalcMaya, public J3DMtxCalcAnm {
 public:
     J3DMtxCalcMayaAnm(J3DAnmTransform* pAnmTransform)
         : J3DMtxCalcMaya(), J3DMtxCalcAnm(pAnmTransform) {}
-    virtual ~J3DMtxCalcMayaAnm() {}
     virtual void calc(u16 jnt_no) { J3DMtxCalcAnm::calc(jnt_no); }
 };
 

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -9,8 +9,18 @@
 
 struct J3DGXColorS10 {
     J3DGXColorS10() {}
-    J3DGXColorS10(GXColorS10& other) { mColor = other; }
-    J3DGXColorS10(J3DGXColorS10& other) { mColor = other.mColor; }
+    J3DGXColorS10(GXColorS10& other) {
+        mColor.r = other.r;
+        mColor.g = other.g;
+        mColor.b = other.b;
+        mColor.a = other.a;
+    }
+    J3DGXColorS10(J3DGXColorS10& other) {
+        mColor.r = other.mColor.r;
+        mColor.g = other.mColor.g;
+        mColor.b = other.mColor.b;
+        mColor.a = other.mColor.a;
+    }
     J3DGXColorS10& operator=(const J3DGXColorS10& other) {
         mColor = other.mColor;
         return *this;
@@ -25,8 +35,18 @@ struct J3DGXColorS10 {
 
 struct J3DGXColor {
     J3DGXColor() {}
-    J3DGXColor(GXColor& other) { mColor = other; }
-    J3DGXColor(J3DGXColor& other) { mColor = other.mColor; }
+    J3DGXColor(GXColor& other) {
+        mColor.r = other.r;
+        mColor.g = other.g;
+        mColor.b = other.b;
+        mColor.a = other.a;
+    }
+    J3DGXColor(J3DGXColor& other) {
+        mColor.r = other.mColor.r;
+        mColor.g = other.mColor.g;
+        mColor.b = other.mColor.b;
+        mColor.a = other.mColor.a;
+    }
     J3DGXColor& operator=(const J3DGXColor& other) {
         mColor = other.mColor;
         return *this;

include/JSystem/J3DGraphBase/J3DSys.h

@@ -12,9 +12,10 @@ enum J3DError {
     J3DErrType_OutOfMemory = 4,
 };
 
-enum J3DSysDrawBuffer {
-    /* 0x0 */ OPA_BUFFER,
-    /* 0x1 */ XLU_BUFFER
+enum J3DSysDrawBuf {
+    /* 0x0 */ J3DSysDrawBuf_Opa,
+    /* 0x1 */ J3DSysDrawBuf_Xlu,
+    /* 0x2 */ J3DSysDrawBuf_MAX,
 };
 
 class J3DMtxCalc;

include/JSystem/JSystem.pch

@@ -1,7 +1,7 @@
 #ifndef JSYSTEM_PCH
 #define JSYSTEM_PCH
 
-#include "JSystem/JSupport/JSUList.h"
-#include "JSystem/J3DGraphBase/J3DShape.h"
+#include "JSystem/JSupport/JSUList.h" // IWYU pragma: export
+#include "JSystem/J3DGraphBase/J3DShape.h" // IWYU pragma: export
 
 #endif /* JSYSTEM_PCH */