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

fixed bug with road collider,

Browse Source 
added some city environment, just for fun
This commit is contained in:
Valdimir
2023-12-10 23:30:35 +02:00
parent 777b5a99fc
commit 05bf8484f5
6 changed files with 2679 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Managers/CameraSystem.cs
+17 -18
View File
@@ -35,8 +35,6 @@ public class CameraSystem : MonoBehaviour
private float _moveSpeed = 25f;
[SerializeField]
private int _edgeScrollSize = 20;
private bool _dragPanMoveActive = false;
private bool _dragRotateMoveActive = false;
[SerializeField]
private float _dragPanSpeed = 2f;
[SerializeField]
@@ -55,7 +53,7 @@ public class CameraSystem : MonoBehaviour
private void Start()
{
transform.position = Player.Instance.transform.position;
}
}
private void Update()
{
@@ -77,6 +75,11 @@ public class CameraSystem : MonoBehaviour
{
HandleCameraZoom_MoveY(zoomAmount);
}
if (_useEdgeScrolling)
{
EdgeScrollingMovement();
}
//HandleCameraZoom_MoveY();
//HandleCameraZoom_FOV();
//HandleCameraZoom_MoveForward();
@@ -133,15 +136,6 @@ public class CameraSystem : MonoBehaviour
private void HandleCameraMovement(Vector2 inputDir)
{
if (_useEdgeScrolling)
{
inputDir = EdgeScrollingMovement(inputDir);
}
if (_useMouseDrag)
{
inputDir = MousePanMovement(inputDir);
}
Vector3 moveDir = transform.forward * inputDir.y + transform.right * inputDir.x;
transform.position += moveDir * _moveSpeed * Time.deltaTime;
}
@@ -167,13 +161,18 @@ public class CameraSystem : MonoBehaviour
return inputDir;
}
private Vector3 EdgeScrollingMovement(Vector3 inputDir)
private void EdgeScrollingMovement()
{
if (Input.mousePosition.x < _edgeScrollSize) inputDir.x = -1f;
if (Input.mousePosition.y < _edgeScrollSize) inputDir.z = -1f;
if (Input.mousePosition.x > Screen.width - _edgeScrollSize) inputDir.x = 1f;
if (Input.mousePosition.y > Screen.height - _edgeScrollSize) inputDir.z = 1f;
return inputDir;
Vector3 inputDir = Vector3.zero;
var mousePosition = Mouse.current.position.ReadValue();
if (mousePosition.x < _edgeScrollSize) inputDir.x = -1f;
if (mousePosition.y < _edgeScrollSize) inputDir.y = -1f;
if (mousePosition.x > Screen.width - _edgeScrollSize) inputDir.x = 1f;
if (mousePosition.y > Screen.height - _edgeScrollSize) inputDir.y = 1f;
Vector3 moveDir = transform.forward * inputDir.y + transform.right * inputDir.x;
transform.position += moveDir * _moveSpeed * Time.deltaTime;
}
private void OnCameraRotate(InputAction.CallbackContext context)