diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-03-28 04:11:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-28 05:11:41 -0600 |
| commit | 92b88e83e86c60442ba1f9748c80b7db9242bf92 (patch) | |
| tree | 0911f27946cfd9f4f108116bbb59576b053aac6b /include/SSystem/SComponent | |
| parent | 721880831e114f08756ffd846ab69cd0d729863c (diff) | |
d_menu_calibration done / J3DDrawBuffer done / more d_drawlist wip (#312)
* d_drawlist work / finish J3DDrawBuffer
* d_menu_calibration done
* remove asm
Diffstat (limited to 'include/SSystem/SComponent')
| -rw-r--r-- | include/SSystem/SComponent/c_bg_s_chk.h | 3 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_lib.h | 15 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_m3d_g_pla.h | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 7a832cf271..c0746f8eb8 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -2,6 +2,9 @@ #define C_BG_S_CHK_H #include "dolphin/types.h" +#include "dolphin/mtx/vec.h" + +struct cBgD_Vtx_t : public Vec {}; class cBgS_GrpPassChk { public: diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index cf04ec17d6..e0e9c2084c 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -72,6 +72,21 @@ inline T cLib_minMaxLimit(T val, T min, T max) { } template <typename T> +inline T cLib_maxLimit(T val, T max) { + T ret; + T var_r30; + + if (val > max) { + var_r30 = max; + } else { + var_r30 = val; + } + + ret = var_r30; + return (T)ret; +} + +template <typename T> T cLib_calcTimer(T* val); void MtxInit(void); diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h index bb628278f9..17b1e033ca 100644 --- a/include/SSystem/SComponent/c_m3d_g_pla.h +++ b/include/SSystem/SComponent/c_m3d_g_pla.h @@ -26,6 +26,7 @@ public: f32 getPlaneFunc(const Vec* pPoint) const { return mD + PSVECDotProduct(&mNormal, pPoint); } const cXyz& GetNP() const { return mNormal; } + const cXyz& i_GetNP() const { return mNormal; } f32 GetD() const { return mD; } void SetupFrom3Vtx(const Vec* v1, const Vec* v2, const Vec* v3) { cM3d_CalcPla(v1, v2, v3, &mNormal, &mD); |
