summaryrefslogtreecommitdiff
path: root/include/d/col
diff options
context:
space:
mode:
authorElijah Thomas <42302100+elijah-thomas774@users.noreply.github.com>2024-10-16 15:36:02 -0400
committerGitHub <noreply@github.com>2024-10-16 15:36:02 -0400
commit26af4db82da23364961ebb440efba88846240731 (patch)
tree9cfe6a427cfe59c13c64928ccef6ba3c5ccfec21 /include/d/col
parent4543ec129ec02649b24ae0e20d8325a5f066c9b1 (diff)
update from dtk-template - clangd :) (#66)
* update from dtk-template and start work towards using clangd * include <a> -> "a" * Update build.yml * remove/add non-trivial class in union warning
Diffstat (limited to 'include/d/col')
-rw-r--r--include/d/col/bg/d_bg_pc.h2
-rw-r--r--include/d/col/bg/d_bg_s.h2
-rw-r--r--include/d/col/bg/d_bg_w.h13
-rw-r--r--include/d/col/c/c_bg_s_chk.h2
-rw-r--r--include/d/col/c/c_m3d.h7
-rw-r--r--include/d/col/c/c_m3d_g_aab.h2
-rw-r--r--include/d/col/c/c_m3d_g_cyl.h4
-rw-r--r--include/d/col/c/c_m3d_g_lin.h4
-rw-r--r--include/d/col/c/c_m3d_g_unk.h10
-rw-r--r--include/d/col/cc/d_cc_d.h18
-rw-r--r--include/d/col/cc/d_cc_mgr.h2
-rw-r--r--include/d/col/cc/d_cc_shape_colliders.h4
12 files changed, 33 insertions, 37 deletions
diff --git a/include/d/col/bg/d_bg_pc.h b/include/d/col/bg/d_bg_pc.h
index d5d9306b..55e2a5cd 100644
--- a/include/d/col/bg/d_bg_pc.h
+++ b/include/d/col/bg/d_bg_pc.h
@@ -1,7 +1,7 @@
#ifndef D_BG_PC_H
#define D_BG_PC_H
-#include <common.h>
+#include "common.h"
struct sBgPc { // Size: 0x14
/* 0x00 */ u32 code0;
diff --git a/include/d/col/bg/d_bg_s.h b/include/d/col/bg/d_bg_s.h
index 780e3832..939c5ea1 100644
--- a/include/d/col/bg/d_bg_s.h
+++ b/include/d/col/bg/d_bg_s.h
@@ -143,7 +143,7 @@ private:
static dBgS *spInstance;
static const void *spSolidMatTex[31];
static const void *spScrollMapTex[5];
- typedef TList<MapLineSegment, offsetof(MapLineSegment, mLink)> MapLineList;
+ typedef TList<MapLineSegment, 8> MapLineList;
public:
/* 0x2EF8 */ EGG::CpuTexture *mMapTexture;
diff --git a/include/d/col/bg/d_bg_w.h b/include/d/col/bg/d_bg_w.h
index 5317b182..287e8918 100644
--- a/include/d/col/bg/d_bg_w.h
+++ b/include/d/col/bg/d_bg_w.h
@@ -1,12 +1,13 @@
#ifndef D_BG_W_H
#define D_BG_W_H
-#include <common.h>
-#include <d/col/bg/d_bg_plc.h>
-#include <d/col/bg/d_bg_w_base.h>
-#include <d/col/c/c_m3d_g_aab.h>
-#include <m/m_math.h>
-#include <rvl/MTX.h>
+#include "common.h"
+#include "d/col/bg/d_bg_plc.h"
+#include "d/col/bg/d_bg_w_base.h"
+#include "d/col/c/c_m3d_g_aab.h"
+#include "m/m_math.h" // IWYU pragma: export
+#include "rvl/MTX.h" // IWYU pragma: export
+
class cBgS_GrpPassChk;
class cBgS_PolyPassChk;
diff --git a/include/d/col/c/c_bg_s_chk.h b/include/d/col/c/c_bg_s_chk.h
index c7acf88f..a03a697e 100644
--- a/include/d/col/c/c_bg_s_chk.h
+++ b/include/d/col/c/c_bg_s_chk.h
@@ -4,7 +4,7 @@
#include "d/col/bg/d_bg_w_base.h"
#include "d/col/c/c_partition.h"
#include "f/f_base.h"
-#include "rvl/MTX.h"
+#include "rvl/MTX.h" // IWYU pragma: export
struct cBgD_Vtx_t : public nw4r::math::VEC3 {};
diff --git a/include/d/col/c/c_m3d.h b/include/d/col/c/c_m3d.h
index 65a1cbf0..c148eef3 100644
--- a/include/d/col/c/c_m3d.h
+++ b/include/d/col/c/c_m3d.h
@@ -1,11 +1,10 @@
#ifndef C_M3D_H
#define C_M3D_H
+#include "common.h"
+#include "math.h"
#include "nw4r/math.h"
-#include <common.h>
-#include <math.h>
-
class cM3dGAab;
class cM3dGCps;
class cM3dGCyl;
@@ -17,8 +16,6 @@ class cM3dGUnk;
class mAng3_c;
struct cM3d_Range;
-struct nw4r::math::VEC3;
-
extern const f32 G_CM3D_F_ABS_MIN;
bool cM3d_Len2dSqPntAndSegLine(f32, f32, f32, f32, f32, f32, f32 *, f32 *, f32 *);
diff --git a/include/d/col/c/c_m3d_g_aab.h b/include/d/col/c/c_m3d_g_aab.h
index b72425b9..2afb932f 100644
--- a/include/d/col/c/c_m3d_g_aab.h
+++ b/include/d/col/c/c_m3d_g_aab.h
@@ -1,11 +1,11 @@
#ifndef C_M3D_G_AAB_H
#define C_M3D_G_AAB_H
+#include "common.h"
#include "d/col/c/c_m3d.h"
#include "d/col/c/c_m3d_g_lin.h"
#include "d/col/c/c_m3d_g_sph.h"
-#include <common.h>
// Axis aligned bounding box
class cM3dGAab {
diff --git a/include/d/col/c/c_m3d_g_cyl.h b/include/d/col/c/c_m3d_g_cyl.h
index c0c0e067..c2941280 100644
--- a/include/d/col/c/c_m3d_g_cyl.h
+++ b/include/d/col/c/c_m3d_g_cyl.h
@@ -1,8 +1,8 @@
#ifndef C_M3D_G_CYL_H
#define C_M3D_G_CYL_H
-#include <d/col/c/c_m3d_g_unk.h>
-#include <m/m_vec.h>
+#include "d/col/c/c_m3d_g_unk.h"
+#include "m/m_vec.h"
class cM3dGCyl {
public:
diff --git a/include/d/col/c/c_m3d_g_lin.h b/include/d/col/c/c_m3d_g_lin.h
index a0f72aef..02cea601 100644
--- a/include/d/col/c/c_m3d_g_lin.h
+++ b/include/d/col/c/c_m3d_g_lin.h
@@ -1,8 +1,8 @@
#ifndef C_M3D_G_LIN_H
#define C_M3D_G_LIN_H
-#include <common.h>
-#include <m/m_vec.h>
+#include "common.h"
+#include "m/m_vec.h"
class cM3dGLin {
public:
diff --git a/include/d/col/c/c_m3d_g_unk.h b/include/d/col/c/c_m3d_g_unk.h
index 6d36035d..ea0de359 100644
--- a/include/d/col/c/c_m3d_g_unk.h
+++ b/include/d/col/c/c_m3d_g_unk.h
@@ -1,14 +1,14 @@
#ifndef C_M3D_G_UNK_H
#define C_M3D_G_UNK_H
-#include "d/col/c/c_m3d_g_cps.h"
-#include "d/col/c/c_m3d_g_cyl.h"
-#include "d/col/c/c_m3d_g_pla.h"
-#include "d/col/c/c_m3d_g_sph.h"
+#include "common.h"
#include "m/m_mtx.h"
#include "m/m_vec.h"
-#include <common.h>
+
+struct cM3dGCps;
+struct cM3dGCyl;
+struct cM3dGSph;
class cM3dGUnk {
public:
diff --git a/include/d/col/cc/d_cc_d.h b/include/d/col/cc/d_cc_d.h
index 0df7adde..aa760b75 100644
--- a/include/d/col/cc/d_cc_d.h
+++ b/include/d/col/cc/d_cc_d.h
@@ -1,16 +1,14 @@
#ifndef D_CC_D_H
#define D_CC_D_H
-#include <d/a/d_a_base.h>
-#include <d/col/c/c_m3d_g_aab.h>
-#include <d/col/c/c_m3d_g_cps.h>
-#include <d/col/c/c_m3d_g_cyl.h>
-#include <d/col/c/c_m3d_g_sph.h>
-#include <d/col/c/c_m3d_g_unk.h>
-#include <f/f_base_id.h>
-#include <m/m_mtx.h>
-#include <m/m_vec.h>
-#include <nw4r/math/math_types.h>
+#include "d/a/d_a_base.h"
+#include "d/col/c/c_m3d_g_aab.h"
+#include "d/col/c/c_m3d_g_cps.h"
+#include "d/col/c/c_m3d_g_cyl.h"
+#include "d/col/c/c_m3d_g_sph.h"
+#include "d/col/c/c_m3d_g_unk.h"
+#include "f/f_base_id.h"
+#include "m/m_vec.h"
// Largely modeled off
// https://github.com/zeldaret/tp/blob/main/include/SSystem/SComponent/c_cc_d.h
diff --git a/include/d/col/cc/d_cc_mgr.h b/include/d/col/cc/d_cc_mgr.h
index 4ede33d4..97fd9cfb 100644
--- a/include/d/col/cc/d_cc_mgr.h
+++ b/include/d/col/cc/d_cc_mgr.h
@@ -1,7 +1,7 @@
#ifndef TOSORT_D_CC_MGR_H
#define TOSORT_D_CC_MGR_H
-#include <d/col/cc/d_cc_d.h>
+#include "d/col/cc/d_cc_d.h"
class ColliderManager {
public:
diff --git a/include/d/col/cc/d_cc_shape_colliders.h b/include/d/col/cc/d_cc_shape_colliders.h
index b6806000..44b085b8 100644
--- a/include/d/col/cc/d_cc_shape_colliders.h
+++ b/include/d/col/cc/d_cc_shape_colliders.h
@@ -1,8 +1,8 @@
#ifndef D_CC_SHAPE_COLLIDERS_H
#define D_CC_SHAPE_COLLIDERS_H
-#include <d/col/cc/d_cc_d.h>
-#include <m/m_vec.h>
+#include "d/col/cc/d_cc_d.h"
+#include "m/m_vec.h"
struct dCcD_SrcUnk {
/* 0x00 */ dCcD_SrcGObjInf mObjInf;