mirror of
https://github.com/zeldaret/tww.git
synced 2026-05-28 00:15:50 -04:00
mattias-blum
d945c14cac
* Initial Progress Basic functions at 100% matching 100% Matching: - `daShip_Draw` - `daShip_Execute` - `daShip_IsDelete` - `daShip_Delete` - `daShip_createHeap` - `daShip_Create` * implemented `getJointPos` inlines in `daTornado_c` needed for d_a_ship * implemented `Center()` inline in `dCamera_c` needed for d_a_ship * added `setTranslationX` inline to `J3DTexMtx` needed for match in d_a_ship * parameters set to `const` for certain inlines in `m_Do_mtx.h` * added `dComIfGp_onMenuCollect` inline * changed `shipSpecialDemoStart` return type to `BOOL` * added member functions to `dPa_waveEcallBack`, `dPa_splashEcallBack `, `dPa_trackEcallBack` also modified member type of `mRotMtx` of `dPa_waveEcallBack` and `mPos` of `dPa_trackEcallBack` * added member to `daGrid_c` that is used in d_a_ship * added `mDoAud_setShipSailState` and `mDoAud_shipCruiseSePlay` inline functions * added `fopAcM_seenPlayerAngleY` inline * d_a_ship mostly matching approx. 90% matching, mostly regalloc issues. , `checkNextMode`, `setRopePos`, `setHeadAnm`, and `execute` need to have their logic fixer * replace `unknown_inline_TODO ` from `daShip_c` with `checkForceMove` * .data match * .rodata matching * more inline return type changes from `bool` to `BOOL` Also changed the array size of `mPlayerStatus` * implemented `force_calc_wind_rel_angle` inline in `daGrid_c` * fix `d_a_ship_static` * fixed `getEmitterAxis`, might need review but works for now * more progress * reverted change to `getEmitterAxis`, moved casts to function call in `dPa_waveEcallBack::executeAfter` * more progress * change return types of certain inlines from `BOOL` to `u32` `dComIfGp_checkCameraAttentionStatus`, `dComIfGp_checkPlayerStatus0`, `dComIfGp_checkPlayerStatus1` needed for match in d_a_ship * fixed memory addresses in `daGrid_c` * more progress * resolving symbols * Initial PR changes * Removed unnecessary cast * replaced instances of `PSVECSquareMag` with corresponding inline functions * update memory layout in `d_a_grid` for consistency * More PR changes `checkNextMode` and `procZevDemo` now at 100% matching
72 lines
1.9 KiB
C++
72 lines
1.9 KiB
C++
#ifndef D_A_TORNADO_H
|
|
#define D_A_TORNADO_H
|
|
|
|
#include "f_op/f_op_actor.h"
|
|
#include "SSystem/SComponent/c_phase.h"
|
|
#include "m_Do/m_Do_ext.h"
|
|
#include "d/d_particle.h"
|
|
|
|
class daTornado_HIO_c0 {
|
|
public:
|
|
static const float move_dis;
|
|
static const float start_dis;
|
|
};
|
|
|
|
class daTornado_c : public fopAc_ac_c {
|
|
public:
|
|
float getJointXPos(int jno) const {
|
|
if (mpModel)
|
|
return mpModel->getAnmMtx(jno)[0][3];
|
|
else
|
|
return current.pos.x;
|
|
}
|
|
float getJointYPos(int jno) const {
|
|
if (mpModel)
|
|
return mpModel->getAnmMtx(jno)[1][3];
|
|
else
|
|
return current.pos.y;
|
|
}
|
|
float getJointZPos(int jno) const {
|
|
if (mpModel)
|
|
return mpModel->getAnmMtx(jno)[2][3];
|
|
else
|
|
return current.pos.z;
|
|
}
|
|
void getScaleEnd() {}
|
|
void getSmallScaleEnd() {}
|
|
void setScaleOn() {}
|
|
|
|
BOOL jointCallBack(int);
|
|
BOOL draw();
|
|
BOOL execute();
|
|
BOOL tornado_delete();
|
|
BOOL createHeap();
|
|
cPhs_State create();
|
|
|
|
public:
|
|
/* 0x290 */ request_of_phase_process_class mPhs;
|
|
/* 0x298 */ J3DModel* mpModel;
|
|
/* 0x29c */ mDoExt_bckAnm mBck;
|
|
/* 0x2ac */ mDoExt_btkAnm mBtk;
|
|
/* 0x2c0 */ mDoExt_brkAnm mBrk;
|
|
/* 0x2d8 */ J3DModel* mpModelUnder;
|
|
/* 0x2dc */ mDoExt_bckAnm mBckUnder;
|
|
/* 0x2ec */ mDoExt_btkAnm mBtkUnder;
|
|
/* 0x300 */ mDoExt_brkAnm mBrkUnder;
|
|
/* 0x318 */ short mAngle1;
|
|
/* 0x31a */ short mAngle2;
|
|
/* 0x31c */ short m31c;
|
|
/* 0x31e */ short mPtclTimer;
|
|
/* 0x320 */ float mBtkFrame;
|
|
/* 0x324 */ float mBtkUnderFrame;
|
|
/* 0x328 */ float mBrkFrame;
|
|
/* 0x32c */ float m32c;
|
|
/* 0x330 */ float mJointX[11];
|
|
/* 0x35c */ float mJointZ[11];
|
|
/* 0x388 */ float mJointScale[11];
|
|
/* 0x3b4 */ cXyz mCenter;
|
|
/* 0x3c0 */ dPa_followEcallBack mPtclCb;
|
|
};
|
|
|
|
#endif /* D_A_TORNADO_H */
|