c_bg_w match

This commit is contained in:
Jasper St. Pierre
2024-01-20 10:35:03 -08:00
parent f524c4e974
commit e93bb0a65c
4 changed files with 18 additions and 11 deletions
+1 -1
View File
@@ -531,7 +531,7 @@ config.libs = [
Object(Matching, "SSystem/SComponent/c_bg_s_chk.cpp"),
Object(Matching, "SSystem/SComponent/c_bg_s_gnd_chk.cpp"),
Object(Matching, "SSystem/SComponent/c_bg_s_lin_chk.cpp"),
Object(NonMatching, "SSystem/SComponent/c_bg_w.cpp"),
Object(Matching, "SSystem/SComponent/c_bg_w.cpp"),
Object(Matching, "SSystem/SComponent/c_m2d.cpp"),
Object(Matching, "SSystem/SComponent/c_m2d_g_box.cpp"),
Object(NonMatching, "SSystem/SComponent/c_m3d.cpp"),
+1 -7
View File
@@ -6,6 +6,7 @@
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_m3d_g_aab.h"
#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "SSystem/SComponent/c_bg_w_tri_elm.h"
#include "dolphin/mtx/mtx.h"
class cBgW_BgId {
@@ -120,13 +121,6 @@ public:
/* 0x04 */ u16 ground;
};
class cBgW_TriElm {
public:
/* 0x00 */ cM3dGPla m_plane;
virtual ~cBgW_TriElm() {}
};
class cBgW_GrpElm {
public:
virtual ~cBgW_GrpElm() {}
@@ -0,0 +1,13 @@
#ifndef C_BG_W_TRI_ELM_H
#define C_BG_W_TRI_ELM_H
#include "SSystem/SComponent/c_m3d_g_pla.h"
class cBgW_TriElm {
public:
/* 0x00 */ cM3dGPla m_plane;
virtual ~cBgW_TriElm() {}
};
#endif
+3 -3
View File
@@ -632,9 +632,9 @@ void cBgW::Move() {
if (!ChkFlush())
return;
} else {
mTransVel.x = mCurMtx[0][3] - (*pm_base)[0][3];
mTransVel.y = mCurMtx[1][3] - (*pm_base)[1][3];
mTransVel.z = mCurMtx[2][3] - (*pm_base)[2][3];
mTransVel.x = (*pm_base)[0][3] - mCurMtx[0][3];
mTransVel.y = (*pm_base)[1][3] - mCurMtx[1][3];
mTransVel.z = (*pm_base)[2][3] - mCurMtx[2][3];
mbNeedsFullTransform = false;
}