Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-27 06:20:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

add ability to pass parameters to FindGround()

Browse source
This commit is contained in:
in0finite 2019-10-22 00:21:04 +02:00
parent 31a1903b94
commit 25d1e30efa
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Assets/Scripts/Behaviours/Ped/Ped.cs
View file

@ -97,6 +97,14 @@ namespace SanAndreasUnity.Behaviours
private Coroutine m_findGroundCoroutine;
public struct FindGroundParams
{
public bool tryFromAbove;
public static FindGroundParams Default => new FindGroundParams(){tryFromAbove = true};
public static FindGroundParams DefaultBasedOnLoadedWorld => new FindGroundParams(){tryFromAbove = (null == Cell.Instance || Cell.Instance.HasExterior)};
}
/// <summary>Ped who is controlled by local player.</summary>
public static Ped Instance { get { return Net.Player.Local != null ? Net.Player.Local.OwnedPed : null; } }
@ -232,12 +240,12 @@ namespace SanAndreasUnity.Behaviours
return;
if (!IsGrounded) {
FindGround ();
FindGround (FindGroundParams.DefaultBasedOnLoadedWorld);
}
}
public void Teleport(Vector3 position, Quaternion rotation) {
public void Teleport(Vector3 position, Quaternion rotation, FindGroundParams parameters) {
if (!NetStatus.IsServer)
return;
@ -248,27 +256,32 @@ namespace SanAndreasUnity.Behaviours
this.transform.position = position;
this.transform.rotation = rotation;
this.FindGround ();
this.FindGround (parameters);
}
public void Teleport(Vector3 position, Quaternion rotation)
{
this.Teleport(position, rotation, FindGroundParams.DefaultBasedOnLoadedWorld);
}
public void Teleport(Vector3 position) {
this.Teleport (position, this.transform.rotation);
}
public void FindGround ()
public void FindGround (FindGroundParams parameters)
{
if (m_findGroundCoroutine != null) {
StopCoroutine (m_findGroundCoroutine);
m_findGroundCoroutine = null;
}
m_findGroundCoroutine = StartCoroutine (FindGroundCoroutine ());
m_findGroundCoroutine = StartCoroutine (FindGroundCoroutine (parameters));
}
private IEnumerator FindGroundCoroutine()
private IEnumerator FindGroundCoroutine(FindGroundParams parameters)
{
yield return null;
@ -444,7 +457,7 @@ namespace SanAndreasUnity.Behaviours
Vector3 t = this.transform.position;
t.y = 150;
this.transform.position = t;
this.FindGround();
this.FindGround(FindGroundParams.Default);
}

2
Assets/Scripts/Behaviours/World/Cell.cs
View file

@ -23,6 +23,8 @@ namespace SanAndreasUnity.Behaviours.World
public List<int> CellIds = new List<int> { 0, 13 };
public bool HasExterior => this.CellIds.Contains(0);
public Camera PreviewCamera;
public List<Transform> focusPoints = new List<Transform> ();