Merge pull request #1066 from carla-simulator/features/basic_agent
Features/basic agent
This commit is contained in:
commit
fb741afeb7
|
@ -0,0 +1,197 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2018 Intel Labs.
|
||||
# authors: German Ros (german.ros@intel.com)
|
||||
#
|
||||
# This work is licensed under the terms of the MIT license.
|
||||
# For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
""" This module implements an agent that roams around a track following random
|
||||
waypoints and avoiding other vehicles.
|
||||
The agent also responds to traffic lights. """
|
||||
|
||||
from enum import Enum
|
||||
|
||||
import carla
|
||||
from agents.tools.misc import is_within_distance_ahead, compute_magnitude_angle
|
||||
|
||||
class AgentState(Enum):
|
||||
"""
|
||||
AGENT_STATE represents the possible states of a roaming agent
|
||||
"""
|
||||
NAVIGATING = 1
|
||||
BLOCKED_BY_VEHICLE = 2
|
||||
BLOCKED_RED_LIGHT = 3
|
||||
|
||||
|
||||
class Agent(object):
|
||||
"""
|
||||
Base class to define agents in CARLA
|
||||
"""
|
||||
|
||||
def __init__(self, vehicle):
|
||||
"""
|
||||
|
||||
:param vehicle: actor to apply to local planner logic onto
|
||||
"""
|
||||
self._vehicle = vehicle
|
||||
self._world = self._vehicle.get_world()
|
||||
self._map = self._vehicle.get_world().get_map()
|
||||
|
||||
|
||||
def run_step(self, debug=False):
|
||||
"""
|
||||
Execute one step of navigation.
|
||||
:return: control
|
||||
"""
|
||||
control = carla.VehicleControl()
|
||||
control.steer = 0.0
|
||||
control.throttle = 0.0
|
||||
control.brake = 0.0
|
||||
control.hand_brake = False
|
||||
control.manual_gear_shift = False
|
||||
|
||||
return control
|
||||
|
||||
|
||||
def _is_light_red(self, lights_list):
|
||||
"""
|
||||
Method to check if there is a red light affecting us. This version of
|
||||
the method is compatible with both European and US style traffic lights.
|
||||
|
||||
:param lights_list: list containing TrafficLight objects
|
||||
:return: a tuple given by (bool_flag, traffic_light), where
|
||||
- bool_flag is True if there is a traffic light in RED
|
||||
affecting us and False otherwise
|
||||
- traffic_light is the object itself or None if there is no
|
||||
red traffic light affecting us
|
||||
"""
|
||||
if self._world.map_name == 'Town01' or self._world.map_name == 'Town02':
|
||||
return self._is_light_red_europe_style(lights_list)
|
||||
else:
|
||||
return self._is_light_red_us_style(lights_list)
|
||||
|
||||
def _is_light_red_europe_style(self, lights_list):
|
||||
"""
|
||||
This method is specialized to check European style traffic lights.
|
||||
|
||||
:param lights_list: list containing TrafficLight objects
|
||||
:return: a tuple given by (bool_flag, traffic_light), where
|
||||
- bool_flag is True if there is a traffic light in RED
|
||||
affecting us and False otherwise
|
||||
- traffic_light is the object itself or None if there is no
|
||||
red traffic light affecting us
|
||||
"""
|
||||
ego_vehicle_location = self._vehicle.get_location()
|
||||
ego_vehicle_waypoint = self._map.get_waypoint(ego_vehicle_location)
|
||||
|
||||
for traffic_light in lights_list:
|
||||
object_waypoint = self._map.get_waypoint(traffic_light.get_location())
|
||||
if object_waypoint.road_id != ego_vehicle_waypoint.road_id or \
|
||||
object_waypoint.lane_id != ego_vehicle_waypoint.lane_id:
|
||||
continue
|
||||
|
||||
loc = traffic_light.get_location()
|
||||
if is_within_distance_ahead(loc, ego_vehicle_location,
|
||||
self._vehicle.get_transform().rotation.yaw,
|
||||
self._proximity_threshold):
|
||||
if traffic_light.state == carla.libcarla.TrafficLightState.Red:
|
||||
return (True, traffic_light)
|
||||
|
||||
return (False, None)
|
||||
|
||||
def _is_light_red_us_style(self, lights_list, debug=False):
|
||||
"""
|
||||
This method is specialized to check US style traffic lights.
|
||||
|
||||
:param lights_list: list containing TrafficLight objects
|
||||
:return: a tuple given by (bool_flag, traffic_light), where
|
||||
- bool_flag is True if there is a traffic light in RED
|
||||
affecting us and False otherwise
|
||||
- traffic_light is the object itself or None if there is no
|
||||
red traffic light affecting us
|
||||
"""
|
||||
ego_vehicle_location = self._vehicle.get_location()
|
||||
ego_vehicle_waypoint = self._map.get_waypoint(ego_vehicle_location)
|
||||
|
||||
if ego_vehicle_waypoint.is_intersection:
|
||||
# It is too late. Do not block the intersection! Keep going!
|
||||
return (False, None)
|
||||
|
||||
if self._local_planner._target_waypoint is not None:
|
||||
if self._local_planner._target_waypoint.is_intersection:
|
||||
potential_lights = []
|
||||
min_angle = 180.0
|
||||
sel_magnitude = 0.0
|
||||
sel_traffic_light = None
|
||||
for traffic_light in lights_list:
|
||||
loc = traffic_light.get_location()
|
||||
magnitude, angle = compute_magnitude_angle(loc,
|
||||
ego_vehicle_location,
|
||||
self._vehicle.get_transform().rotation.yaw)
|
||||
if magnitude < 80.0 and angle < min(25.0, min_angle):
|
||||
sel_magnitude = magnitude
|
||||
sel_traffic_light = traffic_light
|
||||
min_angle = angle
|
||||
|
||||
if sel_traffic_light is not None:
|
||||
if debug:
|
||||
print('=== Magnitude = {} | Angle = {} | ID = {}'.format(sel_magnitude, min_angle, sel_traffic_light.id))
|
||||
if sel_traffic_light.state == carla.libcarla.TrafficLightState.Red:
|
||||
return (True, sel_traffic_light)
|
||||
|
||||
return (False, None)
|
||||
|
||||
def _is_vehicle_hazard(self, vehicle_list):
|
||||
"""
|
||||
Check if a given vehicle is an obstacle in our way. To this end we take
|
||||
into account the road and lane the target vehicle is on and run a
|
||||
geometry test to check if the target vehicle is under a certain distance
|
||||
in front of our ego vehicle.
|
||||
|
||||
WARNING: This method is an approximation that could fail for very large
|
||||
vehicles, which center is actually on a different lane but their
|
||||
extension falls within the ego vehicle lane.
|
||||
|
||||
:param vehicle_list: list of potential obstacle to check
|
||||
:return: a tuple given by (bool_flag, vehicle), where
|
||||
- bool_flag is True if there is a vehicle ahead blocking us
|
||||
and False otherwise
|
||||
- vehicle is the blocker object itself
|
||||
"""
|
||||
|
||||
ego_vehicle_location = self._vehicle.get_location()
|
||||
ego_vehicle_waypoint = self._map.get_waypoint(ego_vehicle_location)
|
||||
|
||||
for target_vehicle in vehicle_list:
|
||||
# do not account for the ego vehicle
|
||||
if target_vehicle.id == self._vehicle.id:
|
||||
continue
|
||||
|
||||
# if the object is not in our lane it's not an obstacle
|
||||
target_vehicle_waypoint = self._map.get_waypoint(target_vehicle.get_location())
|
||||
if target_vehicle_waypoint.road_id != ego_vehicle_waypoint.road_id or \
|
||||
target_vehicle_waypoint.lane_id != ego_vehicle_waypoint.lane_id:
|
||||
continue
|
||||
|
||||
loc = target_vehicle.get_location()
|
||||
if is_within_distance_ahead(loc, ego_vehicle_location,
|
||||
self._vehicle.get_transform().rotation.yaw,
|
||||
self._proximity_threshold):
|
||||
return (True, target_vehicle)
|
||||
|
||||
return (False, None)
|
||||
|
||||
|
||||
def emergency_stop(self):
|
||||
"""
|
||||
Send an emergency stop command to the vehicle
|
||||
:return:
|
||||
"""
|
||||
control = carla.VehicleControl()
|
||||
control.steer = 0.0
|
||||
control.throttle = 0.0
|
||||
control.brake = 1.0
|
||||
control.hand_brake = False
|
||||
|
||||
return control
|
|
@ -0,0 +1,120 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2018 Intel Labs.
|
||||
# authors: German Ros (german.ros@intel.com)
|
||||
#
|
||||
# This work is licensed under the terms of the MIT license.
|
||||
# For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
""" This module implements an agent that roams around a track following random
|
||||
waypoints and avoiding other vehicles.
|
||||
The agent also responds to traffic lights. """
|
||||
|
||||
import carla
|
||||
from agents.navigation.agent import *
|
||||
from agents.navigation.local_planner import LocalPlanner
|
||||
from agents.navigation.local_planner import compute_connection, RoadOption
|
||||
|
||||
class BasicAgent(Agent):
|
||||
"""
|
||||
BasicAgent implements a basic agent that navigates scenes to reach a given
|
||||
target destination. This agent respects traffic lights and other vehicles.
|
||||
"""
|
||||
|
||||
def __init__(self, vehicle):
|
||||
"""
|
||||
|
||||
:param vehicle: actor to apply to local planner logic onto
|
||||
"""
|
||||
super(BasicAgent, self).__init__(vehicle)
|
||||
|
||||
self._proximity_threshold = 10.0 # meters
|
||||
self._state = AgentState.NAVIGATING
|
||||
self._local_planner = LocalPlanner(self._vehicle)
|
||||
|
||||
# setting up global router
|
||||
self._current_plan = None
|
||||
|
||||
def set_destination(self, location):
|
||||
start_waypoint = self._map.get_waypoint(self._vehicle.get_location())
|
||||
end_waypoint = self._map.get_waypoint(carla.Location(location[0],
|
||||
location[1],
|
||||
location[2]))
|
||||
|
||||
current_waypoint = start_waypoint
|
||||
active_list = [ [(current_waypoint, RoadOption.LANEFOLLOW)] ]
|
||||
|
||||
solution = []
|
||||
while not solution:
|
||||
for _ in range(len(active_list)):
|
||||
trajectory = active_list.pop()
|
||||
if len(trajectory) > 1000:
|
||||
continue
|
||||
|
||||
# expand this trajectory
|
||||
current_waypoint, _ = trajectory[-1]
|
||||
next_waypoints = current_waypoint.next(5.0)
|
||||
while len(next_waypoints) == 1:
|
||||
next_option = compute_connection(current_waypoint, next_waypoints[0])
|
||||
current_distance = next_waypoints[0].transform.location.distance(end_waypoint.transform.location)
|
||||
if current_distance < 5.0:
|
||||
solution = trajectory + [(end_waypoint, RoadOption.LANEFOLLOW)]
|
||||
break
|
||||
|
||||
# keep adding nodes
|
||||
trajectory.append((next_waypoints[0], next_option))
|
||||
current_waypoint, _ = trajectory[-1]
|
||||
next_waypoints = current_waypoint.next(5.0)
|
||||
|
||||
if not solution:
|
||||
# multiple choices
|
||||
for waypoint in next_waypoints:
|
||||
next_option = compute_connection(current_waypoint, waypoint)
|
||||
active_list.append(trajectory + [(waypoint, next_option)])
|
||||
|
||||
assert solution
|
||||
|
||||
self._current_plan = solution
|
||||
self._local_planner.set_global_plan(self._current_plan)
|
||||
|
||||
def run_step(self, debug=False):
|
||||
"""
|
||||
Execute one step of navigation.
|
||||
:return: carla.VehicleControl
|
||||
"""
|
||||
|
||||
# is there an obstacle in front of us?
|
||||
hazard_detected = False
|
||||
|
||||
# retrieve relevant elements for safe navigation, i.e.: traffic lights
|
||||
# and other vehicles
|
||||
actor_list = self._world.get_actors()
|
||||
vehicle_list = actor_list.filter("*vehicle*")
|
||||
lights_list = actor_list.filter("*traffic_light*")
|
||||
|
||||
# check possible obstacles
|
||||
vehicle_state, vehicle = self._is_vehicle_hazard(vehicle_list)
|
||||
if vehicle_state:
|
||||
if debug:
|
||||
print('!!! VEHICLE BLOCKING AHEAD [{}])'.format(vehicle.id))
|
||||
|
||||
self._state = AgentState.BLOCKED_BY_VEHICLE
|
||||
hazard_detected = True
|
||||
|
||||
# check for the state of the traffic lights
|
||||
light_state, traffic_light = self._is_light_red(lights_list)
|
||||
if light_state:
|
||||
if debug:
|
||||
print('=== RED LIGHT AHEAD [{}])'.format(traffic_light.id))
|
||||
|
||||
self._state = AgentState.BLOCKED_RED_LIGHT
|
||||
hazard_detected = True
|
||||
|
||||
if hazard_detected:
|
||||
control = self.emergency_stop()
|
||||
else:
|
||||
self._state = AgentState.NAVIGATING
|
||||
# standard local planner behavior
|
||||
control = self._local_planner.run_step()
|
||||
|
||||
return control
|
|
@ -12,7 +12,9 @@ from enum import Enum
|
|||
from collections import deque
|
||||
import random
|
||||
|
||||
import carla
|
||||
from agents.navigation.controller import VehiclePIDController
|
||||
from agents.navigation.global_route_planner import NavEnum
|
||||
from agents.tools.misc import distance_vehicle, draw_waypoints
|
||||
|
||||
class RoadOption(Enum):
|
||||
|
@ -68,6 +70,7 @@ class LocalPlanner(object):
|
|||
self._next_waypoints = None
|
||||
self._target_waypoint = None
|
||||
self._vehicle_controller = None
|
||||
self._global_plan = None
|
||||
# queue with tuples of (waypoint, RoadOption)
|
||||
self._waypoints_queue = deque(maxlen=200)
|
||||
|
||||
|
@ -120,16 +123,15 @@ class LocalPlanner(object):
|
|||
args_lateral=args_lateral_dict,
|
||||
args_longitudinal=args_longitudinal_dict)
|
||||
|
||||
# compute initial waypoints
|
||||
self._waypoints_queue.append(
|
||||
(self._current_waypoint.next(
|
||||
self._sampling_radius)[0],
|
||||
RoadOption.LANEFOLLOW))
|
||||
self._target_road_option = RoadOption.LANEFOLLOW
|
||||
self._global_plan = False
|
||||
|
||||
# compute initial waypoints
|
||||
self._waypoints_queue.append( (self._current_waypoint.next(self._sampling_radius)[0], RoadOption.LANEFOLLOW))
|
||||
self._target_road_option = RoadOption.LANEFOLLOW
|
||||
# fill waypoint trajectory queue
|
||||
self._compute_next_waypoints(k=200)
|
||||
|
||||
|
||||
def set_speed(self, speed):
|
||||
"""
|
||||
Request new target speed.
|
||||
|
@ -147,8 +149,7 @@ class LocalPlanner(object):
|
|||
:return:
|
||||
"""
|
||||
# check we do not overflow the queue
|
||||
available_entries = self._waypoints_queue.maxlen - \
|
||||
len(self._waypoints_queue)
|
||||
available_entries = self._waypoints_queue.maxlen - len(self._waypoints_queue)
|
||||
k = min(available_entries, k)
|
||||
|
||||
for _ in range(k):
|
||||
|
@ -169,6 +170,14 @@ class LocalPlanner(object):
|
|||
|
||||
self._waypoints_queue.append((next_waypoint, road_option))
|
||||
|
||||
|
||||
def set_global_plan(self, current_plan):
|
||||
self._waypoints_queue.clear()
|
||||
for elem in current_plan:
|
||||
self._waypoints_queue.append(elem)
|
||||
self._target_road_option = RoadOption.LANEFOLLOW
|
||||
self._global_plan = True
|
||||
|
||||
def run_step(self, debug=True):
|
||||
"""
|
||||
Execute one step of local planning which involves running the longitudinal and lateral PID controllers to
|
||||
|
@ -180,7 +189,18 @@ class LocalPlanner(object):
|
|||
|
||||
# not enough waypoints in the horizon? => add more!
|
||||
if len(self._waypoints_queue) < int(self._waypoints_queue.maxlen * 0.5):
|
||||
self._compute_next_waypoints(k=100)
|
||||
if not self._global_plan:
|
||||
self._compute_next_waypoints(k=100)
|
||||
|
||||
if len(self._waypoints_queue) == 0:
|
||||
control = carla.VehicleControl()
|
||||
control.steer = 0.0
|
||||
control.throttle = 0.0
|
||||
control.brake = 0.0
|
||||
control.hand_brake = False
|
||||
control.manual_gear_shift = False
|
||||
|
||||
return control
|
||||
|
||||
# current vehicle waypoint
|
||||
self._current_waypoint = self._map.get_waypoint(self._vehicle.get_location())
|
||||
|
|
|
@ -12,23 +12,15 @@ The agent also responds to traffic lights. """
|
|||
from enum import Enum
|
||||
|
||||
import carla
|
||||
from agents.navigation.agent import *
|
||||
from agents.navigation.local_planner import LocalPlanner
|
||||
from agents.tools.misc import is_within_distance_ahead, compute_magnitude_angle
|
||||
|
||||
|
||||
|
||||
class AgentState(Enum):
|
||||
class RoamingAgent(Agent):
|
||||
"""
|
||||
AGENT_STATE represents the possible states of a roaming agent
|
||||
"""
|
||||
NAVIGATING = 1
|
||||
BLOCKED_BY_VEHICLE = 2
|
||||
BLOCKED_RED_LIGHT = 3
|
||||
RoamingAgent implements a basic agent that navigates scenes making random
|
||||
choices when facing an intersection.
|
||||
|
||||
|
||||
class RoamingAgent(object):
|
||||
"""
|
||||
RoamingAgent implements a basic agent that navigates scenes making random choices when facing an intersection.
|
||||
This agent respects traffic lights and other vehicles.
|
||||
"""
|
||||
|
||||
|
@ -37,9 +29,7 @@ class RoamingAgent(object):
|
|||
|
||||
:param vehicle: actor to apply to local planner logic onto
|
||||
"""
|
||||
self._vehicle = vehicle
|
||||
self._world = self._vehicle.get_world()
|
||||
self._map = self._vehicle.get_world().get_map()
|
||||
super(RoamingAgent, self).__init__(vehicle)
|
||||
self._proximity_threshold = 10.0 # meters
|
||||
self._state = AgentState.NAVIGATING
|
||||
self._local_planner = LocalPlanner(self._vehicle)
|
||||
|
@ -47,7 +37,7 @@ class RoamingAgent(object):
|
|||
def run_step(self, debug=False):
|
||||
"""
|
||||
Execute one step of navigation.
|
||||
:return:
|
||||
:return: carla.VehicleControl
|
||||
"""
|
||||
|
||||
# is there an obstacle in front of us?
|
||||
|
@ -85,131 +75,3 @@ class RoamingAgent(object):
|
|||
control = self._local_planner.run_step()
|
||||
|
||||
return control
|
||||
|
||||
def _is_light_red(self, lights_list):
|
||||
"""
|
||||
Method to check if there is a red light affecting us. This version of the method is compatible
|
||||
with both European and US style traffic lights.
|
||||
|
||||
:param lights_list: list containing TrafficLight objects
|
||||
:return: a tuple given by (bool_flag, traffic_light), where
|
||||
- bool_flag is True if there is a traffic light in RED affecting us and False otherwise
|
||||
- traffic_light is the object itself or None if there is no red traffic light affecting us
|
||||
"""
|
||||
if self._world.map_name == 'Town01' or self._world.map_name == 'Town02':
|
||||
return self._is_light_red_europe_style(lights_list)
|
||||
else:
|
||||
return self._is_light_red_us_style(lights_list)
|
||||
|
||||
def _is_light_red_europe_style(self, lights_list):
|
||||
"""
|
||||
This method is specialized to check European style traffic lights.
|
||||
|
||||
:param lights_list: list containing TrafficLight objects
|
||||
:return: a tuple given by (bool_flag, traffic_light), where
|
||||
- bool_flag is True if there is a traffic light in RED affecting us and False otherwise
|
||||
- traffic_light is the object itself or None if there is no red traffic light affecting us
|
||||
"""
|
||||
ego_vehicle_location = self._vehicle.get_location()
|
||||
ego_vehicle_waypoint = self._map.get_waypoint(ego_vehicle_location)
|
||||
|
||||
for traffic_light in lights_list:
|
||||
object_waypoint = self._map.get_waypoint(traffic_light.get_location())
|
||||
if object_waypoint.road_id != ego_vehicle_waypoint.road_id or object_waypoint.lane_id != ego_vehicle_waypoint.lane_id:
|
||||
continue
|
||||
|
||||
loc = traffic_light.get_location()
|
||||
if is_within_distance_ahead(loc, ego_vehicle_location, self._vehicle.get_transform().rotation.yaw,
|
||||
self._proximity_threshold):
|
||||
if traffic_light.state == carla.libcarla.TrafficLightState.Red:
|
||||
return (True, traffic_light)
|
||||
|
||||
return (False, None)
|
||||
|
||||
def _is_light_red_us_style(self, lights_list, debug=False):
|
||||
"""
|
||||
This method is specialized to check US style traffic lights.
|
||||
|
||||
:param lights_list: list containing TrafficLight objects
|
||||
:return: a tuple given by (bool_flag, traffic_light), where
|
||||
- bool_flag is True if there is a traffic light in RED affecting us and False otherwise
|
||||
- traffic_light is the object itself or None if there is no red traffic light affecting us
|
||||
"""
|
||||
ego_vehicle_location = self._vehicle.get_location()
|
||||
ego_vehicle_waypoint = self._map.get_waypoint(ego_vehicle_location)
|
||||
|
||||
if ego_vehicle_waypoint.is_intersection:
|
||||
# It is too late. Do not block the intersection! Keep going!
|
||||
return (False, None)
|
||||
|
||||
if self._local_planner._target_waypoint is not None:
|
||||
if self._local_planner._target_waypoint.is_intersection:
|
||||
potential_lights = []
|
||||
min_angle = 180.0
|
||||
sel_magnitude = 0.0
|
||||
sel_traffic_light = None
|
||||
for traffic_light in lights_list:
|
||||
loc = traffic_light.get_location()
|
||||
magnitude, angle = compute_magnitude_angle(loc, ego_vehicle_location, self._vehicle.get_transform().rotation.yaw)
|
||||
if magnitude < 80.0 and angle < min(25.0, min_angle):
|
||||
sel_magnitude = magnitude
|
||||
sel_traffic_light = traffic_light
|
||||
min_angle = angle
|
||||
|
||||
if sel_traffic_light is not None:
|
||||
if debug:
|
||||
print('=== Magnitude = {} | Angle = {} | ID = {}'.format(sel_magnitude, min_angle, sel_traffic_light.id))
|
||||
if sel_traffic_light.state == carla.libcarla.TrafficLightState.Red:
|
||||
return (True, sel_traffic_light)
|
||||
|
||||
return (False, None)
|
||||
|
||||
def _is_vehicle_hazard(self, vehicle_list):
|
||||
"""
|
||||
Check if a given vehicle is an obstacle in our way. To this end we take into account the road and lane
|
||||
the target vehicle is on and run a geometry test to check if the target vehicle is under a certain distance
|
||||
in front of our ego vehicle.
|
||||
|
||||
WARNING: This method is an approximation that could fail for very large vehicles, which center is actually
|
||||
on a different lane but their extension falls within the ego vehicle lane.
|
||||
|
||||
:param vehicle_list: list of potential obstacle to check
|
||||
:return: a tuple given by (bool_flag, vehicle), where
|
||||
- bool_flag is True if there is a vehicle ahead blocking us and False otherwise
|
||||
- vehicle is the blocker object itself
|
||||
"""
|
||||
|
||||
ego_vehicle_location = self._vehicle.get_location()
|
||||
ego_vehicle_waypoint = self._map.get_waypoint(ego_vehicle_location)
|
||||
|
||||
for target_vehicle in vehicle_list:
|
||||
# do not account for the ego vehicle
|
||||
if target_vehicle.id == self._vehicle.id:
|
||||
continue
|
||||
|
||||
# if the object is not in our lane it's not an obstacle
|
||||
target_vehicle_waypoint = self._map.get_waypoint(target_vehicle.get_location())
|
||||
if target_vehicle_waypoint.road_id != ego_vehicle_waypoint.road_id or \
|
||||
target_vehicle_waypoint.lane_id != ego_vehicle_waypoint.lane_id:
|
||||
continue
|
||||
|
||||
loc = target_vehicle.get_location()
|
||||
if is_within_distance_ahead(loc, ego_vehicle_location, self._vehicle.get_transform().rotation.yaw,
|
||||
self._proximity_threshold):
|
||||
return (True, target_vehicle)
|
||||
|
||||
return (False, None)
|
||||
|
||||
|
||||
def emergency_stop(self):
|
||||
"""
|
||||
Send an emergency stop command to the vehicle
|
||||
:return:
|
||||
"""
|
||||
control = carla.VehicleControl()
|
||||
control.steer = 0.0
|
||||
control.throttle = 0.0
|
||||
control.brake = 1.0
|
||||
control.hand_brake = False
|
||||
|
||||
return control
|
|
@ -76,6 +76,8 @@ except IndexError:
|
|||
import carla
|
||||
from carla import ColorConverter as cc
|
||||
from agents.navigation.roaming_agent import *
|
||||
from agents.navigation.basic_agent import *
|
||||
|
||||
|
||||
|
||||
# ==============================================================================
|
||||
|
@ -614,7 +616,14 @@ def game_loop(args):
|
|||
world = World(client.get_world(), hud)
|
||||
controller = KeyboardControl(world, False)
|
||||
|
||||
agent = RoamingAgent(world.vehicle)
|
||||
if args.agent == "Roaming":
|
||||
agent = RoamingAgent(world.vehicle)
|
||||
else:
|
||||
agent = BasicAgent(world.vehicle)
|
||||
spawn_point = world.world.get_map().get_spawn_points()[0]
|
||||
agent.set_destination((spawn_point.location.x,
|
||||
spawn_point.location.y,
|
||||
spawn_point.location.z))
|
||||
|
||||
clock = pygame.time.Clock()
|
||||
while True:
|
||||
|
@ -667,6 +676,11 @@ def main():
|
|||
metavar='WIDTHxHEIGHT',
|
||||
default='1280x720',
|
||||
help='window resolution (default: 1280x720)')
|
||||
|
||||
argparser.add_argument("-a", "--agent", type=str,
|
||||
choices=["Roaming", "Basic"],
|
||||
help="select which agent to run",
|
||||
default="Basic")
|
||||
args = argparser.parse_args()
|
||||
|
||||
args.width, args.height = [int(x) for x in args.res.split('x')]
|
||||
|
|
Loading…
Reference in New Issue