fix new input mouse system

This commit is contained in:
2023-12-10 19:56:46 +02:00
parent 72a210f142
commit c24abb2964
5 changed files with 30 additions and 35 deletions
+15 -21
View File
@@ -55,19 +55,8 @@ public class CameraSystem : MonoBehaviour
private void Start()
{
transform.position = Player.Instance.transform.position;
}
}
private void OnEnable()
{
InputManager.Instance.CameraAction.Rotate.performed += OnCameraRotate;
InputManager.Instance.CameraAction.Zoom.performed += OnCameraZoom;
}
private void OnDisable()
{
InputManager.Instance.CameraAction.Rotate.performed -= OnCameraRotate;
InputManager.Instance.CameraAction.Zoom.performed -= OnCameraZoom;
}
private void Update()
@@ -79,14 +68,21 @@ public class CameraSystem : MonoBehaviour
HandleCameraMovement(cameraMove);
}
//float rotate = InputManager.Instance.CameraAction.Rotate.ReadValue<float>();
//if (rotate != 0)
//{
//HandleCameraRotation(rotate, _rotateSpeed);
//}
float rotateDir = InputManager.Instance.CameraAction.Rotate.ReadValue<Vector2>().x;
if (rotateDir != 0)
{
HandleCameraRotation(rotateDir, _rotateSpeed);
}
float zoomAmount = InputManager.Instance.CameraAction.Zoom.ReadValue<Vector2>().y;
if (zoomAmount != 0)
{
HandleCameraZoom_MoveY(zoomAmount);
}
//HandleCameraZoom_MoveY();
//HandleCameraZoom_FOV();
//HandleCameraZoom_MoveForward();
//HandleCameraZoom_MoveY();
}
private void HandleCameraZoom_MoveForward()
@@ -108,10 +104,8 @@ public class CameraSystem : MonoBehaviour
_cinemachineTransposer.m_FollowOffset = _followOffset;
}
private void OnCameraZoom(InputAction.CallbackContext context)
private void HandleCameraZoom_MoveY(float _zoomAmount)
{
float _zoomAmount = InputManager.Instance.CameraAction.Rotate.ReadValue<Vector2>().y;
_followOffset.y += _zoomAmount;
_followOffset.y = Mathf.Clamp(_followOffset.y, _followOffsetMinY, _followOffsetMaxY);