From 6278049307e51ed8a4d58072bd472c376068154c Mon Sep 17 00:00:00 2001 From: MelonSpeedruns Date: Mon, 28 Mar 2022 17:19:12 -0400 Subject: [PATCH] added WIP collision --- soh/src/code/z_camera.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 99581d316..25db44108 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -1416,6 +1416,7 @@ s32 Camera_Free(Camera* camera) { f32 playerHeight = Player_GetHeight(camera->player); f32 sp94; + CamColChk bgChk; sCameraInterfaceFlags = norm1->interfaceFlags; @@ -1464,7 +1465,14 @@ s32 Camera_Free(Camera* camera) { OLib_Vec3fDiffToVecSphGeo(&eyeAdjustment, &camera->at, &camera->eye); OLib_Vec3fDiffToVecSphGeo(&eyeAdjustment, &camera->at, &camera->eyeNext); - camera->dist = eyeAdjustment.r = 150; + if (Camera_BGCheck(camera, &camera->at, &camera->eye)) { + VecSph collSphere; + OLib_Vec3fDiffToVecSphGeo(&collSphere, &camera->at, &camera->eye); + float rad = collSphere.r; + camera->dist = eyeAdjustment.r = rad; + } else { + camera->dist = eyeAdjustment.r = 150; + } f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x; f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y;