mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-03 06:24:30 +00:00
decompile z_camera (#398)
* cleanup * name camera action functions * decompile a few small functions, name a few Camera struct members * decompile camera data, decompile a few camera functions * Split ASM for code_800BB0A0 * removing code_800BB0A0.s * PR Requests, Camera WIP * remove #define NON_MATCHING from db_camera * rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c * camera wip * rename some struct memebers, some decomp wip * pr updates * camera wip * name some fields in Camera Struct, being making sense of Camera_Update * Camera WIP * wip * wip * add z64camera.h header, begin creating CameraSetting macros * wip * wip * wip * wip * migrate camera bss to c * match a couple functions in db_camera * match some small db_camera functions * wip * migrate db_camera rodata, match a few functions * remote db_camera.rodata.s * match some of db_camera * identify types of some unknown data pieces * some small wip * Match Camera_Init, some function changes, some struct name changes. Change unk_C0 and unk_CC to floats from Vec3fs * add naming for a few more Camera struct members * wip * match func_80043F94 * Match Camera_Jump1 * document some of Camera_Jump1 * wip * match Camera_Jump3 * Match Camera_Update, FeelsAmazing * wip * wip * match Camera_SetParam * minor cleanup * wip * wip * match Camera_KeepOn0 * some documentation, modify some matching functions to match style of others. * match Camera_Demo1 * match camera_demo9 * document Camera_Demo1 and Camera_Demo9 * wip * Match camera_battle4 * match camera_unique2 * Match Camera_Unique3 * match camera_special6 * match Camera_Special5 * wip * document camera_special6 * naming updates * match camera_Unique1 * match Camera_Unique0 * wip * Match Camera_CalcUpFromPitchYawRoll * match func_80045508 * document Camera_Battle4 * document several camera functions, move camera data to separate file * rename phi/theta to pitch/yaw * wip * uniq9 wip * Camera_Unqiue9 OK * document Camera_Unique9 * name unk_160 in camera struct * wip * wip * minor updates * fix conflicts * wip * wip * Olib updates * wip * wip * rename most Math3D functions, few matches, documentation * wip * document most of math3d * wip * wip * wip * pr updates * Match Camera_Fixed4 * match func_80058E8C * pr updates * add missing comment block finalizer * Merge math3dupdates * match Camera_ChangeSetting * Match Camera_ChangeMode * match func_80058148 * Match Camera_Special9 * decompile the rest of camera data * match Camera_Demo5 * name a few camera functions in z_play * match func_80046CB4, some work on other fucntions * wip * impove some non matchings * fix function rename * match func_800588B4 * match Camera_Subj4 * wip * Camera_Demo3 matching, Camera_Battle1 big progress * Camera_Normal2 OK * wip * match Camera_Parallel1 * normalize some things across functions * match Camera_Normal1 * Match Camera_Normal3 * some cleanup * more cleanup * more cleanup , match Camera_CalcDefaultPitch * data formatting * Match Camera_Jump2 * document Camera_Jump2 * Match Camera_KeepOn3 * document some of Camera_KeepOn3 * improve some non_matchings * match func_80045C74 and func_800460A8 * code cleanup, documentation * match Camera_KeepOn1 * Match Camera_Subj3 * Match Camera_Battle1 * remove non_matching from func_80044adc and func_80046e20 * name several members of Battle1 * more documentation on Battle1 * cleanup * renaming Camera_Vec3fScaleXYZFactor to Camera_Vec3fTranslateByUnitVector * reorganize update structs, remove final references to params, remove CameraParams union * implement camera enums into player * Renaming Camera_GetDir to Camera_GetInputDir, Camera_GetRealDir to Camera_GetCamDir, etc, implement camera enum's into player * remove non-global camera variables from variables.h * clean up some variable declarations * finish pr comment updates * fix some warnings * data formatting * finish commenting on data * delete unused asm * remove asm Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
krimtonz
GitHub
parent
dadee87f94
commit
321388673b
243 changed files with 13819 additions and 28653 deletions
180
include/z64.h
180
include/z64.h
|
|
@ -9,6 +9,7 @@
|
|||
#include "z64player.h"
|
||||
#include "z64audio.h"
|
||||
#include "z64object.h"
|
||||
#include "z64camera.h"
|
||||
#include "z64cutscene.h"
|
||||
#include "z64collision_check.h"
|
||||
#include "z64scene.h"
|
||||
|
|
@ -176,176 +177,6 @@ typedef struct {
|
|||
/* 0x0124 */ s32 unk_124;
|
||||
} View; // size = 0x128
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ f32 unk_00;
|
||||
/* 0x0004 */ f32 unk_04;
|
||||
/* 0x0008 */ s16 unk_08;
|
||||
} Special9; // size = 0xC
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ Actor* door;
|
||||
/* 0x0004 */ s16 unk_04;
|
||||
/* 0x0006 */ s16 unk_06;
|
||||
/* 0x0008 */ s16 unk_08;
|
||||
/* 0x000A */ s16 unk_0A;
|
||||
/* 0x000C */ Special9 spec9;
|
||||
/* 0x0018 */ s16 unk_18;
|
||||
} DoorCamera; // size = 0x1C
|
||||
|
||||
typedef struct {
|
||||
f32 unk_00;
|
||||
s16 unk_04;
|
||||
} Special0;
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ f32 unk_00;
|
||||
/* 0x0004 */ s16 unk_04;
|
||||
} Demo1_unk_04; // size = 0x14
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ s16 unk_00;
|
||||
/* 0x0002 */ s16 unk_02;
|
||||
/* 0x0004 */ Demo1_unk_04 unk_04;
|
||||
} Demo1; // size = 0x18
|
||||
|
||||
typedef struct {
|
||||
char unk_00[0xC];
|
||||
s32 unk_0C;
|
||||
f32 unk_10;
|
||||
s16 unk_14;
|
||||
s16 unk_16;
|
||||
s16 unk_18;
|
||||
s16 unk_1A;
|
||||
f32 unk_1C;
|
||||
f32 unk_20;
|
||||
s16 unk_24;
|
||||
s16 unk_26;
|
||||
s16 unk_28;
|
||||
s16 unk_2A;
|
||||
} Normal3_Unk20;
|
||||
|
||||
typedef struct {
|
||||
f32 unk_00;
|
||||
f32 unk_04; // distance
|
||||
f32 unk_08;
|
||||
f32 unk_0C;
|
||||
f32 unk_10;
|
||||
f32 unk_14; // fov
|
||||
f32 unk_18;
|
||||
s16 unk_1C; // theta
|
||||
s16 unk_1E;
|
||||
Normal3_Unk20 unk_20;
|
||||
} Normal3;
|
||||
|
||||
typedef union {
|
||||
char data[0x50];
|
||||
s16 sh[2];
|
||||
s32 w;
|
||||
f32 f;
|
||||
DoorCamera doorCam;
|
||||
Special0 spec0;
|
||||
Demo1 demo1;
|
||||
Normal3 normal3;
|
||||
} camera_unk_00;
|
||||
|
||||
typedef struct {
|
||||
Vec3s unk_00;
|
||||
Vec3s unk_06;
|
||||
s16 unk_0C;
|
||||
s16 unk_0E;
|
||||
} struct_80041C10_ret;
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ camera_unk_00 unk_00;
|
||||
/* 0x0050 */ Vec3f at;
|
||||
/* 0x005C */ Vec3f eye;
|
||||
/* 0x0068 */ Vec3f unk_68;
|
||||
/* 0x0074 */ Vec3f eyeNext;
|
||||
/* 0x0080 */ Vec3f unk_80;
|
||||
/* 0x008C */ struct GlobalContext* globalCtx;
|
||||
/* 0x0090 */ Player* player;
|
||||
/* 0x0094 */ PosRot playerPosRot;
|
||||
/* 0x00A8 */ Actor* target;
|
||||
/* 0x00AC */ PosRot targetPosRot;
|
||||
/* 0x00C0 */ Vec3f unk_C0; // has to do with how quickly the camera rotates link.
|
||||
/* 0x00CC */ Vec3f unk_CC; // has to do with how quickly the camera zooms
|
||||
/* 0x00D8 */ f32 unk_D8;
|
||||
/* 0x00DC */ f32 dist; // possibly a Vec3f
|
||||
/* 0x00E0 */ f32 unk_E0;
|
||||
/* 0x00E4 */ Vec3f unk_E4;
|
||||
/* 0x00F0 */ Vec3f unk_F0;
|
||||
/* 0x00FC */ f32 fov;
|
||||
/* 0x0100 */ f32 unk_100; // update rate of distance from link?
|
||||
/* 0x0104 */ f32 unk_104;
|
||||
/* 0x0108 */ Vec3f unk_108;
|
||||
/* 0x0114 */ char unk_114[0x4];
|
||||
/* 0x0118 */ s32 unk_118;
|
||||
/* 0x011C */ s32 unk_11C;
|
||||
/* 0x0120 */ char unk_120[0x4];
|
||||
/* 0x0124 */ CutsceneCameraPoint* atPoints;
|
||||
/* 0x0128 */ CutsceneCameraPoint* eyePoints;
|
||||
/* 0x012C */ s16 relativeToPlayer; // camera Cutscene points are relative to player's position
|
||||
/* 0x012E */ s16 unk_12E;
|
||||
/* 0x0130 */ s16 uid; // Unique identifier of the camera.
|
||||
/* 0x0132 */ char unk_132[0x02];
|
||||
/* 0x0134 */ Vec3s unk_134;
|
||||
/* 0x013A */ Vec3s unk_13A; // seems to be a copy of unk_134, but unused for anything different?
|
||||
/* 0x0140 */ s16 status;
|
||||
/* 0x0142 */ s16 setting; // referred to as set
|
||||
/* 0x0144 */ s16 mode;
|
||||
/* 0x0146 */ s16 unk_146; // unknown if used
|
||||
/* 0x0148 */ s16 unk_148; // ID for door camera? (see func_8005AD40)
|
||||
/* 0x014A */ s16 unk_14A; // unknown if used
|
||||
/* 0x014C */ s16 unk_14C;
|
||||
/* 0x014E */ s16 unk_14E;
|
||||
/* 0x0150 */ s16 unk_150; // unknown if used
|
||||
/* 0x0152 */ s16 unk_152;
|
||||
/* 0x0154 */ u16 unk_154; // appears to be some clone of setting?
|
||||
/* 0x0156 */ s16 unk_156;
|
||||
/* 0x0158 */ s16 unk_158; // unknown if used
|
||||
/* 0x015A */ s16 roll;
|
||||
/* 0x015C */ s16 unk_15C; // unknown if used
|
||||
/* 0x015E */ s16 unk_15E;
|
||||
/* 0x0160 */ s16 unk_160;
|
||||
/* 0x0162 */ s16 unk_162;
|
||||
/* 0x0164 */ s16 unk_164;
|
||||
/* 0x0166 */ s16 unk_166; // unknown if used
|
||||
/* 0x0168 */ s16 unk_168;
|
||||
/* 0x016A */ s16 unk_16A; // unknown if used
|
||||
} Camera; // size = 0x16C
|
||||
|
||||
typedef struct {
|
||||
s32 unk_00;
|
||||
char unk_04[0x30];
|
||||
s32 unk_34;
|
||||
s32 unk_38;
|
||||
s32 unk_3C;
|
||||
s32 unk_40;
|
||||
s32 unk_44;
|
||||
f32 unk_48;
|
||||
s16 unk_4C;
|
||||
f32 unk_50;
|
||||
char unk_54[0x18];
|
||||
f32 unk_6C;
|
||||
f32 unk_70;
|
||||
f32 unk_74;
|
||||
s16 unk_78;
|
||||
s16 unk_7A;
|
||||
s16 unk_7C;
|
||||
s16 unk_7E;
|
||||
s16 unk_80;
|
||||
s16 unk_82;
|
||||
s16 unk_84;
|
||||
s16 unk_86;
|
||||
char unk_88[0x1038];
|
||||
s16 unk_10C0;
|
||||
s16 unk_10C2;
|
||||
s16 unk_10C4;
|
||||
s16 unk_10C6;
|
||||
s16 unk_10C8;
|
||||
s16 unk_10CA;
|
||||
} DbgCamera; // size = 0x10CC;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 seqIndex;
|
||||
/* 0x01 */ u8 nightSeqIndex;
|
||||
|
|
@ -360,7 +191,8 @@ typedef struct {
|
|||
typedef struct {
|
||||
/* 0x00 */ char unk_00[0x2];
|
||||
/* 0x02 */ s16 unk_02;
|
||||
/* 0x04 */ char unk_04[0xC];
|
||||
/* 0x04 */ char unk_04[0x8];
|
||||
/* 0x0C */ u32 unk_0C;
|
||||
} WaterBox; // size = 0x10
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -1723,13 +1555,13 @@ typedef struct {
|
|||
} ShakeInfo; // size = 0x1E
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Vec3f vec1;
|
||||
/* 0x0C */ Vec3f vec2;
|
||||
/* 0x00 */ Vec3f atOffset;
|
||||
/* 0x0C */ Vec3f eyeOffset;
|
||||
/* 0x18 */ s16 rotZ;
|
||||
/* 0x1A */ s16 unk_1A;
|
||||
/* 0x1C */ s16 zoom;
|
||||
/* 0x20 */ f32 unk_20;
|
||||
} UnkQuakeCalcStruct; // size = 0x24
|
||||
} QuakeCamCalc; // size = 0x24
|
||||
|
||||
|
||||
#define UCODE_NULL 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue