p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing some vehicle names

This commit is contained in:
bernat 2021-07-28 09:11:53 +02:00
parent 2ce9897ce9
commit cb1c38a8d4
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/tuto_G_scenic.md
View File

@ -66,7 +66,7 @@ The scenario involves two vehicles, the leading vehicle and the ego vehicle. We
```scenic ```scenic
## CONSTANTS ## CONSTANTS
EGO_MODEL = "vehicle.lincoln.mkz2017" EGO_MODEL = "vehicle.lincoln.mkz_2017"
EGO_SPEED = 10 EGO_SPEED = 10
EGO_BRAKING_THRESHOLD = 12 EGO_BRAKING_THRESHOLD = 12

2
PythonAPI/examples/lidar_to_camera.py
View File

@ -76,7 +76,7 @@ def tutorial(args):
try: try:
# Search the desired blueprints # Search the desired blueprints
vehicle_bp = bp_lib.filter("vehicle.lincoln.mkz2017")[0] vehicle_bp = bp_lib.filter("vehicle.lincoln.mkz_2017")[0]
camera_bp = bp_lib.filter("sensor.camera.rgb")[0] camera_bp = bp_lib.filter("sensor.camera.rgb")[0]
lidar_bp = bp_lib.filter("sensor.lidar.ray_cast")[0] lidar_bp = bp_lib.filter("sensor.lidar.ray_cast")[0]

4
PythonAPI/examples/rss/scenarios/unstructured_blocked_road.xosc
View File

@ -12,7 +12,7 @@
</RoadNetwork> </RoadNetwork>
<Entities> <Entities>
<ScenarioObject name="hero"> <ScenarioObject name="hero">
<Vehicle name="vehicle.lincoln.mkz2017" vehicleCategory="car"> <Vehicle name="vehicle.lincoln.mkz_2017" vehicleCategory="car">
<ParameterDeclarations/> <ParameterDeclarations/>
<Performance maxSpeed="69.444" maxAcceleration="10.0" maxDeceleration="10.0"/> <Performance maxSpeed="69.444" maxAcceleration="10.0" maxDeceleration="10.0"/>
<BoundingBox> <BoundingBox>
@ -30,7 +30,7 @@
</Vehicle> </Vehicle>
</ScenarioObject> </ScenarioObject>
<ScenarioObject name="blockingVehicle"> <ScenarioObject name="blockingVehicle">
<Vehicle name="vehicle.lincoln.mkz2017" vehicleCategory="car"> <Vehicle name="vehicle.lincoln.mkz_2017" vehicleCategory="car">
<ParameterDeclarations/> <ParameterDeclarations/>
<Performance maxSpeed="69.444" maxAcceleration="10.0" maxDeceleration="10.0"/> <Performance maxSpeed="69.444" maxAcceleration="10.0" maxDeceleration="10.0"/>
<BoundingBox> <BoundingBox>

2
PythonAPI/examples/rss/scenarios/unstructured_pedestrian_on_road.xosc
View File

@ -9,7 +9,7 @@
</RoadNetwork> </RoadNetwork>
<Entities> <Entities>
<ScenarioObject name="hero"> <ScenarioObject name="hero">
<Vehicle name="vehicle.lincoln.mkz2017" vehicleCategory="car"> <Vehicle name="vehicle.lincoln.mkz_2017" vehicleCategory="car">
<ParameterDeclarations/> <ParameterDeclarations/>
<Performance maxSpeed="69.444" maxAcceleration="200" maxDeceleration="10.0"/> <Performance maxSpeed="69.444" maxAcceleration="200" maxDeceleration="10.0"/>
<BoundingBox> <BoundingBox>

3
PythonAPI/util/check_lidar_bb.py
View File

@ -316,7 +316,7 @@ def main():
sensor_queue = Queue() sensor_queue = Queue()
# Spawning ego vehicle # Spawning ego vehicle
actor_BP = world.get_blueprint_library().filter("vehicle.lincoln.mkz2017")[0] actor_BP = world.get_blueprint_library().filter("vehicle.lincoln.mkz_2017")[0]
car_tr = carla.Transform(carla.Location(x=239, y=125, z=0.9), carla.Rotation(yaw=-88.5)) car_tr = carla.Transform(carla.Location(x=239, y=125, z=0.9), carla.Rotation(yaw=-88.5))
actor = world.spawn_actor(actor_BP, car_tr) actor = world.spawn_actor(actor_BP, car_tr)
@ -368,4 +368,3 @@ if __name__ == "__main__":
main() main()
except KeyboardInterrupt: except KeyboardInterrupt:
print(' - Exited by user.') print(' - Exited by user.')