d_t_touch OK (#54)

* d_t_touch OK

* Make inlines
This commit is contained in:
robojumper
2024-10-06 21:42:07 +02:00
committed by GitHub
parent 8376edcc72
commit 25d80826c7
8 changed files with 170 additions and 50 deletions
-1
View File
@@ -2,7 +2,6 @@
#define D_T_MOLE_PROHIBIT_H
#include <d/tg/d_tg.h>
#include <m/m3d/m_smdl.h>
#include <s/s_State.hpp>
#include <s/s_StateMgr.hpp>
+41
View File
@@ -0,0 +1,41 @@
#ifndef D_T_TOUCH_H
#define D_T_TOUCH_H
#include <d/tg/d_tg.h>
#include <m/m_mtx.h>
#include <s/s_State.hpp>
#include <s/s_StateMgr.hpp>
class dTgTouchTag : public dTg_c {
public:
dTgTouchTag() : mStateMgr(*this, sStateID::null) {}
virtual ~dTgTouchTag() {}
virtual int create() override;
virtual int actorExecute() override;
virtual int draw() override;
virtual int doDelete() override;
STATE_FUNC_DECLARE(dTgTouchTag, Wait);
private:
u8 getActivatorIndex() {
return params & 0xF;
}
u8 getZoneFlag() {
return params >> 0x4;
}
u8 getChkFlag() {
return params >> 0xC;
}
STATE_MGR_DECLARE(dTgTouchTag);
mMtx_c mAreaOfEffect;
u16 mFlagTimer;
u8 mActivatorIndex;
u8 mZoneFlag;
u8 mChkFlag;
};
#endif
+11
View File
@@ -0,0 +1,11 @@
#ifndef D_AREA_MATH_H
#define D_AREA_MATH_H
#include <m/m_angle.h>
#include <m/m_mtx.h>
#include <m/m_vec.h>
void matrixCreateFromPosRotYScale(mMtx_c &, const mVec3_c &, const mAng, const mVec3_c &, mMtx_c *, f32);
bool checkIfVec3fInMatrix(const mMtx_c &, const mVec3_c &);
#endif