Created
March 7, 2020 19:04
-
-
Save kilbith/09c7c8c9d463051a0fab398a52cd9242 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/client/camera.cpp b/src/client/camera.cpp | |
index 46464404..5426b9df 100644 | |
--- a/src/client/camera.cpp | |
+++ b/src/client/camera.cpp | |
@@ -234,7 +234,7 @@ void Camera::addArmInertia(f32 player_yaw) | |
m_last_cam_pos.X = player_yaw; | |
m_wieldmesh_offset.X = rangelim(m_wieldmesh_offset.X, | |
- WIELDMESH_OFFSET_X - 7.0f, WIELDMESH_OFFSET_X + 7.0f); | |
+ WIELDMESH_OFFSET_X - 3.0f, WIELDMESH_OFFSET_X + 3.0f); | |
} | |
if (m_cam_vel.Y > 1.0f) { | |
@@ -249,7 +249,7 @@ void Camera::addArmInertia(f32 player_yaw) | |
m_last_cam_pos.Y = m_camera_direction.Y; | |
m_wieldmesh_offset.Y = rangelim(m_wieldmesh_offset.Y, | |
- WIELDMESH_OFFSET_Y - 10.0f, WIELDMESH_OFFSET_Y + 5.0f); | |
+ WIELDMESH_OFFSET_Y - 5.0f, WIELDMESH_OFFSET_Y + 5.0f); | |
} | |
m_arm_dir = dir(m_wieldmesh_offset); | |
@@ -259,10 +259,10 @@ void Camera::addArmInertia(f32 player_yaw) | |
following a vector, with a smooth deceleration factor. | |
*/ | |
- f32 dec_X = 0.12f * (m_cam_vel_old.X * (1.0f + | |
+ f32 dec_X = 0.35f * (m_cam_vel_old.X * (1.0f + | |
(1.0f - m_arm_dir.X))) * (gap_X / 20.0f); | |
- f32 dec_Y = 0.06f * (m_cam_vel_old.Y * (1.0f + | |
+ f32 dec_Y = 0.25f * (m_cam_vel_old.Y * (1.0f + | |
(1.0f - m_arm_dir.Y))) * (gap_Y / 15.0f); | |
if (gap_X < 0.1f) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment