mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-08 13:46:21 -04:00
d_camera 45% (#747)
* initial progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * fix outdated member names * more progress * more progress * more progress * more progress * more progress * more progress * fixed deprecated member references * more progress * more progress * more progress * fix deprecated member references * more progress * more progress * more progress * more progress * more progress * check in for review * remove comment * initial PR changes * more PR changes * more PR changes * added anonymous struct as class member * reverted changes to `stage_camera2_data_class` * added `dCamera_event_data`, `dCamera_monitoring_things` and `dCamera_DMC_system` from debug maps * more progress * more progress * realmatch for `camera_draw` * PR changes * fix broken merge * formatting * Reverted change to `camSphChkdata` that caused `sph_chk_callback` match to regress * Reverted change to `BG` struct that caused ctor and dtor match to regress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * more progress * PR changes * corrected size comment * fixed broken member references
This commit is contained in:
Mattias Blum
+39
-34
@@ -4,39 +4,44 @@
|
||||
#include "dolphin/types.h"
|
||||
#include "SSystem/SComponent/c_angle.h"
|
||||
|
||||
// Array indexes, do not change values
|
||||
enum dCamStyleParam_e {
|
||||
dCamStyleParam_UNK0 = 0,
|
||||
dCamStyleParam_UNK1 = 1,
|
||||
dCamStyleParam_UNK2 = 2,
|
||||
dCamStyleParam_UNK3 = 3,
|
||||
dCamStyleParam_UNK4 = 4,
|
||||
dCamStyleParam_CENTER_HEIGHT_BASE = 5,
|
||||
dCamStyleParam_CENTER_HEIGHT_UPPER = 6,
|
||||
dCamStyleParam_CENTER_HEIGHT_LOWER = 7,
|
||||
dCamStyleParam_LOCKON_CENTER_HEIGHT_MIN = 8,
|
||||
dCamStyleParam_LOCKON_CENTER_HEIGHT_MAX = 9,
|
||||
dCamStyleParam_UNK10 = 10,
|
||||
dCamStyleParam_UNK11 = 11,
|
||||
dCamStyleParam_UNK12 = 12,
|
||||
dCamStyleParam_UNK13 = 13,
|
||||
dCamStyleParam_UNK14 = 14,
|
||||
dCamStyleParam_UNK15 = 15,
|
||||
dCamStyleParam_UNK16 = 16,
|
||||
dCamStyleParam_UNK17 = 17,
|
||||
dCamStyleParam_LOCKON_LATITUDE_MIN = 18,
|
||||
dCamStyleParam_LOCKON_LATITUDE_MAX = 19,
|
||||
dCamStyleParam_UNK20 = 20,
|
||||
dCamStyleParam_UNK21 = 21,
|
||||
dCamStyleParam_UNK22 = 22,
|
||||
dCamStyleParam_LOCKON_LONGITUDE_MIN = 23,
|
||||
dCamStyleParam_LOCKON_LONGITUDE_MAX = 24,
|
||||
dCamStyleParam_FOVY_BASE = 25,
|
||||
dCamStyleParam_FOVY_UPPER = 26,
|
||||
dCamStyleParam_FOVY_LOWER = 27,
|
||||
dCamStyleParam_LOCKON_FOVY_MIN = 28,
|
||||
dCamStyleParam_LOCKON_FOVY_MAX = 29,
|
||||
};
|
||||
|
||||
struct dCamera__Style {
|
||||
/* 0x00 */ u32 m00;
|
||||
/* 0x04 */ int engineIdx;
|
||||
/* 0x08 */ u32 m08;
|
||||
/* 0x0C */ u32 m0C;
|
||||
/* 0x10 */ u32 m10;
|
||||
/* 0x14 */ u32 m14;
|
||||
/* 0x18 */ u32 m18;
|
||||
/* 0x1C */ f32 centerHeightBase;
|
||||
/* 0x20 */ f32 centerHeightUpper;
|
||||
/* 0x24 */ f32 centerHeightLower;
|
||||
/* 0x28 */ f32 lockonCenterHeightMin;
|
||||
/* 0x2C */ f32 lockonCenterHeightMax;
|
||||
/* 0x30 */ u32 m30;
|
||||
/* 0x34 */ u32 m34;
|
||||
/* 0x38 */ u32 m38;
|
||||
/* 0x3C */ f32 m3C;
|
||||
/* 0x40 */ f32 m40;
|
||||
/* 0x44 */ u32 m44;
|
||||
/* 0x48 */ u32 m48;
|
||||
/* 0x4C */ u32 m4C;
|
||||
/* 0x50 */ f32 lockonLatitudeMin;
|
||||
/* 0x54 */ f32 lockonLatitudeMax;
|
||||
/* 0x58 */ u32 m58;
|
||||
/* 0x5C */ u32 m5C;
|
||||
/* 0x60 */ u32 m60;
|
||||
/* 0x64 */ f32 lockonLongitudeMin;
|
||||
/* 0x68 */ f32 lockonLongitudeMax;
|
||||
/* 0x6C */ f32 fovyBase;
|
||||
/* 0x70 */ f32 fovyUpper;
|
||||
/* 0x74 */ f32 fovyLower;
|
||||
/* 0x78 */ f32 lockonFovyMin;
|
||||
/* 0x7C */ f32 lockonFovyMax;
|
||||
/* 0x08 */ f32 styleParam[30];
|
||||
/* 0x80 */ u16 flag;
|
||||
}; // Size: 0x84
|
||||
|
||||
@@ -200,20 +205,20 @@ public:
|
||||
dCamParam_c(s32);
|
||||
virtual ~dCamParam_c();
|
||||
|
||||
void Flag(s32, u16) {}
|
||||
void Val(s32, int) {}
|
||||
u16 Flag(s32 styleIdx, u16 mask) { return mask & styles[styleIdx].flag; }
|
||||
f32 Val(s32 styleIdx, int paramIdx) { return styles[styleIdx].styleParam[paramIdx]; }
|
||||
BOOL Change(s32);
|
||||
s32 SearchStyle(u32);
|
||||
f32 ratiof(f32, f32, f32, f32);
|
||||
BOOL DefaultRadius(f32*);
|
||||
void RadiusRatio(f32);
|
||||
f32 RadiusRatio(f32);
|
||||
f32 CenterHeight(f32);
|
||||
f32 Fovy(f32);
|
||||
s16 LockonLongitude(f32);
|
||||
s16 LockonLatitude(f32);
|
||||
f32 LockonFovy(f32);
|
||||
f32 LockonCenterHeight(f32);
|
||||
int Algorythmn(s32 i_style) { return mpStyle[i_style].engineIdx; }
|
||||
int Algorythmn(s32 i_style) { return styles[i_style].engineIdx; }
|
||||
int Algorythmn() { return mpStyle->engineIdx; }
|
||||
bool CheckFlag(u16 flag) { return mpStyle->flag & flag; }
|
||||
};
|
||||
|
||||
+93
-64
@@ -33,7 +33,7 @@ struct dCamera__Type {
|
||||
struct dCamera_event_data {
|
||||
/* 0x000 */ u8 field_0x00;
|
||||
/* 0x001 */ u8 field_0x01[0x04 - 0x01];
|
||||
/* 0x004 */ int field_0x04;
|
||||
/* 0x004 */ int mStaffIdx;
|
||||
/* 0x008 */ int field_0x08;
|
||||
/* 0x00C */ int field_0x0c;
|
||||
/* 0x010 */ u8 field_0x10;
|
||||
@@ -43,7 +43,7 @@ struct dCamera_event_data {
|
||||
/* 0x01C */ int field_0x1c;
|
||||
/* 0x020 */ int field_0x20;
|
||||
/* 0x024 */ int field_0x24;
|
||||
/* 0x028 */ u8 field_0x28[0x2C - 0x28];
|
||||
/* 0x028 */ int field_0x28;
|
||||
/* 0x02C */ dCamera__EventParam mEventParams[8];
|
||||
/* 0x0EC */ dStage_Event_dt_c* field_0xec;
|
||||
/* 0x0F0 */ d2DBSplinePath mSpline2DPath;
|
||||
@@ -159,13 +159,12 @@ public:
|
||||
/* 0x0A2 */ u8 m0A2[0x0A4 - 0x0A2];
|
||||
struct {
|
||||
struct {
|
||||
/* 0x00 */ cXyz m00;
|
||||
/* 0x0C */ int m0C;
|
||||
/* 0x10 */ int m10;
|
||||
/* 0x14 */ int m14;
|
||||
/* 0x18 */ int m18;
|
||||
/* 0x1C */ int m1C;
|
||||
} field_0x00;
|
||||
/* 0x00 */ cXyz mCenter;
|
||||
/* 0x0C */ cXyz mEye;
|
||||
/* 0x18 */ f32 mFovY;
|
||||
/* 0x1C */ cSAngle mBank;
|
||||
/* 0x1E */ s16 m1E;
|
||||
} m00;
|
||||
}
|
||||
/* 0x0A4 */ m0A4[2];
|
||||
/* 0x0E4 */ int mStageMapToolCameraIdx;
|
||||
@@ -176,13 +175,13 @@ public:
|
||||
/* 0x101 */ u8 m101;
|
||||
/* 0x102 */ u8 m102;
|
||||
/* 0x103 */ u8 m103[0x108 - 0x103];
|
||||
/* 0x108 */ int m108;
|
||||
/* 0x108 */ u32 m108;
|
||||
/* 0x10C */ int m10C;
|
||||
/* 0x110 */ u8 m110;
|
||||
/* 0x111 */ u8 m111[0x114 - 0x111];
|
||||
/* 0x114 */ int m114;
|
||||
/* 0x118 */ int m118;
|
||||
/* 0x11C */ int m11C;
|
||||
/* 0x118 */ u32 m118;
|
||||
/* 0x11C */ u32 m11C;
|
||||
/* 0x120 */ int mCameraInfoIdx;
|
||||
/* 0x124 */ int mPadId;
|
||||
/* 0x128 */ fopAc_ac_c* mpPlayerActor;
|
||||
@@ -235,12 +234,13 @@ public:
|
||||
/* 0x1B0 */ dCamForcusLine mForcusLine;
|
||||
/* 0x220 */ dCamera_DMC_system mDMCSystem;
|
||||
/* 0x226 */ u8 m226[0x228 - 0x226];
|
||||
/* 0x228 */ dCamera_monitoring_things mMonitoringThings;
|
||||
/* 0x228 */ dCamera_monitoring_things mMonitor;
|
||||
/* 0x248 */ int m248[3];
|
||||
/* 0x254 */ int m254;
|
||||
/* 0x258 */ int m258;
|
||||
/* 0x25C */ BG mBG;
|
||||
/* 0x314 */ int m314;
|
||||
/* 0x314 */ u8 m314;
|
||||
/* 0x315 */ u8 m315[0x318 -0x315];
|
||||
/* 0x318 */ f32 m318;
|
||||
/* 0x31C */ u8 m31C;
|
||||
/* 0x31D */ u8 m31D;
|
||||
@@ -257,18 +257,44 @@ public:
|
||||
/* 0x35C */ int mRoomMapToolCameraIdx;
|
||||
/* 0x360 */ u8 m360;
|
||||
/* 0x361 */ u8 m361[0x364 - 0x361];
|
||||
/* 0x364 */ u32 m364;
|
||||
/* 0x364 */ int m364;
|
||||
/* 0x368 */ f32 m368;
|
||||
/* 0x36C */ u8 m36C[0x394 - 0x36C];
|
||||
/* 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[0x3F8 - 0x3B8];
|
||||
/* 0x36C */ cXyz m36C;
|
||||
/* 0x378 */ int m378;
|
||||
/* 0x37C */ u8 m37C; // `CalcSubjectAngle` suggests this should be u8 but `followCamera` suggests it should be int
|
||||
/* 0x37D */ u8 m37D; // The fact that this a referenced in `CalcSubjectAngle` suggests m37C can't be an int?
|
||||
/* 0x37E */ s16 m37E;
|
||||
/* 0x380 */ int m380;
|
||||
/* 0x384 */ f32 m384;
|
||||
/* 0x388 */ f32 m388; // `CalcSubjectAngle` suggests this should be a float but `followCamera` suggests it should be int
|
||||
/* 0x38C */ f32 m38C; // Similar issue for 38C
|
||||
/* 0x390 */ s16 m390;
|
||||
/* 0x392 */ s16 m392;
|
||||
/* 0x394 */ f32 m394;
|
||||
/* 0x398 */ f32 m398;
|
||||
/* 0x39C */ f32 m39C;
|
||||
/* 0x3A0 */ f32 m3A0;
|
||||
/* 0x3A4 */ f32 m3A4;
|
||||
/* 0x3A8 */ f32 m3A8;
|
||||
/* 0x3AC */ f32 m3AC;
|
||||
/* 0x3B0 */ f32 m3B0;
|
||||
/* 0x3B4 */ int m3B4;
|
||||
/* 0x3B8 */ cSAngle m3B8; // `CalcSubjectAngle` thinks this is a cSAngle but `followCamera` thinks its a float (could also be cSGlobe since m3BA is a cSAngle and m3BC is a float)
|
||||
/* 0x3BA */ cSAngle m3BA;
|
||||
/* 0x3BC */ f32 m3BC;
|
||||
/* 0x3C0 */ cXyz m3C0;
|
||||
/* 0x3CC */ cXyz m3CC;
|
||||
/* 0x3D8 */ u8 m3D8;
|
||||
/* 0x3D9 */ u8 m3D9;
|
||||
/* 0x3DA */ u8 m3DA;
|
||||
/* 0x3DB */ u8 m3DB;
|
||||
/* 0x3DC */ f32 m3DC;
|
||||
/* 0x3E0 */ f32 m3E0;
|
||||
/* 0x3E4 */ f32 m3E4;
|
||||
/* 0x3E8 */ f32 m3E8;
|
||||
/* 0x3EC */ f32 m3EC;
|
||||
/* 0x3F0 */ f32 m3F0;
|
||||
/* 0x3F4 */ u8 m3F4[0x3F8 - 0x3F4];
|
||||
/* 0x3F8 */ dCamera_event_data mEventData;
|
||||
/* 0x50C */ u32 mEventFlags;
|
||||
/* 0x510 */ int mCurStyle;
|
||||
@@ -285,19 +311,22 @@ public:
|
||||
/* 0x538 */ f32 m538;
|
||||
/* 0x53C */ f32 m53C;
|
||||
/* 0x540 */ f32 m540;
|
||||
/* 0x544 */ u8 m544[0x550 - 0x544];
|
||||
/* 0x544 */ u8 m544[4];
|
||||
/* 0x548 */ u8 m548[4];
|
||||
/* 0x54C */ u8 m54C[0x550 - 0x54C];
|
||||
/* 0x550 */ int m550;
|
||||
/* 0x554 */ int m554;
|
||||
/* 0x558 */ u8 m558[0x568 - 0x558];
|
||||
/* 0x558 */ u8 m558[0x55C - 0x558];
|
||||
/* 0x55C */ cXyz m55C;
|
||||
/* 0x568 */ cXyz mCenterShake;
|
||||
/* 0x574 */ cXyz mEyeShake;
|
||||
/* 0x580 */ f32 mFovYShake;
|
||||
/* 0x584 */ cSAngle m584;
|
||||
/* 0x584 */ cSAngle mBankShake;
|
||||
/* 0x586 */ u8 m586[0x588 - 0x586];
|
||||
/* 0x588 */ int m588;
|
||||
/* 0x58C */ int m58C;
|
||||
/* 0x590 */ int mBlureTimer;
|
||||
/* 0x594 */ csXyz m594;
|
||||
/* 0x594 */ csXyz mBlureRotation;
|
||||
/* 0x59A */ s16 m59A;
|
||||
/* 0x59C */ int mBlurePositionType;
|
||||
/* 0x5A0 */ cXyz mBlurePosition;
|
||||
@@ -338,7 +367,7 @@ public:
|
||||
/* 0x789 */ u8 m789;
|
||||
/* 0x78A */ u8 m78A;
|
||||
/* 0x78B */ u8 m78B;
|
||||
/* 0x78C */ u8 m78C[0x800 - 0x78C];;
|
||||
/* 0x78C */ u8 m78C[0x800 - 0x78C];
|
||||
|
||||
public:
|
||||
dCamera_c(camera_class*);
|
||||
@@ -398,7 +427,7 @@ public:
|
||||
int defaultTriming();
|
||||
void setView(f32, f32, f32, f32);
|
||||
cSAngle forwardCheckAngle();
|
||||
void bumpCheck(u32);
|
||||
bool bumpCheck(u32);
|
||||
f32 getWaterSurfaceHeight(cXyz*);
|
||||
void checkSpecialArea();
|
||||
void checkGroundInfo();
|
||||
@@ -410,7 +439,7 @@ public:
|
||||
fopAc_ac_c* getMsgCmdSpeaker();
|
||||
int getMsgCmdCut();
|
||||
bool talktoCamera(s32);
|
||||
void CalcSubjectAngle(s16*, s16*);
|
||||
bool CalcSubjectAngle(s16*, s16*);
|
||||
bool subjectCamera(s32);
|
||||
bool towerCamera(s32);
|
||||
bool crawlCamera(s32);
|
||||
@@ -437,8 +466,8 @@ public:
|
||||
bool Chtyp(s32);
|
||||
s16 U2();
|
||||
//void U2(s16 i_val) { mAngleY = cSAngle(i_val); }
|
||||
void shakeCamera();
|
||||
void StartShake(s32, u8*, s32, cXyz);
|
||||
f32 shakeCamera();
|
||||
int StartShake(s32, u8*, s32, cXyz);
|
||||
bool StopShake();
|
||||
void ResetBlure(int);
|
||||
void SetBlureAlpha(f32);
|
||||
@@ -456,7 +485,7 @@ public:
|
||||
bool ScopeViewMsgModeOff();
|
||||
|
||||
f32 Fovy() { return mFovY + mFovYShake; }
|
||||
cSAngle Bank() { return mBank + m584; }
|
||||
cSAngle Bank() { return mBank + mBankShake; }
|
||||
cXyz Up() { return mUp; }
|
||||
cXyz Center() { return mCenter + mCenterShake; }
|
||||
cXyz Eye() { return mEye + mEyeShake; }
|
||||
@@ -469,40 +498,40 @@ public:
|
||||
void getEvIntData(int*, char*, int);
|
||||
void getEvFloatData(f32*, char*, f32);
|
||||
void getEvXyzData(cXyz*, char*, cXyz);
|
||||
void getEvStringData(char*, char*, char*);
|
||||
bool 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();
|
||||
bool pauseEvCamera();
|
||||
bool fixedFrameEvCamera();
|
||||
bool stokerEvCamera();
|
||||
bool rollingEvCamera();
|
||||
bool fixedPositionEvCamera();
|
||||
bool uniformTransEvCamera();
|
||||
bool uniformBrakeEvCamera();
|
||||
bool uniformAcceleEvCamera();
|
||||
bool watchActorEvCamera();
|
||||
bool restorePosEvCamera();
|
||||
bool talktoEvCamera();
|
||||
bool maptoolIdEvCamera();
|
||||
bool styleEvCamera();
|
||||
bool gameOverEvCamera();
|
||||
bool tactEvCamera();
|
||||
bool windDirectionEvCamera();
|
||||
bool turnToActorEvCamera();
|
||||
bool tornadoWarpEvCamera();
|
||||
bool saveEvCamera();
|
||||
bool loadEvCamera();
|
||||
bool useItem0EvCamera();
|
||||
bool useItem1EvCamera();
|
||||
bool getItemEvCamera();
|
||||
bool possessedEvCamera();
|
||||
bool fixedFramesEvCamera();
|
||||
bool bSplineEvCamera();
|
||||
bool twoActor0EvCamera();
|
||||
|
||||
bool chkFlag(u32 flag) { return (mEventFlags & flag) ? true : false; }
|
||||
void setFlag(u32 flag) { mEventFlags |= flag; }
|
||||
BOOL setFlag(u32 flag) { return mEventFlags |= flag; }
|
||||
void clrFlag(u32 flag) { mEventFlags &= ~flag; }
|
||||
void CStickUse() { clrFlag(0x800000); }
|
||||
void CStickUseless() { setFlag(0x800000); }
|
||||
|
||||
@@ -38,6 +38,7 @@ class J2DOrthoGraph;
|
||||
enum daPy__PlayerStatus0 {
|
||||
daPyStts0_UNK1_e = 0x00000001,
|
||||
daPyStts0_UNK2_e = 0x00000002,
|
||||
daPyStts0_UNK4_e = 0x00000004,
|
||||
daPyStts0_UNK10_e = 0x00000010,
|
||||
daPyStts0_UNK20_e = 0x00000020,
|
||||
daPyStts0_UNK40_e = 0x00000040,
|
||||
@@ -97,6 +98,18 @@ enum daPy__PlayerStatus1 {
|
||||
daPyStts1_UNK20000_e = 0x00020000,
|
||||
daPyStts1_UNK40000_e = 0x00040000,
|
||||
daPyStts1_UNK80000_e = 0x00080000,
|
||||
daPyStts1_UNK100000_e = 0x00100000,
|
||||
daPyStts1_UNK200000_e = 0x00200000,
|
||||
daPyStts1_UNK400000_e = 0x00400000,
|
||||
daPyStts1_UNK800000_e = 0x00800000,
|
||||
daPyStts1_UNK1000000_e = 0x01000000,
|
||||
daPyStts1_UNK2000000_e = 0x02000000,
|
||||
daPyStts1_UNK4000000_e = 0x04000000,
|
||||
daPyStts1_UNK8000000_e = 0x08000000,
|
||||
daPyStts1_UNK10000000_e = 0x10000000,
|
||||
daPyStts1_UNK20000000_e = 0x20000000,
|
||||
daPyStts1_UNK40000000_e = 0x40000000,
|
||||
daPyStts1_UNK80000000_e = 0x80000000,
|
||||
};
|
||||
|
||||
class __d_timer_info_c {
|
||||
|
||||
@@ -68,7 +68,7 @@ public:
|
||||
static void getFrameBufferMemory() {}
|
||||
static void getFrameBufferSize() {}
|
||||
static void setBlureMtx(const Mtx) {}
|
||||
static void setBlureRate(u8) {}
|
||||
static void setBlureRate(u8 blurRate) { mBlureRate = blurRate; }
|
||||
|
||||
static GXTexObj mFrameBufferTexObj;
|
||||
static GXTexObj mZbufferTexObj;
|
||||
|
||||
+64
-17
@@ -139,12 +139,12 @@ f32 dCamParam_c::ratiof(f32 t, f32 upper, f32 lower, f32 base) {
|
||||
BOOL dCamParam_c::DefaultRadius(f32* radius) {
|
||||
/* Nonmatching */
|
||||
f32 min, max;
|
||||
if (mpStyle->m3C < mpStyle->m40) {
|
||||
min = mpStyle->m3C;
|
||||
max = mpStyle->m40;
|
||||
if (mpStyle->styleParam[dCamStyleParam_UNK13] < mpStyle->styleParam[dCamStyleParam_UNK14]) {
|
||||
min = mpStyle->styleParam[dCamStyleParam_UNK13];
|
||||
max = mpStyle->styleParam[dCamStyleParam_UNK14];
|
||||
} else {
|
||||
min = mpStyle->m40;
|
||||
max = mpStyle->m3C;
|
||||
min = mpStyle->styleParam[dCamStyleParam_UNK14];
|
||||
max = mpStyle->styleParam[dCamStyleParam_UNK13];
|
||||
}
|
||||
|
||||
if (*radius > max) {
|
||||
@@ -159,52 +159,99 @@ BOOL dCamParam_c::DefaultRadius(f32* radius) {
|
||||
}
|
||||
|
||||
/* 800AFB00-800AFB88 .text RadiusRatio__11dCamParam_cFf */
|
||||
void dCamParam_c::RadiusRatio(f32) {
|
||||
f32 dCamParam_c::RadiusRatio(f32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AFB88-800AFBB8 .text CenterHeight__11dCamParam_cFf */
|
||||
f32 dCamParam_c::CenterHeight(f32 t) {
|
||||
return ratiof(t, mpStyle->centerHeightUpper, mpStyle->centerHeightLower, mpStyle->centerHeightBase);
|
||||
return ratiof(t, mpStyle->styleParam[dCamStyleParam_CENTER_HEIGHT_UPPER], mpStyle->styleParam[dCamStyleParam_CENTER_HEIGHT_LOWER], mpStyle->styleParam[dCamStyleParam_CENTER_HEIGHT_BASE]);
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AFBB8-800AFBE8 .text Fovy__11dCamParam_cFf */
|
||||
f32 dCamParam_c::Fovy(f32 t) {
|
||||
return ratiof(t, mpStyle->fovyUpper, mpStyle->fovyLower, mpStyle->fovyBase);
|
||||
return ratiof(t, mpStyle->styleParam[dCamStyleParam_FOVY_UPPER], mpStyle->styleParam[dCamStyleParam_FOVY_LOWER], mpStyle->styleParam[dCamStyleParam_FOVY_BASE]);
|
||||
}
|
||||
|
||||
/* 800AFBE8-800AFC74 .text LockonLongitude__11dCamParam_cFf */
|
||||
s16 dCamParam_c::LockonLongitude(f32 t) {
|
||||
cSAngle ret(mpStyle->lockonLongitudeMin);
|
||||
ret += (cSAngle(mpStyle->lockonLongitudeMax) - ret) * t;
|
||||
cSAngle ret(mpStyle->styleParam[dCamStyleParam_LOCKON_LONGITUDE_MIN]);
|
||||
ret += (cSAngle(mpStyle->styleParam[dCamStyleParam_LOCKON_LONGITUDE_MAX]) - ret) * t;
|
||||
return ret.Val();
|
||||
}
|
||||
|
||||
/* 800AFC74-800AFD00 .text LockonLatitude__11dCamParam_cFf */
|
||||
s16 dCamParam_c::LockonLatitude(f32 t) {
|
||||
cSAngle ret(mpStyle->lockonLatitudeMin);
|
||||
ret += (cSAngle(mpStyle->lockonLatitudeMax) - ret) * t;
|
||||
cSAngle ret(mpStyle->styleParam[dCamStyleParam_LOCKON_LATITUDE_MIN]);
|
||||
ret += (cSAngle(mpStyle->styleParam[dCamStyleParam_LOCKON_LATITUDE_MAX]) - ret) * t;
|
||||
return ret.Val();
|
||||
}
|
||||
|
||||
/* 800AFD00-800AFD20 .text LockonFovy__11dCamParam_cFf */
|
||||
f32 dCamParam_c::LockonFovy(f32 t) {
|
||||
f32 ret = mpStyle->lockonFovyMin;
|
||||
ret += t * (mpStyle->lockonFovyMax - ret);
|
||||
f32 ret = mpStyle->styleParam[dCamStyleParam_LOCKON_FOVY_MIN];
|
||||
ret += t * (mpStyle->styleParam[dCamStyleParam_LOCKON_FOVY_MAX] - ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* 800AFD20-800AFD40 .text LockonCenterHeight__11dCamParam_cFf */
|
||||
f32 dCamParam_c::LockonCenterHeight(f32 t) {
|
||||
f32 ret = mpStyle->lockonCenterHeightMin;
|
||||
ret += t * (mpStyle->lockonCenterHeightMax - ret);
|
||||
f32 ret = mpStyle->styleParam[dCamStyleParam_LOCKON_CENTER_HEIGHT_MIN];
|
||||
ret += t * (mpStyle->styleParam[dCamStyleParam_LOCKON_CENTER_HEIGHT_MAX] - ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* 800AFD40-800AFEE0 .text __ct__11dCamSetup_cFv */
|
||||
dCamSetup_c::dCamSetup_c() {
|
||||
/* Nonmatching */
|
||||
/* Nonmatching - regalloc */
|
||||
mDrawNear = 1.0f;
|
||||
mDrawFar = 100000.0f;
|
||||
m00C = 1;
|
||||
mForceType = mModeSwitchType = -1;
|
||||
mCusCus = 0.2f;
|
||||
m024 = 0.05f;
|
||||
m060 = 80.0f;
|
||||
m05C = -60.0f;
|
||||
m028 = 0.33f;
|
||||
m02C = 0.02f;
|
||||
m050 = 100.0f;
|
||||
m030 = 0.75f;
|
||||
mBaseCushion = 0.28f;
|
||||
mJumpCushion = 1.0f;
|
||||
m058 = 0.15f;
|
||||
m044 = 0.005f;
|
||||
m054 = 0.06f;
|
||||
mCurveWeight = 1.0f;
|
||||
m034 = 25.0f;
|
||||
m048 = 70.0f;
|
||||
mParallelDist = 60.0f;
|
||||
mTrimVistaHeight = 52.0f;
|
||||
mTrimCineScopeHeight = 65.0f;
|
||||
m094 = 150;
|
||||
m098 = 60.0f;
|
||||
m09C = 0.3f;
|
||||
m0A0 = 0.2f;
|
||||
mDMCValue = 0.1f;
|
||||
mDMCAngle = 30.0f;
|
||||
mDebugFlags = 1;
|
||||
m0A4 = 27.0f;
|
||||
m0A8 = 20;
|
||||
mChargeLatitude = 2.0f;
|
||||
mChargeTimer = 60;
|
||||
mChargeBRatio = 0.15f;
|
||||
mManualStartCThreshold = 0.66f;
|
||||
mManualEndVal = 0.0f;
|
||||
m06C = 45.0f;
|
||||
mForceLockOffDist = 1800.0f;
|
||||
mForceLockOffTimer = 120;
|
||||
m078 = 0.5f;
|
||||
m07C = 0.4f;
|
||||
m080 = 10.0f;
|
||||
m084 = 4.0f;
|
||||
m0C0 = 1.0f;
|
||||
mLockonChangeCushion = 100.0f;
|
||||
mLockonChangeTimer = -1;
|
||||
}
|
||||
|
||||
/* 800AFEE0-800AFF40 .text __dt__11dCamSetup_cFv */
|
||||
|
||||
+2149
-260
File diff suppressed because it is too large
Load Diff
+28
-28
@@ -47,7 +47,7 @@ void dCamera_c::getEvXyzData(cXyz*, char*, cXyz) {
|
||||
}
|
||||
|
||||
/* 800B066C-800B074C .text getEvStringData__9dCamera_cFPcPcPc */
|
||||
void dCamera_c::getEvStringData(char*, char*, char*) {
|
||||
bool dCamera_c::getEvStringData(char*, char*, char*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -67,137 +67,137 @@ void dCamera_c::getEvActor(char*, char*) {
|
||||
}
|
||||
|
||||
/* 800B0A20-800B0AF8 .text pauseEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::pauseEvCamera() {
|
||||
bool dCamera_c::pauseEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B0AF8-800B14D4 .text fixedFrameEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::fixedFrameEvCamera() {
|
||||
bool dCamera_c::fixedFrameEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B14D4-800B18E4 .text stokerEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::stokerEvCamera() {
|
||||
bool dCamera_c::stokerEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B18E4-800B2680 .text rollingEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::rollingEvCamera() {
|
||||
bool dCamera_c::rollingEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B2680-800B2B60 .text fixedPositionEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::fixedPositionEvCamera() {
|
||||
bool dCamera_c::fixedPositionEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B2B60-800B3CC8 .text uniformTransEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::uniformTransEvCamera() {
|
||||
bool dCamera_c::uniformTransEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B3E18-800B5110 .text uniformBrakeEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::uniformBrakeEvCamera() {
|
||||
bool dCamera_c::uniformBrakeEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B514C-800B6434 .text uniformAcceleEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::uniformAcceleEvCamera() {
|
||||
bool dCamera_c::uniformAcceleEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B6470-800B7640 .text watchActorEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::watchActorEvCamera() {
|
||||
bool dCamera_c::watchActorEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
|
||||
/* 800B76C8-800B7E00 .text restorePosEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::restorePosEvCamera() {
|
||||
bool dCamera_c::restorePosEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B7E00-800B7EBC .text talktoEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::talktoEvCamera() {
|
||||
bool dCamera_c::talktoEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B7EBC-800B8108 .text maptoolIdEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::maptoolIdEvCamera() {
|
||||
bool dCamera_c::maptoolIdEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B8108-800B81D0 .text styleEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::styleEvCamera() {
|
||||
bool dCamera_c::styleEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B81D0-800B8AB8 .text gameOverEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::gameOverEvCamera() {
|
||||
bool dCamera_c::gameOverEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B8AB8-800B8C90 .text tactEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::tactEvCamera() {
|
||||
bool dCamera_c::tactEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B8C90-800B99B8 .text windDirectionEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::windDirectionEvCamera() {
|
||||
bool dCamera_c::windDirectionEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B99B8-800B9FB0 .text turnToActorEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::turnToActorEvCamera() {
|
||||
bool dCamera_c::turnToActorEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800B9FB0-800BA688 .text tornadoWarpEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::tornadoWarpEvCamera() {
|
||||
bool dCamera_c::tornadoWarpEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BA688-800BA7BC .text saveEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::saveEvCamera() {
|
||||
bool dCamera_c::saveEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BA7BC-800BA904 .text loadEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::loadEvCamera() {
|
||||
bool dCamera_c::loadEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BA904-800BB39C .text useItem0EvCamera__9dCamera_cFv */
|
||||
void dCamera_c::useItem0EvCamera() {
|
||||
bool dCamera_c::useItem0EvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BB39C-800BBD88 .text useItem1EvCamera__9dCamera_cFv */
|
||||
void dCamera_c::useItem1EvCamera() {
|
||||
bool dCamera_c::useItem1EvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BBD88-800BC364 .text getItemEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::getItemEvCamera() {
|
||||
bool dCamera_c::getItemEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BC364-800BC9D8 .text possessedEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::possessedEvCamera() {
|
||||
bool dCamera_c::possessedEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BC9D8-800BCDA0 .text fixedFramesEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::fixedFramesEvCamera() {
|
||||
bool dCamera_c::fixedFramesEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BCDA0-800BCFE8 .text bSplineEvCamera__9dCamera_cFv */
|
||||
void dCamera_c::bSplineEvCamera() {
|
||||
bool dCamera_c::bSplineEvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800BCFE8-800BD678 .text twoActor0EvCamera__9dCamera_cFv */
|
||||
void dCamera_c::twoActor0EvCamera() {
|
||||
bool dCamera_c::twoActor0EvCamera() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user