diff options
| author | mzxrules <mzxrules@gmail.com> | 2021-07-28 17:59:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 23:59:52 +0200 |
| commit | df5e1c63c08d74c7c558f7863e7fc1feac39aa2c (patch) | |
| tree | 981004a77b55e93c2ff24833b9b46b938087ac27 /src/code/sys_math3d.c | |
| parent | 6f7312a3480f722425f31fcacbd031c1155bc4d6 (diff) | |
z_en_ko OK (#869)
* .data OK
* Progress
* push some old stuff
* Finish a chain
* Progress
* Progress
* Run mathfixer.py
* Progress
* match one more
* Up to date
* Match func_80A97610
* func_80A96FD0
* most of the way through the mega switch
* small formatting thing. still stuck on the switch
* start a big switch function
* a little closer
* done with matching for now starting objects
* func_80A97738 OK!
* func_80A995CC OK!
* func_80A99864 OK!
* en_ko OK!
* Code clean-up pass
* more EnKo cleanups, object_fa and object_kw1 textures documented
* complete object_km1, more EnKo documentation
* More documentation
* delete asm
* Clean-up rebase issues
* bleh
* Implement Dragorn's suggestions
* fix spec, implement fig's suggestions
* whoops (ill leave it for the docs tho lol)
* whoops again
* i made an ouchie
* smile
* last one for real
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'src/code/sys_math3d.c')
| -rw-r--r-- | src/code/sys_math3d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index c24e7d6a2..620ddee94 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -36,8 +36,8 @@ s32 Math3D_PlaneVsLineSegClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeIntersectSeg.b.z = (planeIntersectLine.dir.z * 100.0f) + planeIntersectLine.point.z; // closestPoint is a point on planeIntersect, sp34 is a point on linePointA, linePointB - if (!Math3D_LineVsLineClosestTwoPoints(&planeIntersectSeg.a, &planeIntersectSeg.b, linePointA, linePointB, closestPoint, - &sp34)) { + if (!Math3D_LineVsLineClosestTwoPoints(&planeIntersectSeg.a, &planeIntersectSeg.b, linePointA, linePointB, + closestPoint, &sp34)) { return false; } return true; @@ -80,9 +80,9 @@ s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Ve compAAlongB = ((lineAx * lineBx) + (lineAy * lineBy) + (lineAz * lineBz)) * scaleB; - compBAAlongB = ((lineBx * (lineAPointA->x - lineBPointA->x)) + - (lineBy * (lineAPointA->y - lineBPointA->y)) + - (lineBz * (lineAPointA->z - lineBPointA->z))) * scaleB; + compBAAlongB = ((lineBx * (lineAPointA->x - lineBPointA->x)) + (lineBy * (lineAPointA->y - lineBPointA->y)) + + (lineBz * (lineAPointA->z - lineBPointA->z))) * + scaleB; lineAPerpB.x = lineAx - (lineBx * compAAlongB); lineAPerpB.y = lineAy - (lineBy * compAAlongB); |