diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-02-21 10:35:53 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 18:35:53 -0500 |
| commit | 85ce3d3ca4dfd8df696b5b67476f6c59481e35fd (patch) | |
| tree | 64aa2f89e010bbaccd12e1433556a3c2d4a0859b /include | |
| parent | 267e20dd4c89cb9a813424990d54e1602dff5872 (diff) | |
Document Distortions from z_camera and z_view (#1102)
* Document Distortions
* cleanup
* cleanup hot-room comment
* small swap
* PR Review 1
* Missed a small thing
* Add fishing case
* PR Feedback
* dirRot -> orientation
* `UpdateWater` and `UpdateHotRoom`
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 14 | ||||
| -rw-r--r-- | include/z64.h | 10 | ||||
| -rw-r--r-- | include/z64camera.h | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/functions.h b/include/functions.h index f260cc29c..8a3e3f526 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1352,13 +1352,13 @@ void func_800AA4A8(View* view, f32 fovy, f32 near, f32 far); void func_800AA4E0(View* view, f32* fovy, f32* near, f32* far); void View_SetViewport(View* view, Viewport* viewport); void View_GetViewport(View* view, Viewport* viewport); -void func_800AA76C(View* view, f32 arg1, f32 arg2, f32 arg3); -void func_800AA78C(View* view, f32 arg1, f32 arg2, f32 arg3); -s32 func_800AA7AC(View* view, f32 arg1); -void func_800AA7B8(View* view); -void func_800AA814(View* view); -void func_800AA840(View* view, Vec3f vec1, Vec3f vec2, f32 arg3); -s32 func_800AA890(View* view, Mtx* mtx); +void View_SetDistortionOrientation(View* view, f32 rotX, f32 rotY, f32 rotZ); +void View_SetDistortionScale(View* view, f32 scaleX, f32 scaleY, f32 scaleZ); +s32 View_SetDistortionSpeed(View* view, f32 speed); +void View_InitDistortion(View* view); +void View_ClearDistortion(View* view); +void View_SetDistortion(View* view, Vec3f orientation, Vec3f scale, f32 speed); +s32 View_StepDistortion(View* view, Mtx* projectionMtx); void func_800AAA50(View* view, s32 arg1); s32 func_800AAA9C(View* view); s32 func_800AB0A8(View* view); diff --git a/include/z64.h b/include/z64.h index 0c07a192b..c97508796 100644 --- a/include/z64.h +++ b/include/z64.h @@ -178,11 +178,11 @@ typedef struct { /* 0x00A0 */ Mtx viewing; /* 0x00E0 */ Mtx* projectionPtr; /* 0x00E4 */ Mtx* viewingPtr; - /* 0x00E8 */ Vec3f unk_E8; - /* 0x00F4 */ Vec3f unk_F4; - /* 0x0100 */ f32 unk_100; - /* 0x0104 */ Vec3f unk_104; - /* 0x0110 */ Vec3f unk_110; + /* 0x00E8 */ Vec3f distortionOrientation; + /* 0x00F4 */ Vec3f distortionScale; + /* 0x0100 */ f32 distortionSpeed; + /* 0x0104 */ Vec3f curDistortionOrientation; + /* 0x0110 */ Vec3f curDistortionScale; /* 0x011C */ u16 normal; // used to normalize the projection matrix /* 0x0120 */ s32 flags; /* 0x0124 */ s32 unk_124; diff --git a/include/z64camera.h b/include/z64camera.h index 86f96579a..9d737455c 100644 --- a/include/z64camera.h +++ b/include/z64camera.h @@ -1202,8 +1202,8 @@ typedef struct { /* 0x14A */ s16 unk_14A; /* 0x14C */ s16 unk_14C; /* 0x14E */ s16 childCamIdx; - /* 0x150 */ s16 unk_150; - /* 0x152 */ s16 unk_152; + /* 0x150 */ s16 waterDistortionTimer; + /* 0x152 */ s16 distortionFlags; /* 0x154 */ s16 prevSetting; /* 0x156 */ s16 nextCamDataIdx; /* 0x158 */ s16 nextBGCheckId; |