diff options
| author | SuperDude88 <82904174+SuperDude88@users.noreply.github.com> | 2023-09-19 19:49:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 16:49:23 -0700 |
| commit | 54a8ffbe372c826b048f4cb3399e61623ea55748 (patch) | |
| tree | 3571e2d69c96ebcd6b9cd5dbef9ae1d2e0e10a2c /include/m_Do | |
| parent | 667d1228826678ab2caf7e5faece164637c6fad1 (diff) | |
daObjTpost_c Nearly OK (#60)
* daObjTpost_c Nearly OK
Also a little bit more work on fopNpc_npc_c
* Remove Duplicate Struct
Diffstat (limited to 'include/m_Do')
| -rw-r--r-- | include/m_Do/m_Do_ext.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 3aec03ec..089c1128 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -248,11 +248,27 @@ public: mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, float, int, int, int, void*, unsigned long, unsigned long); virtual ~mDoExt_McaMorf(); + void calc(); + void calc(u16); void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); + void setMorf(f32); J3DModel* getModel() { return mpModel; } void setFrame(f32 frame) { mFrameCtrl.setFrame(frame); } + f32 getFrame() { return mFrameCtrl.getFrame(); } + bool isStop() const { //regswap somewhere here + bool stopped = true; + if (!mFrameCtrl.checkState(1) && mFrameCtrl.getRate() != 0.0f) { + stopped = false; + } + + return stopped; + } + void update(); void updateDL(); + void entry(); + void entryDL(); + void entryDL(J3DMaterialTable*); void play(Vec *, u32, s8); void stopZelAnime(); |
