mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

Document Camera Settings (#994)

Browse source 
* Document Settings

* Clean Up z64Camera.h

* Add comment
This commit is contained in:
engineer124 2021-11-02 02:10:03 +11:00 • committed by GitHub
parent dcb8357f72
commit 7e09accf0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 795 additions and 793 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/code/z_camera.c
View file

@ -4704,7 +4704,7 @@ s32 Camera_Unique3(Camera* camera) {
if (params->interfaceFlags & 2) {
camera->unk_14C |= 4;
camera->unk_14C &= ~8;
Camera_ChangeSettingFlags(camera, CAM_SET_CIRCLE3, 2);
Camera_ChangeSettingFlags(camera, CAM_SET_PIVOT_IN_FRONT, 2);
break;
}
uniq3->doorParams.timer3 = 5;
@ -4867,6 +4867,9 @@ s32 Camera_Unique4(Camera* camera) {
return Camera_Noop(camera);
}
/**
* Was setup to be used by the camera setting "FOREST_UNUSED"
*/
s32 Camera_Unique5(Camera* camera) {
return Camera_Noop(camera);
}
@ -6016,7 +6019,7 @@ s32 Camera_Demo5(Camera* camera) {
}
sDemo5PrevAction12Frame = camera->globalCtx->state.frames;
Camera_ChangeSettingFlags(camera, CAM_SET_DEMOC, (4 | 1));
Camera_ChangeSettingFlags(camera, CAM_SET_CS_C, (4 | 1));
Camera_Unique9(camera);
return true;
}
@ -7062,7 +7065,7 @@ s32 Camera_CheckWater(Camera* camera) {
if (camera->unk_14C & 0x200) {
if (player->stateFlags2 & 0x800) {
Camera_ChangeSettingFlags(camera, CAM_SET_CIRCLE5, 6);
Camera_ChangeSettingFlags(camera, CAM_SET_PIVOT_WATER_SURFACE, 6);
camera->unk_14C |= (s16)0x8000;
} else if (camera->unk_14C & (s16)0x8000) {
Camera_ChangeSettingFlags(camera, *waterPrevCamSetting, 6);
@ -7462,7 +7465,7 @@ Vec3s Camera_Update(Camera* camera) {
// setting bgCheckId to the ret of Quake_Calc, and checking that
// is required, it doesn't make too much sense though.
if ((bgId = Quake_Calc(camera, &quake), bgId != 0) && (camera->setting != CAM_SET_ITEM2)) {
if ((bgId = Quake_Calc(camera, &quake), bgId != 0) && (camera->setting != CAM_SET_TURN_AROUND)) {
viewAt.x = camera->at.x + quake.atOffset.x;
viewAt.y = camera->at.y + quake.atOffset.y;
viewAt.z = camera->at.z + quake.atOffset.z;
@ -7733,7 +7736,7 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) {
return -2;
}
}
if (((setting == CAM_SET_SPOT05A) || (setting == CAM_SET_SPOT05B)) && LINK_IS_ADULT &&
if (((setting == CAM_SET_MEADOW_BIRDS_EYE) || (setting == CAM_SET_MEADOW_UNUSED)) && LINK_IS_ADULT &&
(camera->globalCtx->sceneNum == SCENE_SPOT05)) {
camera->unk_14A |= 0x10;
return -5;
@ -7893,7 +7896,7 @@ s32 Camera_SetParam(Camera* camera, s32 param, void* value) {
camera->targetPosRot.pos = *(Vec3f*)value;
break;
case 8:
if (camera->setting == CAM_SET_DEMOC || camera->setting == CAM_SET_DEMO4) {
if (camera->setting == CAM_SET_CS_C || camera->setting == CAM_SET_CS_ATTENTION) {
break;
}
camera->target = (Actor*)value;
@ -7971,7 +7974,7 @@ s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 camDataIdx, f32 a
s16 timer3) {
DoorParams* doorParams = (DoorParams*)camera->paramData;
if ((camera->setting == CAM_SET_DEMO4) || (camera->setting == CAM_SET_DOORC)) {
if ((camera->setting == CAM_SET_CS_ATTENTION) || (camera->setting == CAM_SET_DOORC)) {
return 0;
}