diff options
| author | mzxrules <mzxrules@gmail.com> | 2024-06-19 00:00:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-19 00:00:23 -0400 |
| commit | 8d83727429602d422a524d00244f16f46ea8e70e (patch) | |
| tree | 0db634a792b3004792aa1e598def34543aac68ef /src/code/sys_math3d.c | |
| parent | 06bbdf88f1a38bec6300ce451b061522802e3371 (diff) | |
Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib (#1956)
* split sys_math, sys_math3d, z_lib from global.h
* suggestions
* forgot this
* more math stuff
* nit fix
* re-add ichain.h
* resolve tharo's comments
Diffstat (limited to 'src/code/sys_math3d.c')
| -rw-r--r-- | src/code/sys_math3d.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 6525f825d..f0bfb60bc 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -1,9 +1,13 @@ -#include "global.h" +#include "ultra64.h" +#include "z_lib.h" +#include "z64math.h" #include "terminal.h" +#include "macros.h" +#include "sys_math3d.h" // For retail BSS ordering, the block number of cbf in Math3D_CylVsCylOverlapCenterDist // must be 0. -#pragma increment_block_number 187 +#pragma increment_block_number 114 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); @@ -2147,11 +2151,3 @@ s32 Math3D_YZInSphere(Sphere16* sphere, f32 y, f32 z) { } return false; } - -#if OOT_DEBUG -void Math3D_DrawSphere(PlayState* play, Sphere16* sph) { -} - -void Math3D_DrawCylinder(PlayState* play, Cylinder16* cyl) { -} -#endif |