encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Match most of d_attention (#2016)

Browse Source 
* Make decompctx work with MSL includes

* Match most of d_attention
This commit is contained in:
hatal175
2023-12-29 21:59:33 +02:00
committed by GitHub
parent 402666242b
commit 68e857b4da
5 changed files with 320 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+5
View File
@@ -628,6 +628,11 @@ public:
void setRate(f32 rate) { mRate = rate; }
f32 getFrame() const { return mFrame; }
void setFrame(f32 frame) { mFrame = frame; }
void reset() {
mFrame = mStart;
mRate = 1.0f;
mState = 0;
}
private:
/* 0x04 */ u8 mAttribute;
include/d/d_attention.h
+5 -5
View File
@@ -27,7 +27,7 @@ public:
fopAc_ac_c* convPId(unsigned int);
void init();
void proc();
void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
int request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
fopAc_ac_c* getCatghTarget() { return convPId(mCatghTargetID); }
u8 getChangeItem() { return mChangeItem; }
@@ -80,11 +80,11 @@ public:
/* 80073CA4 */ fopAc_ac_c* convPId(unsigned int);
/* 80073CD4 */ void init();
/* 80073CEC */ void proc();
/* 80073D08 */ void request(fopAc_ac_c*, f32, f32, f32, s16, int);
/* 80073D08 */ int request(fopAc_ac_c*, f32, f32, f32, s16, int);
private:
u32 field_0x0;
u32 field_0x4;
s32 field_0x4;
f32 field_0x8;
u32 mLookTargetID;
}; // Size: 0x10
@@ -137,7 +137,7 @@ STATIC_ASSERT(sizeof(dAttDraw_c) == 0x178);
class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c {
public:
/* 80070178 */ virtual void execute(u16, J3DTransformInfo*);
/* 80070178 */ virtual int execute(u16, J3DTransformInfo*);
};
struct dist_entry {
@@ -243,7 +243,7 @@ public:
/* 0x004 */ u32 mLockTargetID;
/* 0x008 */ dAttDraw_CallBack_c mpDrawCallback;
/* 0x00C */ u32 mPadNo;
/* 0x010 */ u32 field_0x10;
/* 0x010 */ u32 mPlayerAttentionFlags;
/* 0x014 */ u8 field_0x14[4];
/* 0x018 */ JKRSolidHeap* heap;
/* 0x01C */ cXyz mDrawAttnPos;
include/m_Do/m_Do_ext.h
+2 -1
View File
@@ -38,6 +38,7 @@ public:
}
return stopped;
}
void reset() { mFrameCtrl.reset(); }
private:
/* 0x0 */ J3DFrameCtrl mFrameCtrl;
@@ -254,7 +255,7 @@ public:
class mDoExt_McaMorfCallBack1_c {
public:
virtual void execute(u16, J3DTransformInfo*) = 0;
virtual int execute(u16, J3DTransformInfo*) = 0;
};
class mDoExt_McaMorfCallBack2_c {