github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed fov when moving the camera while in z-target

Browse source
This commit is contained in:
MelonSpeedruns 2022-05-15 17:43:45 -04:00
commit ac5d82ee68
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/src/code/z_camera.c
View file

@ -2095,16 +2095,6 @@ s32 Camera_Normal0(Camera* camera) {
} }
s32 Camera_Parallel1(Camera* camera) { s32 Camera_Parallel1(Camera* camera) {
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y;
manualCamera = false;
if (CVar_GetS32("gFreeCamera", 0) && SetCameraManual(camera) == 1) {
Camera_Free(camera);
return 1;
}
Vec3f* eye = &camera->eye; Vec3f* eye = &camera->eye;
Vec3f* at = &camera->at; Vec3f* at = &camera->at;
Vec3f* eyeNext = &camera->eyeNext; Vec3f* eyeNext = &camera->eyeNext;
@ -2149,6 +2139,8 @@ s32 Camera_Parallel1(Camera* camera) {
OLib_Vec3fDiffToVecSphGeo(&atToEyeDir, at, eye); OLib_Vec3fDiffToVecSphGeo(&atToEyeDir, at, eye);
OLib_Vec3fDiffToVecSphGeo(&atToEyeNextDir, at, eyeNext); OLib_Vec3fDiffToVecSphGeo(&atToEyeNextDir, at, eyeNext);
manualCamera = false;
switch (camera->animState) { switch (camera->animState) {
case 0: case 0:
case 0xA: case 0xA: