Skip to content

Commit 60ab38e

Browse files
committed
feat(NPCVehicleControlStep.cs): add outer-control yaw-speed
Signed-off-by: kazushi67 <[email protected]>
1 parent 53c45a0 commit 60ab38e

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

Assets/AWSIM/Scripts/RandomTraffic/NPCVehicle/Steps/NPCVehicleControlStep.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ private static void UpdateYawSpeed(NPCVehicleInternalState state, float deltaTim
7373
{
7474
// Steering the vehicle so that it heads toward the target point.
7575
var steeringDirection = state.TargetPoint - state.FrontCenterPosition;
76+
var distance = Math.Sqrt(steeringDirection.x*steeringDirection.x + steeringDirection.y*steeringDirection.y);
7677
steeringDirection.y = 0f;
7778
var steeringAngle = Vector3.SignedAngle(state.Forward, steeringDirection, Vector3.up);
7879
var targetYawSpeed = steeringAngle * state.Speed * NPCVehicleConfig.YawSpeedMultiplier;
@@ -81,6 +82,15 @@ private static void UpdateYawSpeed(NPCVehicleInternalState state, float deltaTim
8182
state.YawSpeed,
8283
targetYawSpeed,
8384
NPCVehicleConfig.YawSpeedLerpFactor * deltaTime);
85+
86+
var vehicle = state.Vehicle;
87+
if(state.Vehicle.outerControl == true){
88+
var rateTime = deltaTime/state.Vehicle.outerTargetPointTime;
89+
state.YawSpeed = Mathf.Lerp(
90+
state.YawSpeed,
91+
targetYawSpeed,
92+
NPCVehicleConfig.YawSpeedLerpFactor * rateTime);
93+
}
8494
}
8595

8696
/// <summary>

0 commit comments

Comments
 (0)