diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2023-05-18 12:10:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 12:10:49 +0300 |
| commit | 2ef82b2b66a8a556f7bdf199f99a9a7e4bc9d3f3 (patch) | |
| tree | a32aa4837cedca61317762cc82a8f00dd33b362f /include/JSystem/J3DGraphBase | |
| parent | b7bc5b42a57f7e351c04af1244b3014e228716d3 (diff) | |
| parent | 221f40e6097dfe76c76602aa21aa07d5f760dce4 (diff) | |
Merge branch 'master' into various3
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DStruct.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DTexture.h | 1 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DVertex.h | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index d68a99bc94..4e1ca4a6e3 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DStruct.h" #include "JSystem/J3DGraphBase/J3DTevs.h" #include "JSystem/J3DGraphBase/J3DTexture.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 778236d80f..cb98164d03 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -2,7 +2,7 @@ #define J3DSTRUCT_H #include "SSystem/SComponent/c_xyz.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" class J3DLightInfo { diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 95580afa91..b66c8b6c33 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -2,6 +2,7 @@ #define J3DTEXTURE_H #include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/mtx.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/types.h" diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h index a8e67d578f..a601987c1d 100644 --- a/include/JSystem/J3DGraphBase/J3DVertex.h +++ b/include/JSystem/J3DGraphBase/J3DVertex.h @@ -1,10 +1,12 @@ #ifndef J3DVERTEX_H #define J3DVERTEX_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXAttr.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/vec.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; class J3DModel; struct J3DAnmVtxColor; |