summaryrefslogtreecommitdiff
path: root/include/JSystem/J3DGraphAnimator
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2024-04-12 00:10:30 -0600
committerGitHub <noreply@github.com>2024-04-12 00:10:30 -0600
commita61e3491f7c46b698514af50464cf71ba76bd3a3 (patch)
tree40dbf46b97316a5a6d919e35c9976506df869000 /include/JSystem/J3DGraphAnimator
parentb36f0f93660b0b1eee5268acad6c1b7b60f0bb5d (diff)
d_a_e_fz work, doxygen revamp (#2127)
* initial freezard actor struct + setActionMode OK * daE_FZ_Draw * setReflectAngle * mBoundSoundset * daE_FZ_Execute & execute * demoDelete * daE_FZ_Delete & _delete * CreateHeap * useHeapInit * cc_set * mtx_set * action WIP * way_gake_check * executeRollMove * executeMove * draw WIP * executeDamage * checkpoint * create * checkpoint * daE_FZ_c::executeWait * checkpoint * daE_FZ_c::damage_check almost done * rm asm * rm headers * setup_profile WIP + doxygen update * fix merge issues * docs fix? * fix2 * doxygen updates * setup g_profile_E_FZ, profile setup script WIP * update github actions * update progress.md
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DAnimation.h181
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DCluster.h16
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DJoint.h36
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DJointTree.h13
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h24
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h4
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DModel.h14
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DModelData.h4
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h5
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DShapeTable.h5
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DSkinDeform.h13
11 files changed, 308 insertions, 7 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index 98627e90f1..4cfa7cfab3 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -3,7 +3,6 @@
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/JUtility/JUTNameTab.h"
-#include "global.h"
struct JUTDataBlockHeader {
/* 0x0 */ u32 mType;
@@ -28,12 +27,20 @@ struct JUTDataFileHeader { // actual struct name unknown
typedef struct _GXColor GXColor;
typedef struct _GXColorS10 GXColorS10;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmKeyTableBase {
/* 0x00 */ u16 mMaxFrame;
/* 0x02 */ u16 mOffset;
/* 0x04 */ u16 mType;
}; // Size = 0x6
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmColorKeyTable {
J3DAnmKeyTableBase mRInfo;
J3DAnmKeyTableBase mGInfo;
@@ -41,11 +48,19 @@ struct J3DAnmColorKeyTable {
J3DAnmKeyTableBase mAInfo;
}; // Size = 0x18
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmVtxColorIndexData {
/* 0x00 */ u16 mNum;
/* 0x04 */ void* mpData;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmColorFullTable {
/* 0x00 */ u16 mRMaxFrame;
/* 0x02 */ u16 mROffset;
@@ -57,17 +72,29 @@ struct J3DAnmColorFullTable {
/* 0x0E */ u16 mAOffset;
}; // Size = 0x10
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmVisibilityFullTable {
u16 _0;
u16 _2;
}; // Size = 0x4
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTransformKeyTable {
J3DAnmKeyTableBase mScaleInfo;
J3DAnmKeyTableBase mRotationInfo;
J3DAnmKeyTableBase mTranslateInfo;
}; // Size = 0x12
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTransformFullTable {
/* 0x00 */ u16 mScaleMaxFrame;
/* 0x02 */ u16 mScaleOffset;
@@ -77,6 +104,10 @@ struct J3DAnmTransformFullTable {
/* 0x0A */ u16 mTranslateOffset;
}; // Size = 0xC
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTexPatternFullTable {
/* 0x00 */ u16 mMaxFrame;
/* 0x02 */ u16 mOffset;
@@ -84,6 +115,10 @@ struct J3DAnmTexPatternFullTable {
/* 0x06 */ u16 _6;
}; // Size = 0x8
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmCRegKeyTable {
/* 0x00 */ J3DAnmKeyTableBase mRTable;
/* 0x06 */ J3DAnmKeyTableBase mGTable;
@@ -93,6 +128,10 @@ struct J3DAnmCRegKeyTable {
u8 padding[3];
}; // Size = 0x1C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmKRegKeyTable {
/* 0x00 */ J3DAnmKeyTableBase mRTable;
/* 0x06 */ J3DAnmKeyTableBase mGTable;
@@ -102,11 +141,19 @@ struct J3DAnmKRegKeyTable {
u8 padding[3];
}; // Size = 0x1C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmDataBlockHeader { // actual name unknown
/* 0x0 */ u32 mType;
/* 0x4 */ u32 mNextOffset;
}; // Size = 0x8
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmDataHeader { // actual name unknown
/* 0x00 */ u32 mMagic;
/* 0x04 */ u32 mType;
@@ -116,6 +163,10 @@ struct J3DAnmDataHeader { // actual name unknown
/* 0x20 */ J3DAnmDataBlockHeader mFirst;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmVtxColorFullData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -134,6 +185,10 @@ struct J3DAnmVtxColorFullData {
STATIC_ASSERT(sizeof(J3DAnmVtxColorFullData) == 0x40);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmVisibilityFullData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -147,6 +202,10 @@ struct J3DAnmVisibilityFullData {
STATIC_ASSERT(sizeof(J3DAnmVisibilityFullData) == 0x18);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTransformFullData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -162,6 +221,10 @@ struct J3DAnmTransformFullData {
STATIC_ASSERT(sizeof(J3DAnmTransformFullData) == 0x24);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmColorKeyData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -183,6 +246,10 @@ struct J3DAnmColorKeyData {
STATIC_ASSERT(sizeof(J3DAnmColorKeyData) == 0x34);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTextureSRTKeyData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -217,6 +284,10 @@ struct J3DAnmTextureSRTKeyData {
STATIC_ASSERT(sizeof(J3DAnmTextureSRTKeyData) == 0x60);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmVtxColorKeyData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -235,6 +306,10 @@ struct J3DAnmVtxColorKeyData {
STATIC_ASSERT(sizeof(J3DAnmVtxColorKeyData) == 0x40);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTexPatternFullData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -250,6 +325,10 @@ struct J3DAnmTexPatternFullData {
STATIC_ASSERT(sizeof(J3DAnmTexPatternFullData) == 0x20);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTevRegKeyData {
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -283,6 +362,10 @@ struct J3DAnmTevRegKeyData {
STATIC_ASSERT(sizeof(J3DAnmTevRegKeyData) == 0x58);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmColorFullData { /* PlaceHolder Structure */
/* 0x00 */ J3DAnmDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -301,10 +384,18 @@ struct J3DAnmColorFullData { /* PlaceHolder Structure */
STATIC_ASSERT(sizeof(J3DAnmColorFullData) == 0x34);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmClusterKeyTable {
/* 0x00 */ J3DAnmKeyTableBase mWeightTable;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmTransformKeyData {
/* 0x00 */ JUTDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -318,6 +409,10 @@ struct J3DAnmTransformKeyData {
/* 0x20 */ s32 field_0x20;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmClusterKeyData {
/* 0x00 */ JUTDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -327,6 +422,10 @@ struct J3DAnmClusterKeyData {
/* 0x14 */ s32 mWeightOffset;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmClusterFullData {
/* 0x00 */ JUTDataBlockHeader mHeader;
/* 0x08 */ u8 field_0x8;
@@ -336,11 +435,19 @@ struct J3DAnmClusterFullData {
/* 0x14 */ s32 mWeightOffset;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DAnmClusterFullTable {
u16 mMaxFrame;
u16 mOffset;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmBase {
public:
J3DAnmBase() {
@@ -371,6 +478,10 @@ public:
/* 0x8 */ f32 mFrame;
}; // Size: 0xC
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTransform : public J3DAnmBase {
public:
/* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*);
@@ -388,6 +499,10 @@ public:
/* 0x1E */ s16 field_0x1e;
}; // Size: 0x20
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTransformKey : public J3DAnmTransform {
public:
J3DAnmTransformKey() : J3DAnmTransform(0, NULL, NULL, NULL) {
@@ -405,6 +520,10 @@ public:
/* 0x24 */ J3DAnmTransformKeyTable* mAnmTable;
}; // Size: 0x28
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTransformFull : public J3DAnmTransform {
public:
J3DAnmTransformFull() : J3DAnmTransform(0, NULL, NULL, NULL) { mAnmTable = NULL; }
@@ -416,6 +535,10 @@ public:
/* 0x20 */ J3DAnmTransformFullTable* mAnmTable;
}; // Size: 0x24
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull {
public:
/* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp();
@@ -427,6 +550,10 @@ struct J3DTextureSRTInfo;
class J3DModelData;
class J3DMaterialTable;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTextureSRTKey : public J3DAnmBase {
public:
/* 80329E5C */ J3DAnmTextureSRTKey();
@@ -477,6 +604,10 @@ public:
/* 0x78 */ u32 mTexMtxCalcType;
}; // Size: 0x7C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTexPattern : public J3DAnmBase {
public:
/* 8032AED8 */ J3DAnmTexPattern();
@@ -500,6 +631,10 @@ public:
/* 0x1C */ JUTNameTab mUpdateMaterialName;
}; // Size: 0x2C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmTevRegKey : public J3DAnmBase {
public:
/* 8032AE18 */ J3DAnmTevRegKey();
@@ -549,6 +684,10 @@ public:
/* 0x6C */ s16* mAnmKRegDataA;
}; // Size: 0x70
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmColor : public J3DAnmBase {
public:
/* 8032A828 */ J3DAnmColor();
@@ -571,6 +710,10 @@ public:
/* 0x1C */ JUTNameTab mUpdateMaterialName;
}; // Size: 0x2C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmColorKey : public J3DAnmColor {
public:
/* 8032AB00 */ J3DAnmColorKey();
@@ -586,6 +729,10 @@ public:
/* 0x3C */ J3DAnmColorKeyTable* field_0x3c;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmColorFull : public J3DAnmColor {
public:
/* 8032AB00 */ J3DAnmColorFull();
@@ -601,6 +748,10 @@ public:
/* 0x3C */ J3DAnmColorFullTable* mAnmTable;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmVtxColor : public J3DAnmBase {
public:
J3DAnmVtxColor();
@@ -613,6 +764,10 @@ public:
/* 0x10 */ J3DAnmVtxColorIndexData* mAnmVtxColorIndexData[2];
}; // Size: 0x18
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmVtxColorKey : public J3DAnmVtxColor {
public:
/* 8032A4E0 */ J3DAnmVtxColorKey();
@@ -628,6 +783,10 @@ public:
/* 0x30 */ s16* mColorA;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmVtxColorFull : public J3DAnmVtxColor {
public:
/* 8032A30C */ J3DAnmVtxColorFull();
@@ -643,6 +802,10 @@ public:
/* 0x30 */ u8* mColorA;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmCluster : public J3DAnmBase {
public:
J3DAnmCluster(s16 param_1, f32* param_2) : J3DAnmBase(param_1) { mWeight = param_2; }
@@ -654,6 +817,10 @@ public:
/* 0x0C */ f32* mWeight;
}; // Size: 0x10
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmClusterFull : public J3DAnmCluster {
public:
J3DAnmClusterFull() : J3DAnmCluster(0, 0) { mAnmTable = NULL; }
@@ -665,6 +832,10 @@ public:
/* 0x10 */ J3DAnmClusterFullTable* mAnmTable;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmClusterKey : public J3DAnmCluster {
public:
J3DAnmClusterKey() : J3DAnmCluster(0, NULL) { mAnmTable = NULL; }
@@ -676,6 +847,10 @@ public:
/* 0x10 */ J3DAnmClusterKeyTable* mAnmTable;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DAnmVisibilityFull : public J3DAnmBase {
public:
J3DAnmVisibilityFull() : J3DAnmBase(0) {
@@ -694,6 +869,10 @@ public:
/* 0x14 */ u8* mVisibility;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DFrameCtrl {
public:
enum Attribute_e {
diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h
index 221fd98d99..ea9fbe2b7b 100644
--- a/include/JSystem/J3DGraphAnimator/J3DCluster.h
+++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h
@@ -11,6 +11,10 @@ class J3DModel;
class J3DAnmCluster;
class JUTNameTab;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DCluster {
public:
void operator=(const J3DCluster& other) {
@@ -44,6 +48,10 @@ public:
/* 0x20 */ J3DDeformer* mDeformer;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DClusterKey {
public:
void operator=(const J3DClusterKey& other) {
@@ -59,6 +67,10 @@ public:
/* 0x08 */ void* field_0x8;
}; // Size: 0x0C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DDeformData {
public:
/* 8032E1F8 */ J3DDeformData();
@@ -88,6 +100,10 @@ public:
/* 0x24 */ JUTNameTab* mClusterKeyName;
}; // Size: 0x28
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DClusterVertex {
public:
void operator=(const J3DClusterVertex& other) {
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index 093cc448e0..fa69713582 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -8,6 +8,10 @@ class J3DJoint;
class J3DMaterial;
class J3DMtxBuffer;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DMtxCalc {
public:
/* 80325D1C */ static void setMtxBuffer(J3DMtxBuffer*);
@@ -30,11 +34,19 @@ public:
static J3DJoint* mJoint;
}; // Size: 0x4
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DMtxCalcNoAnmBase : public J3DMtxCalc {
public:
/* 8000FA8C */ virtual ~J3DMtxCalcNoAnmBase();
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
template <class A, class B>
class J3DMtxCalcNoAnm : public J3DMtxCalcNoAnmBase {
public:
@@ -47,6 +59,10 @@ public:
class J3DJoint;
typedef int (*J3DJointCallBack)(J3DJoint*, int);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DJoint {
public:
/* 8032F13C */ void appendChild(J3DJoint*);
@@ -93,22 +109,42 @@ private:
/* 0x58 */ J3DMaterial* mMesh;
}; // Size: 0x5C
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DMtxCalcJ3DSysInitMaya {
/* 8032ECAC */ static void init(const Vec&, const Mtx& param_1);
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DMtxCalcJ3DSysInitBasic {
/* 8032EC28 */ static void init(const Vec&, const Mtx& param_1);
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DMtxCalcCalcTransformSoftimage {
/* 8032EE50 */ static void calcTransform(J3DTransformInfo const&);
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DMtxCalcCalcTransformMaya {
/* 8032EFBC */ static void calcTransform(J3DTransformInfo const&);
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DMtxCalcCalcTransformBasic {
/* 8032ED30 */ static void calcTransform(J3DTransformInfo const&);
};
diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index 542d513006..e0b809eb25 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -2,10 +2,13 @@
#define J3DJOINTTREE_H
#include "JSystem/J3DGraphAnimator/J3DJoint.h"
-#include "dolphin/types.h"
class JUTNameTab;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DModelHierarchy {
/* 0x0 */ u16 mType;
/* 0x2 */ u16 mValue;
@@ -13,6 +16,10 @@ struct J3DModelHierarchy {
class J3DMaterialTable;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DDrawMtxData {
/* 803115E0 */ J3DDrawMtxData();
/* 803115F4 */ ~J3DDrawMtxData();
@@ -25,6 +32,10 @@ struct J3DDrawMtxData {
class J3DShapeTable;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DJointTree {
public:
/* 80325A18 */ J3DJointTree();
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
index 340a6c8169..59375ef26d 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
@@ -6,6 +6,10 @@
typedef struct _GXColor GXColor;
typedef struct _GXColorS10 GXColorS10;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DMatColorAnm {
public:
/* 8003B2B8 */ ~J3DMatColorAnm() {};
@@ -32,6 +36,10 @@ private:
/* 0x4 */ J3DAnmColor* mAnmColor;
}; // Size: 0x8
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DTexNoAnm {
public:
/* 8003B1F8 */ ~J3DTexNoAnm() {};
@@ -59,6 +67,10 @@ private:
/* 0x8 */ J3DAnmTexPattern* mAnmTexPattern;
}; // Size: 0xC
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DTexMtxAnm {
public:
/* 8003B264 */ ~J3DTexMtxAnm() {};
@@ -87,6 +99,10 @@ private:
/* 0x4 */ J3DAnmTextureSRTKey* mAnmTransform;
}; // Size: 0x8
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DTevKColorAnm {
public:
/* 8003B150 */ ~J3DTevKColorAnm() {}
@@ -113,6 +129,10 @@ private:
/* 0x4 */ J3DAnmTevRegKey* mAnmTevReg;
}; // Size: 0x8
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DTevColorAnm {
public:
/* 8003B1A4 */ ~J3DTevColorAnm() {}
@@ -139,6 +159,10 @@ private:
/* 0x4 */ J3DAnmTevRegKey* mAnmTevReg;
}; // Size: 0x8
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DMaterialAnm {
public:
J3DMaterialAnm() { initialize(); }
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
index 4086f29ce5..f0f21a8b2b 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
@@ -11,6 +11,10 @@ class J3DAnmTextureSRTKey;
class J3DAnmTevRegKey;
class JUTNameTab;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DMaterialTable {
public:
/* 8032F5A8 */ void clear();
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 4fa4973b2a..4d878d8a41 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -3,8 +3,6 @@
#include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
-#include "JSystem/J3DGraphBase/J3DVertex.h"
-#include "dolphin/mtx.h"
#include "dolphin/types.h"
enum J3DMdlFlag {
@@ -18,10 +16,18 @@ enum J3DMdlFlag {
/* 0x80000 */ J3DMdlFlag_Unk80000 = 0x80000,
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DUnkCalc1 {
virtual void calc(J3DModel* model);
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DUnkCalc2 {
virtual void unk();
virtual void calc(J3DModelData* mpModelData);
@@ -29,6 +35,10 @@ struct J3DUnkCalc2 {
typedef void (*J3DCalcCallBack)(J3DModel*, u32 timing);
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DModel {
public:
J3DModel() {
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index c63a79fae8..17557f4495 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -10,6 +10,10 @@
typedef struct _GXColor GXColor;
class JUTNameTab;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DModelData {
public:
/* 80325D88 */ void clear();
diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
index fd03736f3c..28ad960ed3 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
@@ -2,10 +2,13 @@
#define J3DMTXBUFFER_H
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
-#include "dolphin/types.h"
class J3DModelData;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DMtxBuffer {
public:
J3DMtxBuffer() { initialize(); }
diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
index f31cff671c..8ae9ff94a9 100644
--- a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
+++ b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
@@ -2,10 +2,13 @@
#define J3DSHAPETABLE_H
#include "JSystem/J3DGraphBase/J3DShape.h"
-#include "dolphin/types.h"
class JUTNameTab;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DShapeTable {
public:
J3DShapeTable() {
diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
index 6adf2c350e..1b6ea8631f 100644
--- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
@@ -3,7 +3,6 @@
#include "JSystem/J3DGraphAnimator/J3DCluster.h"
#include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
-#include "JSystem/J3DGraphBase/J3DTransform.h"
#include "dolphin/types.h"
class J3DModel;
@@ -11,6 +10,10 @@ class J3DAnmCluster;
class J3DClusterVertex;
class JUTNameTab;
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
struct J3DSkinNList {
/* 8032C6E4 */ J3DSkinNList();
/* 8032C85C */ void calcSkin_VtxPosF32(f32 (*)[4], void*, void*);
@@ -24,6 +27,10 @@ struct J3DSkinNList {
/* 0x12 */ u16 field_0x12;
}; // Size: 0x14
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DSkinDeform {
public:
/* 8032C96C */ J3DSkinDeform();
@@ -68,6 +75,10 @@ private:
/* 0x24 */ J3DSkinNList* mSkinNList;
};
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
class J3DDeformer {
public:
/* 8032E39C */ J3DDeformer(J3DDeformData*);