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

use "stopping distance" from NavMeshAgent, don't try to manually stop him

Browse source
This commit is contained in:
in0finite 2022-03-20 23:20:39 +01:00
parent b8300b25ec
commit 3124685f47
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Assets/Scripts/Behaviours/PedAI/FollowState.cs
View file

@ -224,12 +224,7 @@ namespace SanAndreasUnity.Behaviours.Peds.AI
}
_ped.MovementAgent.Destination = targetPos;
Vector3? calculatedDestination = _ped.MovementAgent.CalculatedDestination;
Vector3 targetPosToCalculateDistance = ignoreCalculatedDestination ? targetPos : calculatedDestination.GetValueOrDefault(targetPos);
float distance = (_ped.transform.position - targetPosToCalculateDistance).magnitude;
if (distance <= currentStoppingDistance)
return;
_ped.MovementAgent.StoppingDistance = currentStoppingDistance;
Vector3 desiredVelocity = _ped.MovementAgent.DesiredVelocity.WithXAndZ();

23
Assets/Scripts/Utilities/MovementAgent.cs
View file

@ -21,14 +21,31 @@ namespace SanAndreasUnity.Utilities
private float m_lastTimeWhenWarped = 0f;
private float m_timeSinceSampledOffNavMesh = 0f;
public Vector3 DesiredVelocity => m_sampledPosOffNavMesh.HasValue
? (m_sampledPosOffNavMesh.Value - this.NavMeshAgent.transform.position).normalized
: this.NavMeshAgent.desiredVelocity;
public Vector3 DesiredVelocity
{
get
{
if (!m_sampledPosOffNavMesh.HasValue)
return this.NavMeshAgent.desiredVelocity;
Vector3 diff = m_sampledPosOffNavMesh.Value - this.NavMeshAgent.transform.position;
float distance = diff.magnitude;
if (distance <= this.StoppingDistance)
return Vector3.zero;
return diff / distance;
}
}
public Vector3? CalculatedDestination { get; private set; } = null;
private Vector3? m_sampledPosOffNavMesh = null;
public float StoppingDistance
{
get => this.NavMeshAgent.stoppingDistance;
set => this.NavMeshAgent.stoppingDistance = value;
}
void Awake()