diff options
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
7 files changed, 18 insertions, 5 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 5fe848fe8a..198952a233 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -3,8 +3,12 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "dolphin/gx/GX.h" +#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" +#include "global.h" + +typedef struct _GXColor GXColor; +typedef struct _GXColorS10 GXColorS10; struct J3DAnmKeyTableBase { /* 0x00 */ u16 mMaxFrame; diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 12f2da776c..6156cf06cf 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -1,11 +1,12 @@ #ifndef J3DJOINT_H #define J3DJOINT_H -#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "dolphin/types.h" class J3DAnmTransform; +class J3DJoint; +class J3DMaterial; class J3DMtxBuffer; class J3DMtxCalc { diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h index a58b55c9a9..dc74089af3 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h +++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h @@ -2,10 +2,11 @@ #define J3DJOINTTREE_H #include "JSystem/J3DGraphAnimator/J3DJoint.h" -#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" +class JUTNameTab; + struct J3DModelHierarchy { /* 0x0 */ u16 mType; /* 0x2 */ u16 mValue; diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index db9a5184a6..b87b1f0d0a 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -4,6 +4,9 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; +typedef struct _GXColorS10 GXColorS10; + class J3DMatColorAnm { public: /* 8003B2B8 */ ~J3DMatColorAnm(); diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h index 79ed0e592d..343006df80 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h @@ -1,7 +1,6 @@ #ifndef J3DMATERIALATTACH_H #define J3DMATERIALATTACH_H -#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" struct J3DMaterial; @@ -10,6 +9,7 @@ struct J3DAnmColor; struct J3DAnmTexPattern; struct J3DAnmTextureSRTKey; struct J3DAnmTevRegKey; +class JUTNameTab; class J3DMaterialTable { public: diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index 766ae76a76..125e7c9b3d 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -8,6 +8,9 @@ #include "JSystem/J3DGraphBase/J3DVertex.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; +class JUTNameTab; + class J3DModelData { public: /* 80325D88 */ void clear(); diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h index 9abac85f9b..4cc14fdd29 100644 --- a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h +++ b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h @@ -3,9 +3,10 @@ #include "JSystem/J3DGraphBase/J3DShape.h" #include "JSystem/J3DGraphBase/J3DVertex.h" -#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" +class JUTNameTab; + class J3DShapeTable { public: J3DShapeTable() { |