From cabcfb009c438b8de1af88d904e9068f8a650e1e Mon Sep 17 00:00:00 2001 From: frizzle101101 Date: Mon, 12 Dec 2022 16:10:28 -0500 Subject: improving free cam settings configurability (#1987) * Initial camera distance slider * works with freecam * improving the settings configurability, adding distance slider and transition speed for the free camera adding seperate sensitivity and invert settings for aiming/first person camera * spelling * tooltip msg on camera invvert * typos * removing the original free camera checkbox in experimental menu * adding name change to new presets file Co-authored-by: RaelCappra --- soh/src/code/z_camera.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'soh/src/code') diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 13c1f3dab..c4db72565 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -1485,8 +1485,8 @@ s32 Camera_Free(Camera* camera) { camera->animState = 0; - f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f * (CVar_GetFloat("gCameraSensitivity", 1.0f)); - f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f * (CVar_GetFloat("gCameraSensitivity", 1.0f)); + f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f * (CVar_GetFloat("gThirdPersonCameraSensitivity", 1.0f)); + f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f * (CVar_GetFloat("gThirdPersonCameraSensitivity", 1.0f)); camera->play->camX += newCamX * (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1); camera->play->camY += newCamY * (CVar_GetS32("gInvertYAxis", 1) ? 1 : -1); @@ -1498,7 +1498,11 @@ s32 Camera_Free(Camera* camera) { camera->play->camY = -0x228C; } - camera->dist = Camera_LERPCeilF(para1->distTarget, camera->dist, 1.0f / camera->rUpdateRateInv, 0.0f); + f32 distTarget = CVar_GetS32("gFreeCameraDistMax", para1->distTarget); + f32 speedScaler = CVar_GetS32("gFreeCameraTransitionSpeed", 25); + f32 distDiff = ABS(distTarget - camera->dist); + if (distDiff > 0) + camera->dist = Camera_LERPCeilF(distTarget, camera->dist, speedScaler / (distDiff + speedScaler), 0.0f); OLib_Vec3fDiffToVecSphGeo(&spA8, at, eyeNext); spA8.r = camera->dist; -- cgit v1.2.3