Update PlayerAgent.cs

Assets/Scripts/Player/PlayerAgent.cs

@@ -37,8 +37,9 @@ namespace Projectiles
     [SerializeField] private float _cameraDistanceMin = 1.0f;
     [SerializeField] private float _cameraDistanceMax = 5.0f;
     [SerializeField] private Vector3 _shoulderOffset = new Vector3(0.4f, 1.6f, 0f);
-    [SerializeField] private LayerMask _cameraCollisionMask = ~0; // collide with world
+    [SerializeField] private LayerMask _cameraCollisionMask = ~0; // collide with world (exclude Player layer)
     [SerializeField] private float _cameraCollisionRadius = 0.15f;
+    [SerializeField] private float _cameraDistanceSmoothing = 10f; // smooth camera distance changes
 
     // --- Movement --------------------------------------------------------------
 
@@ -58,6 +59,9 @@ namespace Projectiles
 
     [Networked] private Vector3 _moveVelocity { get; set; }
     
+    // Smooth camera distance for collision response
+    private float _currentCameraDistance;
+
     // Local cache of most recent FUN (FixedUpdateNetwork) look to build on in Render/LateUpdate
     private Vector2 _lastFUNLookRotation; // (pitch,yaw) from KCC
 
@@ -97,6 +101,9 @@ namespace Projectiles
       Weapons = GetComponent<Weapons>();
       Health  = GetComponent<Health>();
       Input   = GetComponent<PlayerInput>();
+      
+      // Initialize camera distance
+      _currentCameraDistance = _cameraDistance;
     }
 
     private void LateUpdate()
@@ -131,19 +138,23 @@ namespace Projectiles
         Vector3 dir = (desiredPos - pivotWorld);
         float   len = dir.magnitude;
         Vector3 finalPos = desiredPos;
+        float targetDistance = _cameraDistance;
 
         if (len > 0.0001f)
         {
           dir /= len;
           if (Physics.SphereCast(pivotWorld, _cameraCollisionRadius, dir, out RaycastHit hit, len, _cameraCollisionMask, QueryTriggerInteraction.Ignore))
           {
-            finalPos = pivotWorld + dir * Mathf.Max(hit.distance - 0.05f, _cameraDistanceMin);
+            targetDistance = Mathf.Max(hit.distance - 0.05f, _cameraDistanceMin);
           }
         }
 
-        // Clamp within min/max boom
+        // Smooth the camera distance changes for less jarring collision response
-        float dist = Mathf.Clamp(Vector3.Distance(pivotWorld, finalPos), _cameraDistanceMin, _cameraDistanceMax);
+        _currentCameraDistance = Mathf.Lerp(_currentCameraDistance, targetDistance, _cameraDistanceSmoothing * Time.deltaTime);
-        finalPos = pivotWorld + dir * dist;
+        
+        // Clamp within min/max boom and apply smoothed distance
+        _currentCameraDistance = Mathf.Clamp(_currentCameraDistance, _cameraDistanceMin, _cameraDistanceMax);
+        finalPos = pivotWorld + dir * _currentCameraDistance;
 
         cam.position = finalPos;
         cam.rotation = Quaternion.Euler(currentLook.x, currentLook.y, 0f);
@@ -198,10 +209,12 @@ namespace Projectiles
       if (faceDir.sqrMagnitude > 0.0001f)
       {
         Quaternion target = Quaternion.LookRotation(faceDir, Vector3.up);
-        // FIXED: Use transform rotation instead of overriding look rotation
+        // Use KCC for body yaw rotation, but only set the Y (yaw) component
-        // This prevents interfering with camera pitch
+        // This keeps the body rotation networked via KCC
-        Quaternion newRot = Quaternion.RotateTowards(transform.rotation, target, _turnSpeed * Runner.DeltaTime);
+        Vector2 currentLook = KCC.GetLookRotation();
-        transform.rotation = newRot;
+        float targetYaw = target.eulerAngles.y;
+        float newYaw = Mathf.MoveTowardsAngle(currentLook.y, targetYaw, _turnSpeed * Runner.DeltaTime);
+        KCC.SetLookRotation(new Vector2(currentLook.x, newYaw), _minPitch, _maxPitch);
       }
 
       // 5) Jump