mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-05 18:57:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

tag_allmato almost, swhit0 treesh swball done, misc cleanup (#2312)

Browse Source 
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup
This commit is contained in:
TakaRikka
2025-03-01 04:48:49 -08:00
committed by GitHub
parent 80edf3c8a8
commit f06311cd09
54 changed files with 2162 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SSystem/SComponent/c_m2d.cpp
+47 -16
View File
@@ -6,47 +6,78 @@
#include "SSystem/SComponent/c_m2d.h"
#include "SSystem/SComponent/c_m3d.h"
#include "SSystem/SComponent/c_m3d_g_cir.h"
#include "JSystem/JUtility/JUTAssert.h"
/* 80268260-80268560 262BA0 0300+00 0/0 4/4 0/0 .text cM2d_CrossCirLin__FR8cM2dGCirffffPfPf */
void cM2d_CrossCirLin(cM2dGCir& param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
f32* param_5, f32* param_6) {
int ans = 0;
f32 fVar1 = param_1 - param_0.GetCx();
f32 fVar15 = param_2 - param_0.GetCy();
f32 dVar13 = param_3 * param_3 + param_4 * param_4;
f32 dVar14 = 2.0f * ((param_3 * fVar1) + (param_4 * fVar15));
f32 fVar3 = (fVar1 * fVar1 + fVar15 * fVar15) - (param_0.GetR() * param_0.GetR());
f32 in_f31;
f32 c = (fVar1 * fVar1 + fVar15 * fVar15) - (param_0.GetR() * param_0.GetR());
JUT_ASSERT(71, c < 0.0f);
f32 t;
if (cM3d_IsZero(dVar13)) {
if (!cM3d_IsZero(dVar14)) {
in_f31 = -fVar3 / dVar14;
if (cM3d_IsZero(dVar14)) {
ans = 0;
} else {
ans = 1;
t = -c / dVar14;
}
} else {
f32 dVar10 = ((dVar14 * dVar14) - (4.0f * dVar13) * fVar3);
f32 dVar10 = ((dVar14 * dVar14) - (4.0f * dVar13) * c);
if (cM3d_IsZero(dVar10)) {
in_f31 = (-dVar14 / (2.0f * dVar13));
ans = 1;
t = (-dVar14 / (2.0f * dVar13));
} else {
if (dVar10 < 0.0f) {
ans = 0;
} else {
ans = 2;
f32 fVar2 = 1.0f / (2.0f * dVar13);
f32 fVar15 = sqrtf(dVar10);
fVar15 = fVar2 * (-dVar14 + fVar15);
f32 fVar16 = sqrtf(dVar10);
f32 fVar4 = fVar2 * (-dVar14 - fVar16);
f32 fVar15 = fVar2 * (-dVar14 + sqrtf(dVar10));
f32 fVar4 = fVar2 * (-dVar14 - sqrtf(dVar10));
if (fVar15 > fVar4) {
in_f31 = fVar15;
t = fVar15;
} else {
in_f31 = fVar4;
t = fVar4;
}
}
}
}
if (cM3d_IsZero(in_f31)) {
if (cM3d_IsZero(t)) {
*param_5 = param_1;
*param_6 = param_2;
} else {
*param_5 = param_1 + (in_f31 * param_3);
*param_6 = param_2 + (in_f31 * param_4);
if (ans == 0 || t < 0.0f) {
OS_REPORT("\x1b[41;37m");
if (ans == 0) {
OS_REPORT("ans == 0\n");
}
if (t < 0.0f) {
OS_REPORT("t %f < 0.0f\n", t);
}
OS_REPORT("c.x %f c.y %f\n", param_0.GetCx(), param_0.GetCy());
OS_REPORT("r %f\n", param_0.GetR());
OS_REPORT("px %f py %f\n", param_1, param_2);
OS_REPORT("vx %f vy %f\n", param_3, param_4);
OS_REPORT("\x1b[m");
}
JUT_ASSERT(135, ans != 0);
JUT_ASSERT(137, t >= 0.0f);
*param_5 = param_1 + (t * param_3);
*param_6 = param_2 + (t * param_4);
}
}
}