mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-02 00:38:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

MSL_C fully matched / some SSystem cleanup/ obj_rgate OK (#2011)

Browse Source 
* cleanup SSystem files

* MSL_C fully matched

* fix build

* remove asm

* reorganize MSL_C/Runtime libs into more accurate setup

* little more cleanup

* cleanup some MSL headers

* obj_rgate OK

* remove asm

* some rgate documentation
This commit is contained in:
TakaRikka
2023-12-25 07:31:05 -08:00
committed by GitHub
parent 54e5104f56
commit 8b3a582278
399 changed files with 5321 additions and 12620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SSystem/SComponent/c_m3d.cpp
+13 -11
View File
@@ -1,10 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: c_m3d
//
/**
* c_m3d.cpp
*
*/
#include "SSystem/SComponent/c_m3d.h"
#include "MSL_C/float.h"
#include "math.h"
#include "SSystem/SComponent/c_m3d_g_aab.h"
#include "SSystem/SComponent/c_m3d_g_cyl.h"
#include "SSystem/SComponent/c_m3d_g_lin.h"
@@ -283,7 +283,8 @@ bool cM3d_Cross_AabAab(const cM3dGAab* pAabA, const cM3dGAab* pAabB) {
cM3d_CrossNumSection(pAabA->GetMinP()->y, pAabA->GetMaxP()->y, pAabB->GetMinP()->y,
pAabB->GetMaxP()->y) &&
cM3d_CrossNumSection(pAabA->GetMinP()->z, pAabA->GetMaxP()->z, pAabB->GetMinP()->z,
pAabB->GetMaxP()->z)) {
pAabB->GetMaxP()->z))
{
return true;
} else {
return false;
@@ -317,8 +318,7 @@ bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) {
f32 cx = pSph->GetC().x;
if (pAab->GetMinX() > cx + radius) {
return false;
}
else if (pAab->GetMaxX() < cx - radius) {
} else if (pAab->GetMaxX() < cx - radius) {
return false;
}
@@ -328,7 +328,7 @@ bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) {
} else if (pAab->GetMaxZ() < cz - radius) {
return false;
}
f32 cy = pSph->GetC().y;
if (pAab->GetMinY() > cy + radius) {
return false;
@@ -431,7 +431,8 @@ bool cM3d_Cross_LinPla(const cM3dGLin* pLine, const cM3dGPla* pPlane, Vec* pVecO
return false;
} else {
if (startVal >= /* 0.0 */ FLOAT_LABEL(lit_2256) &&
endVal <= /* 0.0 */ FLOAT_LABEL(lit_2256)) {
endVal <= /* 0.0 */ FLOAT_LABEL(lit_2256))
{
// if (startVal >= 0 && endVal <= 0) {
if (pBoolA) {
return cM3d_CrossInfLineVsInfPlane_proc(startVal, endVal, &pLine->GetStartP(),
@@ -1003,7 +1004,8 @@ bool cM3d_Cross_CylPnt(const cM3dGCyl* pCylinder, const Vec* pPoint) {
f32 dZ = pCylinder->GetCP()->getZDiff(pPoint);
f32 maxY = pCylinder->GetCP()->y + pCylinder->GetH();
if (dX * dX + dZ * dZ < pCylinder->GetR() * pCylinder->GetR() &&
pCylinder->GetCP()->y < pPoint->y && maxY > pPoint->y) {
pCylinder->GetCP()->y < pPoint->y && maxY > pPoint->y)
{
return true;
} else {
return false;