From 61310b637fefc353dec4f2a39229f26f653abefc Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 17 Dec 2023 21:00:45 -0800 Subject: [PATCH] d_camera --- include/SSystem/SComponent/c_angle.h | 1 + include/d/d_bg_s_lin_chk.h | 6 +- include/d/d_cam_param.h | 2 + include/d/d_camera.h | 419 ++++++++++++++++++++++++++- include/f_op/f_op_camera.h | 261 +---------------- src/d/actor/d_a_obj_zouK.cpp | 2 - src/d/d_camera.cpp | 187 +++++------- src/d/d_drawlist.cpp | 2 - src/d/d_ev_camera.cpp | 20 +- 9 files changed, 497 insertions(+), 403 deletions(-) diff --git a/include/SSystem/SComponent/c_angle.h b/include/SSystem/SComponent/c_angle.h index 13eb90cb2..c6e52697b 100644 --- a/include/SSystem/SComponent/c_angle.h +++ b/include/SSystem/SComponent/c_angle.h @@ -121,6 +121,7 @@ private: cSAngle mInclination; // original: U public: + cSGlobe() {}; cSGlobe(const cSGlobe&); cSGlobe(float, short, short); cSGlobe(float, const cSAngle&, const cSAngle&); diff --git a/include/d/d_bg_s_lin_chk.h b/include/d/d_bg_s_lin_chk.h index 6f4b2c942..498f0d4bf 100644 --- a/include/d/d_bg_s_lin_chk.h +++ b/include/d/d_bg_s_lin_chk.h @@ -68,9 +68,11 @@ public: class dBgS_CamLinChk : public dBgS_LinChk { public: - dBgS_CamLinChk(); + dBgS_CamLinChk() { + mbCamThrough = true; + } - virtual ~dBgS_CamLinChk(); + virtual ~dBgS_CamLinChk() {} }; class dBgS_CamLinChk_NorWtr : public dBgS_CamLinChk { diff --git a/include/d/d_cam_param.h b/include/d/d_cam_param.h index af8b6fa41..dcc8de2d4 100644 --- a/include/d/d_cam_param.h +++ b/include/d/d_cam_param.h @@ -98,6 +98,8 @@ class dCamSetup_c { }; class dCamParam_c { + void Flag(s32, u16); + void Val(s32, int); /* 0x0 */ dCamera__Style* mpStyle; /* 0x4 */ int mStyleIdx; /* 0x8 */ void* vtbl; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 6fb1074f1..b7b387db9 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -1,8 +1,425 @@ #ifndef D_CAMERA_H #define D_CAMERA_H -#include "f_op/f_op_camera.h" +#include "SSystem/SComponent/c_angle.h" +#include "SSystem/SComponent/c_rnd.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" +#include "d/d_cam_param.h" +#include "global.h" +class camera_class; +class dBgS_LinChk; +class dStage_Event_dt_c; +class fopAc_ac_c; + +struct stage_camera__entry { + /* 0x00 */ char mpTypeStr[16]; + /* 0x10 */ u8 mArrowIdx; + /* 0x11 */ u8 m11; + /* 0x12 */ u8 m12; + /* 0x13 */ u8 m13; +}; + +struct stage_arrow__entry { + /* 0x00 */ cXyz mPos; + /* 0x0C */ csXyz mRot; + /* 0x12 */ s16 m12; +}; + +struct dCamera__EventParam { + /* 0x00 */ char mName[16]; + /* 0x10 */ int mValue; +}; + +class d2DBSplinePath { +public: + ~d2DBSplinePath(); + /* 0x00 */ int mKeyframeCur; + /* 0x04 */ int mTimer; + /* 0x08 */ int mKeyframeNum; + /* 0x0C */ int mState; + /* 0x10 */ int m10; + /* 0x14 */ int mKeyframeLast; + /* 0x18 */ u8 m18[0x1C - 0x18]; + /* 0x1C */ f32 mTime; + /* 0x20 */ u8 m20[0x24 - 0x20]; + /* 0x24 */ f32 mFrameWeight[3]; + /* 0x30 */ int mFrameIdx[3]; + /* 0x3C */ u8 m3C[0x40 - 0x3C]; + /* 0x40 */ void* vtbl; +}; + +class dCamForcusLine { +public: + void Init(); + void Draw(); + void Off(); + + /* 0x00 */ void* vtbl; + /* 0x04 */ cM_rnd_c mRnd; + /* 0x10 */ u8 field_10[0x70 - 0x10]; +}; + +class dCamera_c { +public: + struct BG { + BG(); + ~BG(); + u8 temp[0xB0]; + }; + + /* 0x000 */ camera_class* mpCamera; + /* 0x004 */ u8 m004; + /* 0x005 */ u8 m005; + /* 0x006 */ u8 m006[0x008 - 0x006]; + /* 0x008 */ f32 m008; + /* 0x00C */ s16 m00C; + /* 0x00E */ cSAngle m00E; + /* 0x010 */ cXyz mCenter; + /* 0x01C */ cXyz mEye; + /* 0x028 */ cXyz mUp; + /* 0x034 */ cSAngle mBank; + /* 0x036 */ u8 m036[0x038 - 0x036]; + /* 0x038 */ f32 mFovY; + /* 0x03C */ cSGlobe m03C; + /* 0x044 */ cXyz m044; + /* 0x050 */ cXyz m050; + /* 0x05C */ s16 m05C; + /* 0x05E */ u8 m05E[0x060 - 0x05E]; + /* 0x060 */ f32 m060; + /* 0x064 */ u8 m064[0x068 - 0x064]; + /* 0x068 */ int m068; + /* 0x06C */ cSAngle mAngleY; + /* 0x06E */ u8 m06E[0x080 - 0x06E]; + /* 0x080 */ u32 m080; + /* 0x084 */ cXyz m084; + /* 0x090 */ cXyz m090; + /* 0x09C */ f32 m09C; + /* 0x0A0 */ f32 m0A0; + // /* 0x0A4 */ @class$4017d_camera_cpp m0A4[2]; + /* 0x0A4 */ u8 m0A4[0x40]; + /* 0x0E4 */ int mStageMapToolCameraIdx; + /* 0x0E8 */ int m0E8; + /* 0x0EC */ u8 m0EC[0x108 - 0x0EC]; + /* 0x108 */ int m108; + /* 0x10C */ u8 m10C[0x110 - 0x10C]; + /* 0x110 */ u8 m110; + /* 0x111 */ u8 m111[0x114 - 0x111]; + /* 0x114 */ int m114; + /* 0x118 */ int m118; + /* 0x11C */ int m11C; + /* 0x120 */ int mCameraInfoIdx; + /* 0x124 */ int mPadId; + /* 0x128 */ fopAc_ac_c* mpPlayerActor; + /* 0x12C */ fopAc_ac_c* mpLockonTarget; + /* 0x130 */ int m130; + /* 0x134 */ u8 m134[0x138 - 0x134]; + /* 0x138 */ int m138; + /* 0x13C */ int mCurMode; + /* 0x140 */ int mNextMode; + /* 0x144 */ int m144; + /* 0x148 */ cSAngle m148; + /* 0x14A */ u8 m14A[0x14C - 0x14A]; + /* 0x14C */ f32 m14C; + /* 0x150 */ u8 m150[0x154 - 0x150]; + /* 0x154 */ f32 mStickMainPosXLast; + /* 0x158 */ f32 mStickMainPosYLast; + /* 0x15C */ f32 mStickMainValueLast; + /* 0x160 */ f32 mStickMainPosXDelta; + /* 0x164 */ f32 mStickMainPosYDelta; + /* 0x168 */ f32 mStickMainValueDelta; + /* 0x16C */ f32 mStickCPosXLast; + /* 0x170 */ f32 mStickCPosYLast; + /* 0x174 */ f32 mStickCValueLast; + /* 0x178 */ f32 mStickCPosXDelta; + /* 0x17C */ f32 mStickCPosYDelta; + /* 0x180 */ f32 mStickCValueDelta; + /* 0x184 */ u8 m184[0x190 - 0x184]; + /* 0x190 */ f32 mTriggerLeftLast; + /* 0x194 */ f32 mTriggerLeftDelta; + /* 0x198 */ u8 m198; + /* 0x199 */ u8 m199; + /* 0x19A */ u8 m19A; + /* 0x19B */ u8 m19B; + /* 0x19C */ f32 mTriggerRightLast; + /* 0x1A0 */ f32 mTriggerRightDelta; + /* 0x1A4 */ u8 m1A4; + /* 0x1A5 */ u8 m1A5; + /* 0x1A6 */ u8 m1A6; + /* 0x1A7 */ u8 m1A7; + /* 0x1A8 */ u8 m1A8; + /* 0x1A9 */ u8 m1A9; + /* 0x1AA */ u8 m1AA; + /* 0x1AB */ u8 m1AB; + /* 0x1AC */ u8 m1AC; + /* 0x1AD */ u8 m1AD; + /* 0x1AE */ u8 m1AE; + /* 0x1AF */ u8 m1AF[0x1B0 - 0x1AF]; + /* 0x1B0 */ dCamForcusLine mForcusLine; + /* 0x220 */ u8 m220[0x228 - 0x220]; + /* 0x228 */ cXyz mMonitorPos; + /* 0x234 */ f32 m234; + /* 0x238 */ f32 m238; + /* 0x23C */ f32 m23C; + /* 0x240 */ int m240; + /* 0x244 */ f32 m244; + /* 0x248 */ u8 m248[0x254 - 0x248]; + /* 0x254 */ int m254; + /* 0x258 */ u8 m258[0x25C - 0x258]; + /* 0x25C */ BG mBG; + /* 0x30C */ u8 m30C[0x31D - 0x30C]; + /* 0x31D */ u8 m31D; + /* 0x31E */ u8 m31E[0x350 - 0x31E]; + /* 0x350 */ int m350; + /* 0x354 */ u8 m354[0x358 - 0x354]; + /* 0x358 */ int mRoomNo; + /* 0x35C */ int mRoomMapToolCameraIdx; + /* 0x360 */ u8 m360[0x394 - 0x360]; + /* 0x394 */ f32 mEvFovy; + /* 0x398 */ f32 mEvBank; + /* 0x39C */ fopAc_ac_c* mpEvRelActor; + /* 0x3A0 */ char mEvRelUseMask[4]; + /* 0x3A4 */ int mEvTimer; + /* 0x3A8 */ u8 m3A8; + /* 0x3A9 */ u8 m3A9[0x3AC - 0x3A9]; + /* 0x3AC */ cXyz mEvBasePos; + /* 0x3B8 */ u8 m3B8[0x3FC - 0x3B8]; + /* 0x3FC */ int mStaffIdx; + /* 0x400 */ int m400; + /* 0x404 */ int m404; + /* 0x408 */ u8 m408; + /* 0x409 */ u8 m409[0x40C - 0x409]; + /* 0x40C */ int m40C; + /* 0x410 */ int m410; + /* 0x414 */ u8 m414[0x424 - 0x414]; + /* 0x424 */ dCamera__EventParam mEventParams[8]; + /* 0x4C4 */ dStage_Event_dt_c* m4C4; + /* 0x4C8 */ d2DBSplinePath mSpline2DPath; + /* 0x50C */ u32 mEventFlags; + /* 0x510 */ int mCurStyle; + /* 0x514 */ int m514; + /* 0x518 */ int mCurType; + /* 0x51C */ int mNextType; + /* 0x520 */ int mMapToolType; + /* 0x524 */ int m524; + /* 0x528 */ int m528; + /* 0x52C */ u8 m52C[0x530 - 0x52C]; + /* 0x530 */ int m530; + /* 0x534 */ s16 m534; + /* 0x536 */ s16 m536; + /* 0x538 */ u8 m538[0x550 - 0x538]; + /* 0x550 */ int m550; + /* 0x554 */ int m554; + /* 0x558 */ u8 m558[0x568 - 0x558]; + /* 0x568 */ cXyz mCenterShake; + /* 0x574 */ cXyz mEyeShake; + /* 0x580 */ f32 mFovYShake; + /* 0x584 */ u8 m584[0x590 - 0x584]; + /* 0x590 */ int mBlureTimer; + /* 0x594 */ u8 m594[0x59C - 0x594]; + /* 0x59C */ int mBlurePositionType; + /* 0x5A0 */ cXyz mBlurePosition; + /* 0x5AC */ cXyz mBlureScale; + /* 0x5B8 */ f32 mBlureAlpha; + /* 0x5BC */ u8 m5BC[0x5C0 - 0x5BC]; + /* 0x5C0 */ stage_camera__entry mCurRoomCamEntry; + /* 0x5D4 */ stage_arrow__entry mCurRoomArrowEntry; + /* 0x5E8 */ int mCurArrowIdx; + /* 0x5EC */ f32 m5EC; + /* 0x5F0 */ f32 m5F0; + /* 0x5F4 */ u8 m5F4[0x5F8 - 0x5F4]; + /* 0x5F8 */ f32 m5F8; + /* 0x5FC */ int m5FC; + /* 0x600 */ u8 m600[0x604 - 0x600]; + /* 0x604 */ f32 m604; + /* 0x608 */ u8 m608[0x60C - 0x608]; + /* 0x60C */ dCamSetup_c mCamSetup; + /* 0x750 */ dCamParam_c mCamParam; + /* 0x75C */ int mCamTypeField; + /* 0x760 */ int mCamTypeEvent; + /* 0x764 */ int mCamTypeWater; + /* 0x768 */ int mCamTypeSubject; + /* 0x76C */ int mCamTypeBoat; + /* 0x770 */ int mCamTypeBoatBattle; + /* 0x774 */ int m774; + /* 0x778 */ int mCamTypeKeep; + /* 0x77C */ int mCamTypeRestrict; + /* 0x780 */ u8 field_780[0x800 - 0x780]; + +public: + dCamera_c(camera_class*); + ~dCamera_c(); + void initialize(camera_class*, fopAc_ac_c*, u32, u32); + void Start(); + void Stop(); + void Stay(); + void ChangeModeOK(s32); + void initPad(); + void updatePad(); + void initMonitor(); + void updateMonitor(); + void calcPeepAngle(); + void Att(); + void checkForceLockTarget(); + void Run(); + void NotRun(); + void SetTrimSize(s32); + void SetTrimTypeForce(s32); + void CalcTrimSize(); + void Draw(); + void nextMode(s32); + void onModeChange(s32, s32); + void nextType(s32); + void onTypeChange(s32, s32); + void SetTypeForce(char*, fopAc_ac_c*); + void SetTypeForce(s32, fopAc_ac_c*); + void onStyleChange(s32, s32); + void GetCameraTypeFromMapToolID(s32, s32); + void GetCameraTypeFromCameraName(const char*); + void pushPos(); + void directionOf(fopAc_ac_c*); + void positionOf(fopAc_ac_c*); + void attentionPos(fopAc_ac_c*); + void relationalPos(fopAc_ac_c*, cXyz*); + void relationalPos(fopAc_ac_c*, cXyz*, cSAngle); + void relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, f32); + void setDMCAngle(); + void getDMCAngle(cSAngle); + void pointInSight(cXyz*); + void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*); + void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16); + void groundHeight(cXyz*); + void lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32); + void lineBGCheck(cXyz*, cXyz*, cXyz*, u32); + void lineBGCheck(cXyz*, cXyz*, u32); + void lineBGCheckBack(cXyz*, cXyz*, u32); + void lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32); + void lineCollisionCheckBush(cXyz*, cXyz*); + void compWallMargin(cXyz*, f32); + void defaultTriming(); + void setView(f32, f32, f32, f32); + void forwardCheckAngle(); + void bumpCheck(u32); + void getWaterSurfaceHeight(cXyz*); + void checkSpecialArea(); + void checkGroundInfo(); + void followCamera2(s32); + void followCamera(s32); + void eyePos(fopAc_ac_c*); + void heightOf(fopAc_ac_c*); + void lockonCamera(s32); + void getMsgCmdSpeaker(); + void getMsgCmdCut(); + void talktoCamera(s32); + void CalcSubjectAngle(s16*, s16*); + void subjectCamera(s32); + void towerCamera(s32); + void crawlCamera(s32); + void hookshotCamera(s32); + void tornadoCamera(s32); + void rideCamera(s32); + void hungCamera(s32); + void vomitCamera(s32); + void shieldCamera(s32); + void manualCamera(s32); + void nonOwnerCamera(s32); + void fixedFrameCamera(s32); + void fixedPositionCamera(s32); + void eventCamera(s32); + void demoCamera(s32); + void letCamera(s32); + void Set(cXyz, cXyz); + void Set(cXyz, cXyz, f32, s16); + void Set(cXyz, cXyz, s16, f32); + void Reset(cXyz, cXyz, f32, s16); + void Reset(cXyz, cXyz); + void Reset(); + void ResetView(); + void Chtyp(s32); + void U2(); + void shakeCamera(); + void StartShake(s32, u8*, s32, cXyz); + void StopShake(); + void ResetBlure(int); + void SetBlureAlpha(f32); + void SetBlureScale(f32, f32, f32); + void SetBlureScale(f32); + void SetBlurePosition(f32, f32, f32); + void SetBlurePositionType(int); + void SetBlureTimer(s32); + void SubjectLockOn(fopAc_ac_c*); + void SubjectLockOff(); + void GetForceLockOnActor(); + void ForceLockOn(unsigned int); + void ForceLockOff(unsigned int); + void SetExtendedPosition(cXyz*); + void ScopeViewMsgModeOff(); + + void setFlag(u32); + void chkFlag(u32); + void Bank(); + void Up(); + void Center(); + + void StartEventCamera(int, int, ...); + void EndEventCamera(int); + void searchEventArgData(char*); + void getEvIntData(int*, char*); + void getEvStringPntData(char*); + void getEvIntData(int*, char*, int); + void getEvFloatData(f32*, char*, f32); + void getEvXyzData(cXyz*, char*, cXyz); + void getEvStringData(char*, char*, char*); + void getEvStringPntData(char*, char*); + void getEvActor(char*); + void getEvActor(char*, char*); + void pauseEvCamera(); + void fixedFrameEvCamera(); + void stokerEvCamera(); + void rollingEvCamera(); + void fixedPositionEvCamera(); + void uniformTransEvCamera(); + void uniformBrakeEvCamera(); + void uniformAcceleEvCamera(); + void watchActorEvCamera(); + void restorePosEvCamera(); + void talktoEvCamera(); + void maptoolIdEvCamera(); + void styleEvCamera(); + void gameOverEvCamera(); + void tactEvCamera(); + void windDirectionEvCamera(); + void turnToActorEvCamera(); + void tornadoWarpEvCamera(); + void saveEvCamera(); + void loadEvCamera(); + void useItem0EvCamera(); + void useItem1EvCamera(); + void getItemEvCamera(); + void possessedEvCamera(); + void fixedFramesEvCamera(); + void bSplineEvCamera(); + void twoActor0EvCamera(); + + void CStickUse() {} + void CStickUseless() {} + void Eye() {} + void StickUse() {} + void StickUseless() {} + void clrFlag(u32) {} +}; + +STATIC_ASSERT(sizeof(dCamera_c) == 0x800); + +class dBgS_CamSphChk { + ~dBgS_CamSphChk(); +}; + +s16 dCam_getAngleY(camera_class*); +s16 dCam_getAngleX(camera_class*); s16 dCam_getControledAngleY(camera_class*); +camera_class* dCam_getCamera(); +dCamera_c* dCam_getBody(); #endif /* D_CAMERA_H */ diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 62580bc8a..5e9792928 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -1,264 +1,11 @@ #ifndef F_F_OP_CAMERA_H_ #define F_F_OP_CAMERA_H_ -#include "f_op/f_op_view.h" -#include "SSystem/SComponent/c_sxyz.h" -#include "SSystem/SComponent/c_phase.h" -#include "SSystem/SComponent/c_angle.h" -#include "SSystem/SComponent/c_rnd.h" #include "d/d_cam_param.h" +#include "d/d_camera.h" +#include "f_op/f_op_view.h" #include "global.h" -class fopAc_ac_c; -class dStage_Event_dt_c; -class camera_class; - -struct stage_camera__entry { - /* 0x00 */ char mpTypeStr[16]; - /* 0x10 */ u8 mArrowIdx; - /* 0x11 */ u8 m11; - /* 0x12 */ u8 m12; - /* 0x13 */ u8 m13; -}; - -struct stage_arrow__entry { - /* 0x00 */ cXyz mPos; - /* 0x0C */ csXyz mRot; - /* 0x12 */ s16 m12; -}; - -struct dCamera__EventParam { - /* 0x00 */ char mName[16]; - /* 0x10 */ int mValue; -}; - -class d2DBSplinePath { - /* 0x00 */ int mKeyframeCur; - /* 0x04 */ int mTimer; - /* 0x08 */ int mKeyframeNum; - /* 0x0C */ int mState; - /* 0x10 */ int m10; - /* 0x14 */ int mKeyframeLast; - /* 0x18 */ u8 m18[0x1C - 0x18]; - /* 0x1C */ f32 mTime; - /* 0x20 */ u8 m20[0x24 - 0x20]; - /* 0x24 */ f32 mFrameWeight[3]; - /* 0x30 */ int mFrameIdx[3]; - /* 0x3C */ u8 m3C[0x40 - 0x3C]; - /* 0x40 */ void* vtbl; -}; - -class dCamForcusLine { - /* 0x00 */ void* vtbl; - /* 0x04 */ cM_rnd_c mRnd; - /* 0x10 */ u8 field_10[0x70 - 0x10]; -}; - -class dCamera_c { -public: - struct BG { - u8 temp[0xB0]; - }; - - /* 0x000 */ camera_class* mpCamera; - /* 0x004 */ u8 m004; - /* 0x005 */ u8 m005; - /* 0x006 */ u8 m006[0x008 - 0x006]; - /* 0x008 */ f32 m008; - /* 0x00C */ s16 m00C; - /* 0x00E */ cSAngle m00E; - /* 0x010 */ cXyz mCenter; - /* 0x01C */ cXyz mEye; - /* 0x028 */ cXyz mUp; - /* 0x034 */ cSAngle mBank; - /* 0x036 */ u8 m036[0x038 - 0x036]; - /* 0x038 */ f32 mFovY; - /* 0x03C */ cSGlobe m03C; - /* 0x044 */ cXyz m044; - /* 0x050 */ cXyz m050; - /* 0x05C */ s16 m05C; - /* 0x05E */ u8 m05E[0x060 - 0x05E]; - /* 0x060 */ f32 m060; - /* 0x064 */ u8 m064[0x068 - 0x064]; - /* 0x068 */ int m068; - /* 0x06C */ cSAngle mAngleY; - /* 0x06E */ u8 m06E[0x080 - 0x06E]; - /* 0x080 */ u32 m080; - /* 0x084 */ cXyz m084; - /* 0x090 */ cXyz m090; - /* 0x09C */ f32 m09C; - /* 0x0A0 */ f32 m0A0; - // /* 0x0A4 */ @class$4017d_camera_cpp m0A4[2]; - /* 0x0A4 */ u8 m0A4[0x40]; - /* 0x0E4 */ int mStageMapToolCameraIdx; - /* 0x0E8 */ int m0E8; - /* 0x0EC */ u8 m0EC[0x108 - 0x0EC]; - /* 0x108 */ int m108; - /* 0x10C */ u8 m10C[0x110 - 0x10C]; - /* 0x110 */ u8 m110; - /* 0x111 */ u8 m111[0x114 - 0x111]; - /* 0x114 */ int m114; - /* 0x118 */ int m118; - /* 0x11C */ int m11C; - /* 0x120 */ int mCameraInfoIdx; - /* 0x124 */ int mPadId; - /* 0x128 */ fopAc_ac_c* mpPlayerActor; - /* 0x12C */ fopAc_ac_c* mpLockonTarget; - /* 0x130 */ int m130; - /* 0x134 */ u8 m134[0x138 - 0x134]; - /* 0x138 */ int m138; - /* 0x13C */ int mCurMode; - /* 0x140 */ int mNextMode; - /* 0x144 */ int m144; - /* 0x148 */ cSAngle m148; - /* 0x14A */ u8 m14A[0x14C - 0x14A]; - /* 0x14C */ f32 m14C; - /* 0x150 */ u8 m150[0x154 - 0x150]; - /* 0x154 */ f32 mStickMainPosXLast; - /* 0x158 */ f32 mStickMainPosYLast; - /* 0x15C */ f32 mStickMainValueLast; - /* 0x160 */ f32 mStickMainPosXDelta; - /* 0x164 */ f32 mStickMainPosYDelta; - /* 0x168 */ f32 mStickMainValueDelta; - /* 0x16C */ f32 mStickCPosXLast; - /* 0x170 */ f32 mStickCPosYLast; - /* 0x174 */ f32 mStickCValueLast; - /* 0x178 */ f32 mStickCPosXDelta; - /* 0x17C */ f32 mStickCPosYDelta; - /* 0x180 */ f32 mStickCValueDelta; - /* 0x184 */ u8 m184[0x190 - 0x184]; - /* 0x190 */ f32 mTriggerLeftLast; - /* 0x194 */ f32 mTriggerLeftDelta; - /* 0x198 */ u8 m198; - /* 0x199 */ u8 m199; - /* 0x19A */ u8 m19A; - /* 0x19B */ u8 m19B; - /* 0x19C */ f32 mTriggerRightLast; - /* 0x1A0 */ f32 mTriggerRightDelta; - /* 0x1A4 */ u8 m1A4; - /* 0x1A5 */ u8 m1A5; - /* 0x1A6 */ u8 m1A6; - /* 0x1A7 */ u8 m1A7; - /* 0x1A8 */ u8 m1A8; - /* 0x1A9 */ u8 m1A9; - /* 0x1AA */ u8 m1AA; - /* 0x1AB */ u8 m1AB; - /* 0x1AC */ u8 m1AC; - /* 0x1AD */ u8 m1AD; - /* 0x1AE */ u8 m1AE; - /* 0x1AF */ u8 m1AF[0x1B0 - 0x1AF]; - /* 0x1B0 */ dCamForcusLine mForcusLine; - /* 0x220 */ u8 m220[0x228 - 0x220]; - /* 0x228 */ cXyz mMonitorPos; - /* 0x234 */ f32 m234; - /* 0x238 */ f32 m238; - /* 0x23C */ f32 m23C; - /* 0x240 */ int m240; - /* 0x244 */ f32 m244; - /* 0x248 */ u8 m248[0x254 - 0x248]; - /* 0x254 */ int m254; - /* 0x258 */ u8 m258[0x25C - 0x258]; - /* 0x25C */ BG mBG; - /* 0x30C */ u8 m30C[0x31D - 0x30C]; - /* 0x31D */ u8 m31D; - /* 0x31E */ u8 m31E[0x350 - 0x31E]; - /* 0x350 */ int m350; - /* 0x354 */ u8 m354[0x358 - 0x354]; - /* 0x358 */ int mRoomNo; - /* 0x35C */ int mRoomMapToolCameraIdx; - /* 0x360 */ u8 m360[0x394 - 0x360]; - /* 0x394 */ f32 mEvFovy; - /* 0x398 */ f32 mEvBank; - /* 0x39C */ fopAc_ac_c* mpEvRelActor; - /* 0x3A0 */ char mEvRelUseMask[4]; - /* 0x3A4 */ int mEvTimer; - /* 0x3A8 */ u8 m3A8; - /* 0x3A9 */ u8 m3A9[0x3AC - 0x3A9]; - /* 0x3AC */ cXyz mEvBasePos; - /* 0x3B8 */ u8 m3B8[0x3FC - 0x3B8]; - /* 0x3FC */ int mStaffIdx; - /* 0x400 */ int m400; - /* 0x404 */ int m404; - /* 0x408 */ u8 m408; - /* 0x409 */ u8 m409[0x40C - 0x409]; - /* 0x40C */ int m40C; - /* 0x410 */ int m410; - /* 0x414 */ u8 m414[0x424 - 0x414]; - /* 0x424 */ dCamera__EventParam mEventParams[8]; - /* 0x4C4 */ dStage_Event_dt_c* m4C4; - /* 0x4C8 */ d2DBSplinePath mSpline2DPath; - /* 0x50C */ u32 mEventFlags; - /* 0x510 */ int mCurStyle; - /* 0x514 */ int m514; - /* 0x518 */ int mCurType; - /* 0x51C */ int mNextType; - /* 0x520 */ int mMapToolType; - /* 0x524 */ int m524; - /* 0x528 */ int m528; - /* 0x52C */ u8 m52C[0x530 - 0x52C]; - /* 0x530 */ int m530; - /* 0x534 */ s16 m534; - /* 0x536 */ s16 m536; - /* 0x538 */ u8 m538[0x550 - 0x538]; - /* 0x550 */ int m550; - /* 0x554 */ int m554; - /* 0x558 */ u8 m558[0x568 - 0x558]; - /* 0x568 */ cXyz mCenterShake; - /* 0x574 */ cXyz mEyeShake; - /* 0x580 */ f32 mFovYShake; - /* 0x584 */ u8 m584[0x590 - 0x584]; - /* 0x590 */ int mBlureTimer; - /* 0x594 */ u8 m594[0x59C - 0x594]; - /* 0x59C */ int mBlurePositionType; - /* 0x5A0 */ cXyz mBlurePosition; - /* 0x5AC */ cXyz mBlureScale; - /* 0x5B8 */ f32 mBlureAlpha; - /* 0x5BC */ u8 m5BC[0x5C0 - 0x5BC]; - /* 0x5C0 */ stage_camera__entry mCurRoomCamEntry; - /* 0x5D4 */ stage_arrow__entry mCurRoomArrowEntry; - /* 0x5E8 */ int mCurArrowIdx; - /* 0x5EC */ f32 m5EC; - /* 0x5F0 */ f32 m5F0; - /* 0x5F4 */ u8 m5F4[0x5F8 - 0x5F4]; - /* 0x5F8 */ f32 m5F8; - /* 0x5FC */ int m5FC; - /* 0x600 */ u8 m600[0x604 - 0x600]; - /* 0x604 */ f32 m604; - /* 0x608 */ u8 m608[0x60C - 0x608]; - /* 0x60C */ dCamSetup_c mCamSetup; - /* 0x750 */ dCamParam_c mCamParam; - /* 0x75C */ int mCamTypeField; - /* 0x760 */ int mCamTypeEvent; - /* 0x764 */ int mCamTypeWater; - /* 0x768 */ int mCamTypeSubject; - /* 0x76C */ int mCamTypeBoat; - /* 0x770 */ int mCamTypeBoatBattle; - /* 0x774 */ int m774; - /* 0x778 */ int mCamTypeKeep; - /* 0x77C */ int mCamTypeRestrict; - /* 0x780 */ u8 field_780[0x800 - 0x780]; - -public: - void ForceLockOff(unsigned int pcId); - void Reset(cXyz, cXyz, f32, s16); - void Set(cXyz, cXyz, f32, s16); - void Stay(); - void SetTrimSize(s32); - void StartEventCamera(int, int, ...); - void EndEventCamera(int); - - void CStickUse() {} - void CStickUseless() {} - void Center() {} - void Eye() {} - void StickUse() {} - void StickUseless() {} - void clrFlag(u32) {} - void setFlag(u32) {} -}; - -STATIC_ASSERT(sizeof(dCamera_c) == 0x800); - typedef struct leafdraw_method_class leafdraw_method_class; class camera_process_class : public view_class { @@ -286,8 +33,4 @@ struct camera_process_profile_definition { /* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods }; -dCamera_c* dCam_getBody(); -s16 dCam_getAngleY(camera_class*); -s16 dCam_getAngleX(camera_class*); - #endif diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 1f68d5ab5..abc45f5dc 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -278,8 +278,6 @@ bool daObjZouk::Act_c::_draw() { return true; } -camera_class * dCam_getCamera(); - /* 000015F0-00001804 .text setEffectMtx__Q29daObjZouk5Act_cFPC4cXyzf */ void daObjZouk::Act_c::setEffectMtx(const cXyz* pos, f32 scale) { static Mtx mtx_adj = { diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 12dc29547..68be33ce1 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,9 +3,14 @@ // Translation Unit: d_camera.cpp // -#include "d_camera.h" +#include "d/d_camera.h" +#include "d/d_bg_s_gnd_chk.h" +#include "d/d_bg_s_lin_chk.h" +#include "d/d_bg_s_sph_chk.h" +#include "SSystem/SComponent/c_bg_s.h" #include "dolphin/types.h" +class camera_process_class; /* 80161790-801618B8 .text __ct__9dCamera_cFP12camera_class */ dCamera_c::dCamera_c(camera_class*) { @@ -18,7 +23,7 @@ dCamera_c::~dCamera_c() { } /* 80161994-80162128 .text initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl */ -void dCamera_c::initialize(camera_class*, fopAc_ac_c*, unsigned long, unsigned long) { +void dCamera_c::initialize(camera_class*, fopAc_ac_c*, u32, u32) { /* Nonmatching */ } @@ -38,7 +43,7 @@ void dCamera_c::Stay() { } /* 8016214C-801621A0 .text ChangeModeOK__9dCamera_cFl */ -void dCamera_c::ChangeModeOK(long) { +void dCamera_c::ChangeModeOK(s32) { /* Nonmatching */ } @@ -72,11 +77,6 @@ dBgS_CamLinChk_NorWtr::~dBgS_CamLinChk_NorWtr() { /* Nonmatching */ } -/* 8016319C-801632F0 .text __dt__14dBgS_CamLinChkFv */ -dBgS_CamLinChk::~dBgS_CamLinChk() { - /* Nonmatching */ -} - /* 801632F0-8016336C .text Att__9dCamera_cFv */ void dCamera_c::Att() { /* Nonmatching */ @@ -98,12 +98,12 @@ void dCamera_c::NotRun() { } /* 801640A8-801640B4 .text SetTrimSize__9dCamera_cFl */ -void dCamera_c::SetTrimSize(long) { +void dCamera_c::SetTrimSize(s32) { /* Nonmatching */ } /* 801640B4-801640C0 .text SetTrimTypeForce__9dCamera_cFl */ -void dCamera_c::SetTrimTypeForce(long) { +void dCamera_c::SetTrimTypeForce(s32) { /* Nonmatching */ } @@ -118,22 +118,22 @@ void dCamera_c::Draw() { } /* 8016418C-80164898 .text nextMode__9dCamera_cFl */ -void dCamera_c::nextMode(long) { +void dCamera_c::nextMode(s32) { /* Nonmatching */ } /* 80164898-80164A48 .text onModeChange__9dCamera_cFll */ -void dCamera_c::onModeChange(long, long) { +void dCamera_c::onModeChange(s32, s32) { /* Nonmatching */ } /* 80164A48-80164CEC .text nextType__9dCamera_cFl */ -void dCamera_c::nextType(long) { +void dCamera_c::nextType(s32) { /* Nonmatching */ } /* 80164CEC-80164DB4 .text onTypeChange__9dCamera_cFll */ -void dCamera_c::onTypeChange(long, long) { +void dCamera_c::onTypeChange(s32, s32) { /* Nonmatching */ } @@ -143,17 +143,17 @@ void dCamera_c::SetTypeForce(char*, fopAc_ac_c*) { } /* 80164DFC-80164E2C .text SetTypeForce__9dCamera_cFlP10fopAc_ac_c */ -void dCamera_c::SetTypeForce(long, fopAc_ac_c*) { +void dCamera_c::SetTypeForce(s32, fopAc_ac_c*) { /* Nonmatching */ } /* 80164E2C-80164F5C .text onStyleChange__9dCamera_cFll */ -void dCamera_c::onStyleChange(long, long) { +void dCamera_c::onStyleChange(s32, s32) { /* Nonmatching */ } /* 80164F5C-8016513C .text GetCameraTypeFromMapToolID__9dCamera_cFll */ -void dCamera_c::GetCameraTypeFromMapToolID(long, long) { +void dCamera_c::GetCameraTypeFromMapToolID(s32, s32) { /* Nonmatching */ } @@ -168,7 +168,7 @@ void dCamera_c::pushPos() { } /* 80165234-8016528C .text limited_range_addition__FPffff */ -void limited_range_addition(float*, float, float, float) { +void limited_range_addition(f32*, f32, f32, f32) { /* Nonmatching */ } @@ -198,7 +198,7 @@ void dCamera_c::relationalPos(fopAc_ac_c*, cXyz*, cSAngle) { } /* 8016548C-801656AC .text relationalPos__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzf */ -void dCamera_c::relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, float) { +void dCamera_c::relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, f32) { /* Nonmatching */ } @@ -223,7 +223,7 @@ void dCamera_c::radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*) { } /* 80165830-80165CC4 .text radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfs */ -void dCamera_c::radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, float, short) { +void dCamera_c::radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16) { /* Nonmatching */ } @@ -238,27 +238,27 @@ dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() { } /* 80166230-80166354 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl */ -void dCamera_c::lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, unsigned long) { +void dCamera_c::lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32) { /* Nonmatching */ } /* 80166354-80166740 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl */ -void dCamera_c::lineBGCheck(cXyz*, cXyz*, cXyz*, unsigned long) { +void dCamera_c::lineBGCheck(cXyz*, cXyz*, cXyz*, u32) { /* Nonmatching */ } /* 80166740-80166A04 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl */ -void dCamera_c::lineBGCheck(cXyz*, cXyz*, unsigned long) { +void dCamera_c::lineBGCheck(cXyz*, cXyz*, u32) { /* Nonmatching */ } /* 80166A04-80166CD4 .text lineBGCheckBack__9dCamera_cFP4cXyzP4cXyzUl */ -void dCamera_c::lineBGCheckBack(cXyz*, cXyz*, unsigned long) { +void dCamera_c::lineBGCheckBack(cXyz*, cXyz*, u32) { /* Nonmatching */ } /* 80166CD4-80166D00 .text lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl */ -void dCamera_c::lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, unsigned long) { +void dCamera_c::lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32) { /* Nonmatching */ } @@ -273,7 +273,7 @@ void sph_chk_callback(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void* } /* 80166EA4-80167294 .text compWallMargin__9dCamera_cFP4cXyzf */ -void dCamera_c::compWallMargin(cXyz*, float) { +void dCamera_c::compWallMargin(cXyz*, f32) { /* Nonmatching */ } @@ -282,18 +282,13 @@ dBgS_CamSphChk::~dBgS_CamSphChk() { /* Nonmatching */ } -/* 801673DC-801674F4 .text __dt__11dBgS_SphChkFv */ -dBgS_SphChk::~dBgS_SphChk() { - /* Nonmatching */ -} - /* 801674F4-801675E8 .text defaultTriming__9dCamera_cFv */ void dCamera_c::defaultTriming() { /* Nonmatching */ } /* 801675E8-801676C0 .text setView__9dCamera_cFffff */ -void dCamera_c::setView(float, float, float, float) { +void dCamera_c::setView(f32, f32, f32, f32) { /* Nonmatching */ } @@ -303,7 +298,7 @@ void dCamera_c::forwardCheckAngle() { } /* 80167F08-80168D44 .text bumpCheck__9dCamera_cFUl */ -void dCamera_c::bumpCheck(unsigned long) { +void dCamera_c::bumpCheck(u32) { /* Nonmatching */ } @@ -328,18 +323,12 @@ void dCamera_c::checkGroundInfo() { } /* 8016A0F0-8016A110 .text followCamera2__9dCamera_cFl */ -void dCamera_c::followCamera2(long) { +void dCamera_c::followCamera2(s32) { /* Nonmatching */ } /* 8016A110-8016C4F8 .text followCamera__9dCamera_cFl */ -void dCamera_c::followCamera(long) { - /* Nonmatching */ -} - - -/* 8016C53C-8016C55C .text d2s__6cAngleFf */ -void cAngle::d2s(float) { +void dCamera_c::followCamera(s32) { /* Nonmatching */ } @@ -348,20 +337,13 @@ void dCamera_c::eyePos(fopAc_ac_c*) { /* Nonmatching */ } -/* 8016C578-8016C5A4 .text GetTriPla__4cBgSCFR13cBgS_PolyInfo */ -void cBgS::GetTriPla(cBgS_PolyInfo&) const { - /* Nonmatching */ -} - /* 8016C5A4-8016C5D0 .text heightOf__9dCamera_cFP10fopAc_ac_c */ void dCamera_c::heightOf(fopAc_ac_c*) { /* Nonmatching */ } - - /* 8016C618-8016D824 .text lockonCamera__9dCamera_cFl */ -void dCamera_c::lockonCamera(long) { +void dCamera_c::lockonCamera(s32) { /* Nonmatching */ } @@ -376,94 +358,92 @@ void dCamera_c::getMsgCmdCut() { } /* 8016D8D0-80170434 .text talktoCamera__9dCamera_cFl */ -void dCamera_c::talktoCamera(long) { +void dCamera_c::talktoCamera(s32) { /* Nonmatching */ } - - /* 80170490-801708E0 .text CalcSubjectAngle__9dCamera_cFPsPs */ -void dCamera_c::CalcSubjectAngle(short*, short*) { +void dCamera_c::CalcSubjectAngle(s16*, s16*) { /* Nonmatching */ } /* 801708E0-801719C4 .text subjectCamera__9dCamera_cFl */ -void dCamera_c::subjectCamera(long) { +void dCamera_c::subjectCamera(s32) { /* Nonmatching */ } /* 801719C4-80172C20 .text towerCamera__9dCamera_cFl */ -void dCamera_c::towerCamera(long) { +void dCamera_c::towerCamera(s32) { /* Nonmatching */ } /* 80172C20-8017346C .text crawlCamera__9dCamera_cFl */ -void dCamera_c::crawlCamera(long) { +void dCamera_c::crawlCamera(s32) { /* Nonmatching */ } /* 8017346C-80173E40 .text hookshotCamera__9dCamera_cFl */ -void dCamera_c::hookshotCamera(long) { +void dCamera_c::hookshotCamera(s32) { /* Nonmatching */ } /* 80173E40-80174E98 .text tornadoCamera__9dCamera_cFl */ -void dCamera_c::tornadoCamera(long) { +void dCamera_c::tornadoCamera(s32) { /* Nonmatching */ } /* 80174E98-8017623C .text rideCamera__9dCamera_cFl */ -void dCamera_c::rideCamera(long) { +void dCamera_c::rideCamera(s32) { /* Nonmatching */ } /* 8017623C-80176F54 .text hungCamera__9dCamera_cFl */ -void dCamera_c::hungCamera(long) { +void dCamera_c::hungCamera(s32) { /* Nonmatching */ } /* 80176F54-8017793C .text vomitCamera__9dCamera_cFl */ -void dCamera_c::vomitCamera(long) { +void dCamera_c::vomitCamera(s32) { /* Nonmatching */ } /* 8017793C-801787B8 .text shieldCamera__9dCamera_cFl */ -void dCamera_c::shieldCamera(long) { +void dCamera_c::shieldCamera(s32) { /* Nonmatching */ } /* 801787B8-801795C8 .text manualCamera__9dCamera_cFl */ -void dCamera_c::manualCamera(long) { +void dCamera_c::manualCamera(s32) { /* Nonmatching */ } /* 801795C8-801799C0 .text nonOwnerCamera__9dCamera_cFl */ -void dCamera_c::nonOwnerCamera(long) { +void dCamera_c::nonOwnerCamera(s32) { /* Nonmatching */ } /* 801799C0-80179F8C .text fixedFrameCamera__9dCamera_cFl */ -void dCamera_c::fixedFrameCamera(long) { +void dCamera_c::fixedFrameCamera(s32) { /* Nonmatching */ } /* 80179F8C-8017A80C .text fixedPositionCamera__9dCamera_cFl */ -void dCamera_c::fixedPositionCamera(long) { +void dCamera_c::fixedPositionCamera(s32) { /* Nonmatching */ } /* 8017A80C-8017B144 .text eventCamera__9dCamera_cFl */ -void dCamera_c::eventCamera(long) { +void dCamera_c::eventCamera(s32) { /* Nonmatching */ } /* 8017B144-8017B14C .text demoCamera__9dCamera_cFl */ -void dCamera_c::demoCamera(long) { +void dCamera_c::demoCamera(s32) { /* Nonmatching */ } /* 8017B14C-8017B154 .text letCamera__9dCamera_cFl */ -void dCamera_c::letCamera(long) { +void dCamera_c::letCamera(s32) { /* Nonmatching */ } @@ -473,17 +453,17 @@ void dCamera_c::Set(cXyz, cXyz) { } /* 8017B18C-8017B1EC .text Set__9dCamera_cF4cXyz4cXyzfs */ -void dCamera_c::Set(cXyz, cXyz, float, short) { +void dCamera_c::Set(cXyz, cXyz, f32, s16) { /* Nonmatching */ } /* 8017B1EC-8017B24C .text Set__9dCamera_cF4cXyz4cXyzsf */ -void dCamera_c::Set(cXyz, cXyz, short, float) { +void dCamera_c::Set(cXyz, cXyz, s16, f32) { /* Nonmatching */ } /* 8017B24C-8017B31C .text Reset__9dCamera_cF4cXyz4cXyzfs */ -void dCamera_c::Reset(cXyz, cXyz, float, short) { +void dCamera_c::Reset(cXyz, cXyz, f32, s16) { /* Nonmatching */ } @@ -503,7 +483,7 @@ void dCamera_c::ResetView() { } /* 8017B4C4-8017B51C .text Chtyp__9dCamera_cFl */ -void dCamera_c::Chtyp(long) { +void dCamera_c::Chtyp(s32) { /* Nonmatching */ } @@ -518,7 +498,7 @@ void dCamera_c::shakeCamera() { } /* 8017BA50-8017BB8C .text StartShake__9dCamera_cFlPUcl4cXyz */ -void dCamera_c::StartShake(long, unsigned char*, long, cXyz) { +void dCamera_c::StartShake(s32, u8*, s32, cXyz) { /* Nonmatching */ } @@ -533,22 +513,22 @@ void dCamera_c::ResetBlure(int) { } /* 8017BBF0-8017BBF8 .text SetBlureAlpha__9dCamera_cFf */ -void dCamera_c::SetBlureAlpha(float) { +void dCamera_c::SetBlureAlpha(f32) { /* Nonmatching */ } /* 8017BBF8-8017BC08 .text SetBlureScale__9dCamera_cFfff */ -void dCamera_c::SetBlureScale(float, float, float) { +void dCamera_c::SetBlureScale(f32, f32, f32) { /* Nonmatching */ } /* 8017BC08-8017BC1C .text SetBlureScale__9dCamera_cFf */ -void dCamera_c::SetBlureScale(float) { +void dCamera_c::SetBlureScale(f32) { /* Nonmatching */ } /* 8017BC1C-8017BC74 .text SetBlurePosition__9dCamera_cFfff */ -void dCamera_c::SetBlurePosition(float, float, float) { +void dCamera_c::SetBlurePosition(f32, f32, f32) { /* Nonmatching */ } @@ -558,7 +538,7 @@ void dCamera_c::SetBlurePositionType(int) { } /* 8017BC7C-8017BC84 .text SetBlureTimer__9dCamera_cFl */ -void dCamera_c::SetBlureTimer(long) { +void dCamera_c::SetBlureTimer(s32) { /* Nonmatching */ } @@ -603,27 +583,27 @@ void dCam_isManual(camera_class*) { } /* 8017BD9C-8017BDC0 .text dCam_getAngleY__FP12camera_class */ -void dCam_getAngleY(camera_class*) { +s16 dCam_getAngleY(camera_class*) { /* Nonmatching */ } /* 8017BDC0-8017BDC8 .text dCam_getAngleX__FP12camera_class */ -void dCam_getAngleX(camera_class*) { +s16 dCam_getAngleX(camera_class*) { /* Nonmatching */ } /* 8017BDC8-8017BDEC .text dCam_getControledAngleY__FP12camera_class */ -void dCam_getControledAngleY(camera_class*) { +s16 dCam_getControledAngleY(camera_class*) { /* Nonmatching */ } /* 8017BDEC-8017BDFC .text dCam_getCamera__Fv */ -void dCam_getCamera() { +camera_class* dCam_getCamera() { /* Nonmatching */ } /* 8017BDFC-8017BE20 .text dCam_getBody__Fv */ -void dCam_getBody() { +dCamera_c* dCam_getBody() { /* Nonmatching */ } @@ -712,23 +692,13 @@ dBgS_CamGndChk::~dBgS_CamGndChk() { /* Nonmatching */ } -/* 8017D0CC-8017D0D0 .text __ct__Q29dCamera_c23@class$4017d_camera_cppFv */ -dCamera_c::@class$4017d_camera_cpp::@class$4017d_camera_cpp() { - /* Nonmatching */ -} - -/* 8017D0D0-8017D10C .text __dt__Q29dCamera_c23@class$4017d_camera_cppFv */ -dCamera_c::@class$4017d_camera_cpp::~@class$4017d_camera_cpp() { - /* Nonmatching */ -} - /* 8017D128-8017D13C .text setFlag__9dCamera_cFUl */ -void dCamera_c::setFlag(unsigned long) { +void dCamera_c::setFlag(u32) { /* Nonmatching */ } /* 8017D13C-8017D150 .text chkFlag__9dCamera_cFUl */ -void dCamera_c::chkFlag(unsigned long) { +void dCamera_c::chkFlag(u32) { /* Nonmatching */ } @@ -748,32 +718,11 @@ void dCamera_c::Center() { } /* 8017D1D4-8017D1F4 .text Flag__11dCamParam_cFlUs */ -void dCamParam_c::Flag(long, unsigned short) { +void dCamParam_c::Flag(s32, u16) { /* Nonmatching */ } /* 8017D200-8017D220 .text Val__11dCamParam_cFli */ -void dCamParam_c::Val(long, int) { +void dCamParam_c::Val(s32, int) { /* Nonmatching */ } - - - - - - - - - - - - - - - - - - - - - diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 1f40606d4..f9e692173 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -1240,8 +1240,6 @@ void dDlst_list_c::calcWipe() { } } -camera_class * dCam_getCamera(); - /* 80086790-8008696C .text dDlst_texSpecmapST__FPC4cXyzPC12dKy_tevstr_cP12J3DModelDataf */ void dDlst_texSpecmapST(const cXyz* pos, const dKy_tevstr_c* tevStr, J3DModelData* modelData, f32 scale) { static Mtx mtx_adj = { diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index dd6bb10eb..483999e1c 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_ev_camera.cpp // -#include "d_ev_camera.h" +#include "d/d_camera.h" #include "dolphin/types.h" /* 800B004C-800B0174 .text StartEventCamera__9dCamera_cFiie */ @@ -37,7 +37,7 @@ void dCamera_c::getEvIntData(int*, char*, int) { } /* 800B0484-800B055C .text getEvFloatData__9dCamera_cFPfPcf */ -void dCamera_c::getEvFloatData(float*, char*, float) { +void dCamera_c::getEvFloatData(f32*, char*, f32) { /* Nonmatching */ } @@ -96,31 +96,16 @@ void dCamera_c::uniformTransEvCamera() { /* Nonmatching */ } -/* 800B3DDC-800B3E18 .text __dt__Q29dCamera_c26@class$5621d_ev_camera_cppFv */ -dCamera_c::@class$5621d_ev_camera_cpp::~@class$5621d_ev_camera_cpp() { - /* Nonmatching */ -} - /* 800B3E18-800B5110 .text uniformBrakeEvCamera__9dCamera_cFv */ void dCamera_c::uniformBrakeEvCamera() { /* Nonmatching */ } -/* 800B5110-800B514C .text __dt__Q29dCamera_c26@class$6314d_ev_camera_cppFv */ -dCamera_c::@class$6314d_ev_camera_cpp::~@class$6314d_ev_camera_cpp() { - /* Nonmatching */ -} - /* 800B514C-800B6434 .text uniformAcceleEvCamera__9dCamera_cFv */ void dCamera_c::uniformAcceleEvCamera() { /* Nonmatching */ } -/* 800B6434-800B6470 .text __dt__Q29dCamera_c26@class$6993d_ev_camera_cppFv */ -dCamera_c::@class$6993d_ev_camera_cpp::~@class$6993d_ev_camera_cpp() { - /* Nonmatching */ -} - /* 800B6470-800B7640 .text watchActorEvCamera__9dCamera_cFv */ void dCamera_c::watchActorEvCamera() { /* Nonmatching */ @@ -216,4 +201,3 @@ void dCamera_c::bSplineEvCamera() { void dCamera_c::twoActor0EvCamera() { /* Nonmatching */ } -