mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-21 14:07:29 -04:00
d_a_obj_ikada (#830)
* d_a_obj_ikada * Fix issues caused by autoformatter * Fix Majuu Flag --------- Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Maide
+1
-1
@@ -1410,7 +1410,7 @@ config.libs = [
|
||||
ActorRel(Matching, "d_a_obj_hfuck1", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_hole", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(Matching, "d_a_obj_ice", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_obj_ikada"),
|
||||
ActorRel(NonMatching, "d_a_obj_ikada", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_kanat"),
|
||||
ActorRel(NonMatching, "d_a_obj_leaves"),
|
||||
ActorRel(NonMatching, "d_a_obj_lpalm"),
|
||||
|
||||
@@ -51,18 +51,18 @@ public:
|
||||
/* 0x798 */ s16 m798;
|
||||
/* 0x79A */ u8 mCurArr;
|
||||
/* 0x79B */ u8 m79B;
|
||||
}; // size >= 0x7A0
|
||||
}; // size = 0x79C
|
||||
|
||||
class daMajuu_Flag_c : public fopAc_ac_c {
|
||||
public:
|
||||
void setBaseScale(float) {}
|
||||
void setOtherMatrix(Mtx*) {}
|
||||
void setOtherOffset(cXyz*) {}
|
||||
void setBaseScale(float scale) { mFlagScale = scale; }
|
||||
void setOtherMatrix(Mtx* mtx) { mpParentMtx = *mtx; }
|
||||
void setOtherOffset(cXyz* pos) { mpParentPos = pos; }
|
||||
|
||||
public:
|
||||
/* 0x290 */ u8 m290[0x2A0 - 0x290];
|
||||
/* 0x2A0 */ daMajuu_Flag_packet_c mPacket;
|
||||
/* 0xA3D */ u8 mA3D[0xA40 - 0xA3D];
|
||||
/* 0xA3C */ u8 mA3C[0xA40 - 0xA3C];
|
||||
/* 0xA40 */ request_of_phase_process_class mPhsCloth;
|
||||
/* 0xA48 */ request_of_phase_process_class mPhsFlag;
|
||||
/* 0xA50 */ u8 mA50[0xA58 - 0xA50];
|
||||
|
||||
@@ -10,31 +10,33 @@
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "d/d_path.h"
|
||||
#include "d/d_lib.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
|
||||
class daObj_Ikada_c : public fopAc_ac_c {
|
||||
public:
|
||||
enum Proc_e {
|
||||
|
||||
PROC_00_e = 0,
|
||||
PROC_01_e = 1,
|
||||
};
|
||||
|
||||
void getCranePos() {}
|
||||
void getFrame() {}
|
||||
void getMode() {}
|
||||
void getSvDirection() {}
|
||||
void isBonbori() {}
|
||||
void isCrane() {}
|
||||
void isFlag() {}
|
||||
void isWave() {}
|
||||
void modeProcInit(int) {}
|
||||
bool isBonbori() { return mType == 3 || mType == 1; }
|
||||
bool isCrane() {return mType == 4; }
|
||||
bool isFlag() { return mType == 0 || mType == 4; }
|
||||
bool isWave() {}
|
||||
void modeProcInit(int idx) { modeProc(PROC_00_e, idx); }
|
||||
void setInitPos() {}
|
||||
void setStart() {}
|
||||
void setStop() {}
|
||||
|
||||
void _nodeControl(J3DNode*, J3DModel*);
|
||||
void _pathMove(cXyz*, cXyz*, cXyz*);
|
||||
BOOL _pathMove(cXyz*, cXyz*, cXyz*);
|
||||
void _ride(fopAc_ac_c*);
|
||||
void setCollision();
|
||||
void checkTgHit();
|
||||
bool checkTgHit();
|
||||
void pathMove();
|
||||
void HandleRight();
|
||||
void HandleLeft();
|
||||
@@ -76,14 +78,20 @@ public:
|
||||
bool _draw();
|
||||
void getArg();
|
||||
void createInit();
|
||||
void _createHeap();
|
||||
BOOL _createHeap();
|
||||
cPhs_State _create();
|
||||
bool _delete();
|
||||
|
||||
const static dCcD_SrcSph m_sph_src;
|
||||
static cXyz m_rope_base_vec;
|
||||
static cXyz m_crane_offset;
|
||||
static const dCcD_SrcSph m_sph_src;
|
||||
static const u32 m_heapsize[];
|
||||
static const char m_arc_name[];
|
||||
static const f32 m_rope_joint_len;
|
||||
static const s32 m_rope_min_cnt;
|
||||
|
||||
public:
|
||||
/* 0x0290 */ u32 mType;
|
||||
/* 0x0290 */ s32 mType;
|
||||
/* 0x0294 */ u32 m0294;
|
||||
/* 0x0298 */ u32 m0298;
|
||||
/* 0x029C */ u32 m029C;
|
||||
@@ -102,14 +110,15 @@ public:
|
||||
/* 0x02E8 */ u8 m02E8[0x02EC - 0x02E8];
|
||||
/* 0x02EC */ u8 mbCraneMode;
|
||||
/* 0x02ED */ u8 m02ED[0x02F0 - 0x02ED];
|
||||
/* 0x02F0 */ int mCurMode;
|
||||
/* 0x02F4 */ int m02F4;
|
||||
/* 0x02F0 */ s32 mCurMode;
|
||||
/* 0x02F4 */ s32 m02F4;
|
||||
/* 0x02F8 */ dPa_waveEcallBack mWaveLCallback;
|
||||
/* 0x035C */ dPa_waveEcallBack mWaveRCallback;
|
||||
/* 0x03C0 */ dPa_splashEcallBack mSplashCallBack;
|
||||
/* 0x03DC */ dPa_trackEcallBack mTrackCallBack;
|
||||
/* 0x042C */ dPa_rippleEcallBack mRippleCallBack;
|
||||
/* 0x0440 */ u8 m0440[0x0450 - 0x0440];
|
||||
/* 0x0440 */ u8 m0440;
|
||||
/* 0x0444 */ cXyz m0444;
|
||||
/* 0x0450 */ cXyz mWavePos;
|
||||
/* 0x045C */ csXyz mWaveRot;
|
||||
/* 0x0462 */ u8 m0462[0x0464 - 0x0462];
|
||||
@@ -137,11 +146,10 @@ public:
|
||||
/* 0x0520 */ u8 m0520[0x0528 - 0x0520];
|
||||
/* 0x0528 */ s16 mLightRotX;
|
||||
/* 0x052A */ s16 mLightRotY;
|
||||
/* 0x052C */ request_of_phase_process_class mPhs;
|
||||
/* 0x052C */ request_of_phase_process_class mPhase;
|
||||
/* 0x0534 */ J3DModel* mpModel;
|
||||
/* 0x0538 */ mDoExt_bckAnm mBckAnm;
|
||||
/* 0x0548 */ u8 mbIsLinkRiding;
|
||||
/* 0x0549 */ u8 m0549[0x054C - 0x0549];
|
||||
/* 0x0548 */ bool mbIsLinkRiding;
|
||||
/* 0x054C */ dBgW* mpBgW;
|
||||
/* 0x0550 */ Mtx mMtx;
|
||||
/* 0x0580 */ dBgS_ObjAcch mObjAcch;
|
||||
@@ -151,10 +159,10 @@ public:
|
||||
/* 0x0794 */ f32 mFlagScale;
|
||||
/* 0x0798 */ J3DModel* mpRopeEnd;
|
||||
/* 0x079C */ mDoExt_3DlineMat1_c mRopeLine;
|
||||
/* 0x07D8 */ int m07D8;
|
||||
/* 0x07D8 */ s32 m07D8;
|
||||
/* 0x07DC */ cXyz m07DC[200];
|
||||
/* 0x113C */ csXyz mJointRot[4];
|
||||
/* 0x1154 */ u32 m1154;
|
||||
/* 0x1154 */ s32 m1154;
|
||||
/* 0x1158 */ s16 m1158;
|
||||
/* 0x115A */ s16 m115A;
|
||||
/* 0x115C */ s16 m115C;
|
||||
@@ -164,11 +172,11 @@ public:
|
||||
/* 0x1164 */ s16 mWaveAnimTimer;
|
||||
/* 0x1166 */ u8 m1166;
|
||||
/* 0x1167 */ u8 m1167[0x1168 - 0x1167];
|
||||
/* 0x1168 */ int m1168;
|
||||
/* 0x116C */ int mSvId[4];
|
||||
/* 0x1168 */ s32 m1168;
|
||||
/* 0x116C */ s32 mSvId[4];
|
||||
/* 0x117C */ dCcD_Sph mSph;
|
||||
/* 0x12A8 */ dCcD_Stts mStts;
|
||||
/* 0x12E4 */ u8 m12E4[0x12E8 - 0x12E4];
|
||||
/* 0x12E4 */ int m12E4;
|
||||
/* 0x12E8 */ cXyz mSePos;
|
||||
/* 0x12F4 */ int mStopTimer;
|
||||
/* 0x12F8 */ dLib_wave_c mWave;
|
||||
@@ -177,12 +185,54 @@ public:
|
||||
/* 0x1328 */ cXyz mInitPos;
|
||||
};
|
||||
|
||||
class daObj_Ikada_HIO_c {
|
||||
class daObj_Ikada_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
daObj_Ikada_HIO_c();
|
||||
virtual ~daObj_Ikada_HIO_c() {}
|
||||
|
||||
void genMessage(JORMContext* ctx);
|
||||
|
||||
public:
|
||||
/* Place member variables here */
|
||||
};
|
||||
/* 0x04 */ u8 mbDebugDraw;
|
||||
/* 0x05 */ u8 m05;
|
||||
/* 0x06 */ u8 m06;
|
||||
/* 0x07 */ u8 mbNoRotAnim;
|
||||
/* 0x08 */ u8 m08;
|
||||
/* 0x09 */ u8 m09[0x0C - 0x09];
|
||||
/* 0x0C */ Vec mFlagOffset;
|
||||
/* 0x18 */ f32 mFlagScale;
|
||||
/* 0x1C */ s16 m1C;
|
||||
/* 0x1E */ s16 m1E;
|
||||
/* 0x20 */ f32 m20;
|
||||
/* 0x24 */ s16 m24;
|
||||
/* 0x26 */ u8 m26[0x28 - 0x26];
|
||||
/* 0x28 */ f32 m28;
|
||||
/* 0x2C */ f32 mShipOffsY_Attention;
|
||||
/* 0x30 */ f32 mShipOffsY_Eye;
|
||||
/* 0x34 */ f32 mTerryWaveOffsZ;
|
||||
/* 0x38 */ f32 mTerryWaveOffsY;
|
||||
/* 0x3C */ f32 mTerryTrackOffsZ;
|
||||
/* 0x40 */ f32 mSvWaveOffsX;
|
||||
/* 0x44 */ f32 mSvTrackOffsX;
|
||||
/* 0x48 */ f32 mSvOffsX[4];
|
||||
/* 0x58 */ f32 mTrackIndTransY;
|
||||
/* 0x5C */ f32 mTrackIndScaleY;
|
||||
/* 0x60 */ f32 mSplashScaleMax;
|
||||
/* 0x64 */ f32 mSplashMaxScaleTimer;
|
||||
/* 0x68 */ f32 mWaveVelFade;
|
||||
/* 0x6C */ f32 mTrackVel;
|
||||
/* 0x70 */ f32 mWaveVelSpeed;
|
||||
/* 0x74 */ f32 mWaveVelOffs;
|
||||
/* 0x78 */ f32 mWaveMaxVelocity;
|
||||
/* 0x7C */ Vec mWaveCollapsePos[2];
|
||||
/* 0x94 */ s16 m94;
|
||||
/* 0x96 */ s16 mPlayerStopDistance;
|
||||
/* 0x98 */ s16 m98;
|
||||
/* 0x9A */ s16 m9A;
|
||||
/* 0x9C */ f32 m9C;
|
||||
/* 0xA0 */ f32 mVelocityTargetTerry1;
|
||||
/* 0xA4 */ f32 mVelocityTargetTerry3;
|
||||
/* 0xA8 */ f32 mA8;
|
||||
}; // size = 0xAC
|
||||
|
||||
#endif /* D_A_OBJ_IKADA_H */
|
||||
|
||||
+1
-1
@@ -100,7 +100,7 @@ public:
|
||||
void OnMoveFlag() {}
|
||||
void RoofChk(dBgS_RoofChk*) {}
|
||||
void RwgCaptPoly(int, dBgS_CaptPoly&) {}
|
||||
void SetGrpRoomInf(int) {}
|
||||
void SetGrpRoomInf(int room) { mRoomNo2 = room; }
|
||||
void SetOldShapeAngleY(s16) {}
|
||||
void SetRoomId(u16 roomNo) { mRoomNo = roomNo; }
|
||||
void SphChk(dBgS_SphChk*, void*) {}
|
||||
|
||||
+12
-8
@@ -125,12 +125,12 @@ public:
|
||||
void draw(JPABaseEmitter*);
|
||||
|
||||
JPABaseEmitter* getEmitter() { return mpBaseEmitter; }
|
||||
void setTimer (s16 timerVal) { mFadeTimer = timerVal; }
|
||||
void setSpeed (f32 vel) { mVelFade1 = vel; }
|
||||
void setPitch (f32 pitch) { mVelFade2 = pitch; }
|
||||
void setMaxSpeed (f32 vel) { mMaxParticleVelocity = vel; }
|
||||
void setMaxDisSpeed (f32 vel) { mVelSpeed = vel; }
|
||||
void setAnchor (cXyz* anchorPos1, cXyz* anchorPos2) { mCollapsePos[0].set(*anchorPos1); mCollapsePos[1].set(*anchorPos2); }
|
||||
void setTimer(s16 timerVal) { mFadeTimer = timerVal; }
|
||||
void setSpeed(f32 vel) { mVelFade1 = vel; }
|
||||
void setPitch(f32 pitch) { mVelFade2 = pitch; }
|
||||
void setMaxSpeed(f32 vel) { mMaxParticleVelocity = vel; }
|
||||
void setMaxDisSpeed(f32 vel) { mVelSpeed = vel; }
|
||||
void setAnchor(const cXyz* anchorPos1, const cXyz* anchorPos2) { mCollapsePos[0].set(*anchorPos1); mCollapsePos[1].set(*anchorPos2); }
|
||||
|
||||
virtual ~dPa_waveEcallBack() {}
|
||||
|
||||
@@ -175,10 +175,14 @@ public:
|
||||
void remove();
|
||||
void execute(JPABaseEmitter*);
|
||||
void draw(JPABaseEmitter*);
|
||||
void stop() { mState = 1; }
|
||||
|
||||
JPABaseEmitter* getEmitter() { return mpBaseEmitter; }
|
||||
void setIndirectTexData (f32 exTransY, f32 exScaleY) { mExTransY = exTransY; mExScaleY = exScaleY; }
|
||||
void setSpeed (f32 vel) { mVel = vel; }
|
||||
void setIndirectTexData(f32 exTransY, f32 exScaleY) { mExTransY = exTransY; mExScaleY = exScaleY; }
|
||||
void setSpeed(f32 vel) { mVel = vel; }
|
||||
void setLimitSpeed(f32 vel) { mMinVel = vel; }
|
||||
void setWaterY(f32 y) { mBaseY = y; }
|
||||
void setWaterFlatY(f32 y) { mMinY = y; }
|
||||
|
||||
virtual ~dPa_trackEcallBack() {}
|
||||
|
||||
|
||||
+1322
-68
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user