lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Vova
2023-12-10 19:32:12 +02:00
parent 1a114c10da
commit 72a210f142
4 changed files with 96 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Managers/CameraSystem.cs
+13 -11
View File
@@ -59,13 +59,13 @@ public class CameraSystem : MonoBehaviour
private void OnEnable()
{
InputManager.Instance.CameraAction.MouseRotate.performed += OnCameraRotate;
InputManager.Instance.CameraAction.Rotate.performed += OnCameraRotate;
InputManager.Instance.CameraAction.Zoom.performed += OnCameraZoom;
}
private void OnDisable()
{
InputManager.Instance.CameraAction.MouseRotate.performed -= OnCameraRotate;
InputManager.Instance.CameraAction.Rotate.performed -= OnCameraRotate;
InputManager.Instance.CameraAction.Zoom.performed -= OnCameraZoom;
}
@@ -79,11 +79,11 @@ public class CameraSystem : MonoBehaviour
HandleCameraMovement(cameraMove);
}
float rotate = InputManager.Instance.CameraAction.Rotate.ReadValue<float>();
if (rotate != 0)
{
HandleCameraRotation(rotate, _rotateSpeed);
}
//float rotate = InputManager.Instance.CameraAction.Rotate.ReadValue<float>();
//if (rotate != 0)
//{
//HandleCameraRotation(rotate, _rotateSpeed);
//}
//HandleCameraZoom_FOV();
//HandleCameraZoom_MoveForward();
//HandleCameraZoom_MoveY();
@@ -110,7 +110,7 @@ public class CameraSystem : MonoBehaviour
private void OnCameraZoom(InputAction.CallbackContext context)
{
float _zoomAmount = InputManager.Instance.CameraAction.Rotate.ReadValue<float>();
float _zoomAmount = InputManager.Instance.CameraAction.Rotate.ReadValue<Vector2>().y;
_followOffset.y += _zoomAmount;
@@ -186,11 +186,13 @@ public class CameraSystem : MonoBehaviour
private void OnCameraRotate(InputAction.CallbackContext context)
{
if (!_useMouseRotate && !Mouse.current.middleButton.isPressed)
if (Mouse.current.middleButton.isPressed)
{
return;
}
HandleCameraRotation(Mouse.current.delta.x.value, _mouseRotationSpeed);
float rotateDir = InputManager.Instance.CameraAction.Rotate.ReadValue<Vector2>().x;
//HandleCameraRotation(rotationValue, _mouseRotationSpeed);
transform.eulerAngles += new Vector3(0, rotateDir * _rotateSpeed * Time.deltaTime, 0);
}
private void HandleCameraRotation(float rotateDir, float speed)