From 3c82015f69403d22f7ee3809425cb217f5bdc3b5 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 15 Jun 2024 10:09:55 -0700 Subject: d_bg_w done (#2169) * ClassifyPlane matched * d_bg_w full match * remove asm --- include/SSystem/SComponent/c_m3d.h | 2 +- include/SSystem/SComponent/c_m3d_g_pla.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'include/SSystem/SComponent') diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index e68ed1e2a8..0855f6d908 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -17,7 +17,7 @@ class cXyz; struct cM3d_Range; struct Vec; -extern f32 G_CM3D_F_ABS_MIN; +extern const f32 G_CM3D_F_ABS_MIN; static void cM3d_InDivPos1(const Vec*, const Vec*, f32, Vec*); void cM3d_InDivPos2(const Vec*, const Vec*, f32, Vec*); diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h index 2eeb39c25f..568f46f6dc 100644 --- a/include/SSystem/SComponent/c_m3d_g_pla.h +++ b/include/SSystem/SComponent/c_m3d_g_pla.h @@ -19,13 +19,12 @@ public: bool getCrossY(const cXyz&, f32*) const; bool getCrossYLessD(const Vec&, f32*) const; void Set(const cM3dGPla*); - void GetNP(); virtual ~cM3dGPla() {} f32 getPlaneFunc(const Vec* pPoint) const { return mD + VECDotProduct(&mNormal, pPoint); } - const cXyz& GetNP() const { return mNormal; } - const cXyz* i_GetNP() const { return &mNormal; } + cXyz* GetNP() { return &mNormal; } + const cXyz* 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); -- cgit v1.2.3