mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_jnt_col debug (#3088)

Browse Source
This commit is contained in:
Jcw87
2026-02-11 00:05:16 -08:00
committed by GitHub
parent a772c05f4d
commit d8a4157b9f
8 changed files with 373 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JHostIO/JORMContext.h
+8 -1
View File
@@ -86,6 +86,11 @@
updateSelectorSub(mode, (uintptr_t)pSrc, *pSrc, param_2); \
}
#define DEFINE_UPDATE_COMBO_BOX_ID(T) \
void updateComboBoxID(u32 mode, u32 id, T value, u32 param_4) { \
updateSelectorSub(mode, id, value, param_4); \
}
#define DEFINE_UPDATE_SLIDER(T) \
void updateSlider(u32 mode, T* pSrc, T rangeMin, T rangeMax, u32 param_5) { \
updateSliderSub(mode, (uintptr_t)pSrc, *pSrc, rangeMin, rangeMax, param_5); \
@@ -258,10 +263,12 @@ public:
DEFINE_START_COMBO_BOX(s16, jhostio::EKind_16B)
DEFINE_START_COMBO_BOX(s32, jhostio::EKind_32B)
DEFINE_START_COMBO_BOX_ID(int, JORPropertyEvent::EKind_ValueID)
DEFINE_START_COMBO_BOX_ID(s32, JORPropertyEvent::EKind_ValueID)
DEFINE_UPDATE_COMBO_BOX(u8)
DEFINE_UPDATE_COMBO_BOX_ID(s32)
void endComboBox() { endSelectorSub(); }
void genComboBoxItem(const char* label, s32 itemNo) {
include/d/d_jnt_col.h
+23
View File
@@ -25,6 +25,7 @@ public:
int getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
void debugDraw();
BOOL checkPassNum(int bit) { return field_0xc & (1 << bit); }
void onPassNum(int num) { field_0xc |= (1 << num); }
@@ -40,4 +41,26 @@ public:
/* 0x0C */ int field_0xc;
};
extern dJntColData_c l_debugColData[];
class dJntCol_HIO_c : public JORReflexible {
public:
dJntCol_HIO_c() {
field_0x5 = 0;
field_0xc = l_debugColData;
}
virtual ~dJntCol_HIO_c() {}
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void genMessage(JORMContext*);
void update();
void fileOut();
/* 0x04 */ s8 field_0x4;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6[0xC - 0x6];
/* 0x0C */ dJntColData_c* field_0xc;
};
#endif /* D_D_JNT_COL_H */
include/m_Do/m_Do_mtx.h
+4 -4
View File
@@ -39,10 +39,6 @@ inline void cMtx_concat(const Mtx a, const Mtx b, Mtx ab) {
mDoMtx_concat(a, b, ab);
}
inline void cMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
MTXScale(m, x, y, z);
}
inline void mDoMtx_multVec(CMtxP m, const Vec* src, Vec* dst) {
PSMTXMultVec(m, src, dst);
}
@@ -145,6 +141,10 @@ inline void mDoMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
MTXScale(m, x, y, z);
}
inline void cMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
mDoMtx_scale(m, x, y, z);
}
inline void mDoMtx_quat(Mtx m, const Quaternion* q) {
MTXQuat(m, q);
}