izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes to make stuff actually equivalent

Browse Source
This commit is contained in:
angie
2022-04-03 20:36:12 -04:00
parent 6891367506
commit f62623a334
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/sys_math3d.c
+3 -5
View File
@@ -94,8 +94,6 @@ s32 Math3D_PlaneVsLineSegClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, f32
return true;
}
#else
// static InfiniteLine planeIntersectLine;
// static Linef planeIntersectSeg;
#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_PlaneVsLineSegClosestPoint.s")
#endif
@@ -832,7 +830,7 @@ s32 Math3D_LineVsCube(Vec3f* min, Vec3f* max, Vec3f* a, Vec3f* b) {
}
triVtx0.x = max->x;
triVtx0.y = max->y;
triVtx0.z = max->z;
triVtx0.z = min->z;
triVtx1.x = min->x;
triVtx1.y = max->y;
triVtx1.z = min->z;
@@ -916,7 +914,7 @@ s32 Math3D_LineVsCube(Vec3f* min, Vec3f* max, Vec3f* a, Vec3f* b) {
/**
* Checks if a line segment with endpoints `a` and `b` intersect a cube
*/
// in-static bss
// in-function static bss
s32 Math3D_LineVsCubeShort(Vec3s* min, Vec3s* max, Vec3s* a, Vec3s* b) {
static Vec3f D_801FBD20; // minF
static Vec3f D_801FBD30; // maxF
@@ -1401,7 +1399,7 @@ s32 Math3D_TriChkLineSegParaZIntersect(Vec3f* v0, Vec3f* v1, Vec3f* v2, f32 nx,
return false;
}
if (Math3D_TriChkPointParaXImpl(v0, v1, v2, x, y, 300.0f, 1.0f, nz)) {
if (Math3D_TriChkPointParaZImpl(v0, v1, v2, x, y, 300.0f, 1.0f, nz)) {
*zIntersect = (((-nx * x) - (ny * y)) - originDist) / nz;
return true;
}