summaryrefslogtreecommitdiff
path: root/libs/JSystem/J2DGraph
diff options
context:
space:
mode:
authorJcw87 <Jcw87@users.noreply.github.com>2023-05-12 12:10:14 -0700
committerGitHub <noreply@github.com>2023-05-12 12:10:14 -0700
commit221f40e6097dfe76c76602aa21aa07d5f760dce4 (patch)
treeb8f2549712927365bcffd13688729555a4276ff1 /libs/JSystem/J2DGraph
parent8c7cda85891b41cfdbce72ed4efb00292f34a16a (diff)
Remove #includes from headers (#334)
* add "global.h" to files that use it * add MSL_C includes to files that use them * remove dolphin includes from headers that don't need them * remove JSupport includes from headers that don't need them * remove JKernel includes from headers that don't need them * remove JUtility includes from headers that don't need them * remove J3D includes from headers that don't need them * remove J2D includes from headers that don't need them * remove JAudio2 includes from headers that don't need them * remove Z2AudioLib includes from headers that don't need them * remove JMessage includes from headers that don't need them * remove JParticle includes from headers that don't need them * remove SComponent includes from headers that don't need them * remove dol includes from headers that don't need them * sort includes
Diffstat (limited to 'libs/JSystem/J2DGraph')
-rw-r--r--libs/JSystem/J2DGraph/J2DAnimation.cpp3
-rw-r--r--libs/JSystem/J2DGraph/J2DGrafContext.cpp1
-rw-r--r--libs/JSystem/J2DGraph/J2DManage.cpp1
-rw-r--r--libs/JSystem/J2DGraph/J2DMatBlock.cpp4
-rw-r--r--libs/JSystem/J2DGraph/J2DMaterial.cpp2
-rw-r--r--libs/JSystem/J2DGraph/J2DMaterialFactory.cpp2
-rw-r--r--libs/JSystem/J2DGraph/J2DOrthoGraph.cpp2
-rw-r--r--libs/JSystem/J2DGraph/J2DPane.cpp5
-rw-r--r--libs/JSystem/J2DGraph/J2DPicture.cpp3
-rw-r--r--libs/JSystem/J2DGraph/J2DPictureEx.cpp3
-rw-r--r--libs/JSystem/J2DGraph/J2DPrint.cpp3
-rw-r--r--libs/JSystem/J2DGraph/J2DScreen.cpp4
-rw-r--r--libs/JSystem/J2DGraph/J2DTextBox.cpp4
-rw-r--r--libs/JSystem/J2DGraph/J2DTextBoxEx.cpp4
14 files changed, 41 insertions, 0 deletions
diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp
index 717ce664cf..82ca1aadcd 100644
--- a/libs/JSystem/J2DGraph/J2DAnimation.cpp
+++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp
@@ -5,9 +5,12 @@
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/J3DGraphBase/J3DTexture.h"
#include "JSystem/J3DGraphBase/J3DTransform.h"
+#include "JSystem/JUtility/JUTPalette.h"
#include "JSystem/JUtility/JUTResource.h"
#include "dol2asm.h"
+#include "dolphin/os/OS.h"
#include "dolphin/types.h"
f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2);
diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp
index 7e95632fe3..10f2a10e68 100644
--- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp
+++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp
@@ -6,6 +6,7 @@
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "MSL_C/math.h"
#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
//
diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp
index 60318ed15c..6c26035dd5 100644
--- a/libs/JSystem/J2DGraph/J2DManage.cpp
+++ b/libs/JSystem/J2DGraph/J2DManage.cpp
@@ -4,6 +4,7 @@
//
#include "JSystem/J2DGraph/J2DManage.h"
+#include "JSystem/JSupport/JSUInputStream.h"
#include "MSL_C/string.h"
#include "dol2asm.h"
#include "dolphin/types.h"
diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
index 1268d8e9ab..a8a158593b 100644
--- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -4,7 +4,11 @@
//
#include "JSystem/J2DGraph/J2DMatBlock.h"
+#include "JSystem/JUtility/JUTPalette.h"
+#include "JSystem/JUtility/JUTResFont.h"
+#include "JSystem/JUtility/JUTTexture.h"
#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
//
diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp
index 3f53cb4c92..a712ba9f12 100644
--- a/libs/JSystem/J2DGraph/J2DMaterial.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp
@@ -4,6 +4,8 @@
//
#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
+#include "JSystem/JKernel/JKRHeap.h"
#include "dol2asm.h"
#include "dolphin/types.h"
diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
index ae5007d1cb..ab65ee3cb4 100644
--- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -4,6 +4,8 @@
//
#include "JSystem/J2DGraph/J2DMaterialFactory.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "MSL_C/string.h"
#include "dol2asm.h"
#include "dolphin/types.h"
diff --git a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp
index 6c68036445..16c56f6436 100644
--- a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp
+++ b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp
@@ -5,6 +5,8 @@
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
+#include "dolphin/mtx/mtx44.h"
#include "dolphin/types.h"
//
diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp
index caf72f13b4..460a2b1361 100644
--- a/libs/JSystem/J2DGraph/J2DPane.cpp
+++ b/libs/JSystem/J2DGraph/J2DPane.cpp
@@ -4,12 +4,17 @@
//
#include "JSystem/J2DGraph/J2DPane.h"
+#include "JSystem/J2DGraph/J2DAnimation.h"
+#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "JSystem/J2DGraph/J2DManage.h"
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J3DGraphBase/J3DTransform.h"
+#include "JSystem/JSupport/JSURandomInputStream.h"
#include "JSystem/JUtility/JUTResource.h"
+#include "MSL_C/math.h"
#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
/* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text __ct__7J2DPaneFv */
diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp
index 3e3a0ec79b..d0b1fd80e2 100644
--- a/libs/JSystem/J2DGraph/J2DPicture.cpp
+++ b/libs/JSystem/J2DGraph/J2DPicture.cpp
@@ -4,7 +4,10 @@
//
#include "JSystem/J2DGraph/J2DPicture.h"
+#include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/JUtility/JUTTexture.h"
#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
//
diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
index 62123db41a..0d7c82d8af 100644
--- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -4,6 +4,9 @@
//
#include "JSystem/J2DGraph/J2DPictureEx.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JUtility/JUTTexture.h"
#include "dol2asm.h"
#include "dolphin/types.h"
diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp
index dea6720967..a2f63fa488 100644
--- a/libs/JSystem/J2DGraph/J2DPrint.cpp
+++ b/libs/JSystem/J2DGraph/J2DPrint.cpp
@@ -4,10 +4,13 @@
//
#include "JSystem/J2DGraph/J2DPrint.h"
+#include "JSystem/JKernel/JKRHeap.h"
#include "MSL_C/stdio.h"
#include "MSL_C/stdlib.h"
+#include "MSL_C/string.h"
#include "dol2asm.h"
#include "dolphin/types.h"
+#include "global.h"
//
// Forward References:
diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp
index 55e337eb99..a9ef614b2e 100644
--- a/libs/JSystem/J2DGraph/J2DScreen.cpp
+++ b/libs/JSystem/J2DGraph/J2DScreen.cpp
@@ -4,15 +4,19 @@
//
#include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DMaterialFactory.h"
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "JSystem/J2DGraph/J2DPictureEx.h"
#include "JSystem/J2DGraph/J2DTextBoxEx.h"
#include "JSystem/J2DGraph/J2DWindowEx.h"
#include "JSystem/JGeometry.h"
+#include "JSystem/JKernel/JKRArchive.h"
+#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JSupport/JSUMemoryStream.h"
#include "dol2asm.h"
#include "dolphin/types.h"
+#include "global.h"
//
// Forward References:
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index 10fdc19796..39d44594b5 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -4,8 +4,12 @@
//
#include "JSystem/J2DGraph/J2DTextBox.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPrint.h"
+#include "JSystem/JSupport/JSURandomInputStream.h"
+#include "JSystem/JUtility/JUTResFont.h"
#include "MSL_C/string.h"
+#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dol2asm.h"
#include "dolphin/types.h"
diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
index 01a50b6776..25da723acc 100644
--- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
@@ -4,6 +4,10 @@
//
#include "JSystem/J2DGraph/J2DTextBoxEx.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "JSystem/J2DGraph/J2DPrint.h"
+#include "JSystem/JSupport/JSURandomInputStream.h"
+#include "JSystem/JUtility/JUTResFont.h"
#include "dol2asm.h"
#include "dolphin/types.h"