diff --git a/cheat-library/src/user/cheat/visuals/FreeCamera.cpp b/cheat-library/src/user/cheat/visuals/FreeCamera.cpp index 9729259..c7f39ff 100644 --- a/cheat-library/src/user/cheat/visuals/FreeCamera.cpp +++ b/cheat-library/src/user/cheat/visuals/FreeCamera.cpp @@ -1,6 +1,7 @@ #include "pch-il2cpp.h" #include "FreeCamera.h" +#include #include #include #include @@ -18,7 +19,7 @@ namespace cheat::feature app::Component_1* mainCam_Camera; app::Vector3 targetPosition; app::Vector3 smoothPosition; - float smoothFOV; + float smoothFOV, focalLength = 0; bool isEnabled = false; FreeCamera::FreeCamera() : Feature(), @@ -31,7 +32,10 @@ namespace cheat::feature NF(f_RollSpeed, "Roll Speed", "Visuals::FreeCamera", 1.0f), NF(f_FOVSpeed, "FOV Speed", "Visuals::FreeCamera", 0.1f), NF(f_FOV, "Field of View", "Visuals::FreeCamera", 45.0f), - NF(f_Smoothing, "Smoothing", "Visuals::FreeCamera", 1.0f), + NF(f_MovSmoothing, "Movement Smoothing", "Visuals::FreeCamera", 1.0f), + NF(f_LookSmoothing, "Look Smoothing", "Visuals::FreeCamera", 1.0f), + NF(f_RollSmoothing, "Roll Smoothing", "Visuals::FreeCamera", 1.0f), + NF(f_FovSmoothing, "FOV Smoothing", "Visuals::FreeCamera", 1.0f), NF(f_Forward, "Forward", "Visuals::FreeCamera", Hotkey('W')), NF(f_Backward, "Backward", "Visuals::FreeCamera", Hotkey('S')), NF(f_Left, "Left", "Visuals::FreeCamera", Hotkey('A')), @@ -74,8 +78,15 @@ namespace cheat::feature ConfigWidget("Look Sensitivity", f_LookSens, 0.01f, 0.01f, 100.0f); ConfigWidget("Roll Speed", f_RollSpeed, 0.01f, 0.01f, 100.0f); ConfigWidget("FOV Speed", f_FOVSpeed, 0.01f, 0.01f, 100.0f); - ConfigWidget("Field of View", f_FOV, 0.1f, 0.01f, 200.0f); - ConfigWidget("Smoothing", f_Smoothing, 0.01f, 0.001f, 1.0f, "Lower = Smoother"); + ConfigWidget("Field of View", f_FOV, 0.1f, 0.01f, 200.0f, "Changes Vertical FoV. Horizontal FoV depends on the viewport's aspect ratio"); + if (ImGui::Button("Convert FoV to 35mm FF focal length")) + focalLength = 24 / (2 * tan((f_FOV * 3.14159265) / (2 * 180))); + ImGui::Text("Focal length: %f", focalLength); + ImGui::Spacing(); + ConfigWidget("Movement Smoothing", f_MovSmoothing, 0.01f, 0.001f, 1.0f, "Lower = Smoother"); + ConfigWidget("Look Smoothing", f_LookSmoothing, 0.01f, 0.001f, 1.0f, "Lower = Smoother"); + ConfigWidget("Roll Smoothing", f_RollSmoothing, 0.01f, 0.001f, 1.0f, "Lower = Smoother"); + ConfigWidget("FOV Smoothing", f_FovSmoothing, 0.01f, 0.001f, 1.0f, "Lower = Smoother"); } ImGui::EndGroupPanel(); @@ -127,11 +138,11 @@ namespace cheat::feature roll = t_eulerAngles.z; } - void LerpTowards(CameraRotation target, float rotationLerpPct) + void LerpTowards(CameraRotation target, float lookRotationLerpPct, float rollRotationLerpPct) { - yaw = app::Mathf_Lerp(yaw, target.yaw, rotationLerpPct, nullptr); - pitch = app::Mathf_Lerp(pitch, target.pitch, rotationLerpPct, nullptr); - roll = app::Mathf_Lerp(roll, target.roll, rotationLerpPct, nullptr); + yaw = app::Mathf_Lerp(yaw, target.yaw, lookRotationLerpPct, nullptr); + pitch = app::Mathf_Lerp(pitch, target.pitch, lookRotationLerpPct, nullptr); + roll = app::Mathf_Lerp(roll, target.roll, rollRotationLerpPct, nullptr); } void UpdateTransform(app::Transform* t) @@ -204,11 +215,11 @@ namespace cheat::feature // Commit the rotation changes to the transform currentRotation.UpdateTransform(freeCam_Transform); - smoothPosition = app::Vector3_Lerp(freeCam_Transform_position, targetPosition, settings.f_Smoothing, nullptr); + smoothPosition = app::Vector3_Lerp(freeCam_Transform_position, targetPosition, settings.f_MovSmoothing, nullptr); app::Transform_set_position(freeCam_Transform, smoothPosition, nullptr); - smoothFOV = app::Mathf_Lerp(app::Camera_get_fieldOfView(reinterpret_cast(freeCam_Camera), nullptr), settings.f_FOV, settings.f_Smoothing, nullptr); + smoothFOV = app::Mathf_Lerp(app::Camera_get_fieldOfView(reinterpret_cast(freeCam_Camera), nullptr), settings.f_FOV, settings.f_FovSmoothing, nullptr); app::Camera_set_fieldOfView(reinterpret_cast(freeCam_Camera), smoothFOV, nullptr); - currentRotation.LerpTowards(targetRotation, settings.f_Smoothing); + currentRotation.LerpTowards(targetRotation, settings.f_LookSmoothing, settings.f_RollSmoothing); } void DisableFreeCam() diff --git a/cheat-library/src/user/cheat/visuals/FreeCamera.h b/cheat-library/src/user/cheat/visuals/FreeCamera.h index 800affb..09d7d37 100644 --- a/cheat-library/src/user/cheat/visuals/FreeCamera.h +++ b/cheat-library/src/user/cheat/visuals/FreeCamera.h @@ -16,7 +16,10 @@ namespace cheat::feature config::Field f_RollSpeed; config::Field f_FOVSpeed; config::Field f_FOV; - config::Field f_Smoothing; + config::Field f_MovSmoothing; + config::Field f_LookSmoothing; + config::Field f_RollSmoothing; + config::Field f_FovSmoothing; config::Field f_Forward; config::Field f_Backward; config::Field f_Left;