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

Refactor: added GameManager

Browse Source
This commit is contained in:
Vova
2023-12-11 11:53:00 +02:00
parent 05bf8484f5
commit ea59babf93
23 changed files with 162 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Managers/CameraSystem.cs
+4 -9
View File
@@ -1,5 +1,4 @@
using Cinemachine;
using System;
using UnityEngine;
using UnityEngine.InputSystem;
@@ -30,14 +29,10 @@ public class CameraSystem : MonoBehaviour
[SerializeField]
private float _rotateSpeed = 100f;
[SerializeField]
private float _mouseRotationSpeed = 3f;
[SerializeField]
private float _moveSpeed = 25f;
[SerializeField]
private int _edgeScrollSize = 20;
[SerializeField]
private float _dragPanSpeed = 2f;
[SerializeField]
private float _zoomSpeed = 2f;
[SerializeField]
private float _zoomAmount = 3f;
@@ -57,20 +52,20 @@ public class CameraSystem : MonoBehaviour
private void Update()
{
var cameraMove = InputManager.Instance.CameraAction.Move.ReadValue<Vector2>();
var cameraMove = GameManager.Instance.Input.CameraAction.Move.ReadValue<Vector2>();
if (cameraMove.sqrMagnitude > 0.1f)
{
HandleCameraMovement(cameraMove);
}
float rotateDir = InputManager.Instance.CameraAction.Rotate.ReadValue<Vector2>().x;
float rotateDir = GameManager.Instance.Input.CameraAction.Rotate.ReadValue<Vector2>().x;
if (rotateDir != 0)
{
HandleCameraRotation(rotateDir, _rotateSpeed);
}
float zoomAmount = InputManager.Instance.CameraAction.Zoom.ReadValue<Vector2>().y;
float zoomAmount = GameManager.Instance.Input.CameraAction.Zoom.ReadValue<Vector2>().y;
if (zoomAmount != 0)
{
HandleCameraZoom_MoveY(zoomAmount);
@@ -181,7 +176,7 @@ public class CameraSystem : MonoBehaviour
{
}
float rotateDir = InputManager.Instance.CameraAction.Rotate.ReadValue<Vector2>().x;
float rotateDir = GameManager.Instance.Input.CameraAction.Rotate.ReadValue<Vector2>().x;
//HandleCameraRotation(rotationValue, _mouseRotationSpeed);
transform.eulerAngles += new Vector3(0, rotateDir * _rotateSpeed * Time.deltaTime, 0);
}