diff --git a/Docs/3rd_party_integrations.md b/Docs/3rd_party_integrations.md index 3cc66f839..87e5133e8 100644 --- a/Docs/3rd_party_integrations.md +++ b/Docs/3rd_party_integrations.md @@ -8,7 +8,7 @@ CARLA has been developed to integrate with several 3rd party applications in ord - [__Scenic__](tuto_G_scenic.md) - [__CarSIM__](tuto_G_carsim_integration.md) - [__Chrono__](tuto_G_chrono.md) -- [__OpenDRIVE__](adv_opendrive.md) +- [__ASAM OpenDRIVE__](adv_opendrive.md) - [__PTV Vissim__](adv_ptv.md) - [__RSS__](adv_rss.md) - [__AWS and RLlib__](tuto_G_rllib_integration.md) @@ -59,9 +59,9 @@ CARLA's integration with CarSim allows vehicle controls in CARLA to be forwarded Learn how to use CARLA alongside CarSIM [here](tuto_G_carsim_integration.md). -## OpenDRIVE +## ASAM OpenDRIVE -[__OpenDRIVE__](https://www.asam.net/standards/detail/opendrive/) is an open format specification used to describe the logic of a road network intended to standardise the discription of road networks in digital format and allow different applications to exchange data on road networks. Please refer to the full documentation [__here__](adv_opendrive.md) +[__ASAM OpenDRIVE__](https://www.asam.net/standards/detail/opendrive/) is an open format specification used to describe the logic of a road network intended to standardise the discription of road networks in digital format and allow different applications to exchange data on road networks. Please refer to the full documentation [__here__](adv_opendrive.md) ## RSS - Responsibility Sensitive Safety diff --git a/Docs/adv_opendrive.md b/Docs/adv_opendrive.md index eda1d1ef6..7e3575c9c 100644 --- a/Docs/adv_opendrive.md +++ b/Docs/adv_opendrive.md @@ -1,6 +1,6 @@ -# OpenDRIVE standalone mode +# ASAM OpenDRIVE standalone mode -This feature allows users to ingest any OpenDRIVE file as a CARLA map out-of-the-box. In order to do so, the simulator will automatically generate a road mesh for actors to navigate through. +This feature allows users to ingest any ASAM OpenDRIVE file as a CARLA map out-of-the-box. In order to do so, the simulator will automatically generate a road mesh for actors to navigate through. * [__Overview__](#overview) * [__Run a standalone map__](#run-a-standalone-map) @@ -26,9 +26,9 @@ Traffic lights, stops and yields will be generated on the fly. Pedestrians will --- ## Run a standalone map -Open an OpenDRIVE file is just a matter of calling [`client.generate_opendrive_world()`](python_api.md#carla.Client.generate_opendrive_world) through the API. This will generate the new map, and block the simulation until it is ready. The method needs for two parameters. +Open an ASAM OpenDRIVE file is just a matter of calling [`client.generate_opendrive_world()`](python_api.md#carla.Client.generate_opendrive_world) through the API. This will generate the new map, and block the simulation until it is ready. The method needs for two parameters. -* __`opendrive`__ is the content of the OpenDRIVE file parsed as a string. +* __`opendrive`__ is the content of the ASAM OpenDRIVE file parsed as a string. * __`parameters`__ is a [carla.OpendriveGenerationParameters](python_api.md#carla.OpendriveGenerationParameters) containing settings for the generation of the mesh. __This argument is optional__. * __`vertex_distance`__ *(default 2.0 meters)* — Distance between the vertices of the mesh. The bigger, the distance, the more inaccurate the mesh will be. However, if the distance is too small, the resulting mesh will be too heavy to work with. diff --git a/Docs/core_concepts.md b/Docs/core_concepts.md index 047588653..895647273 100644 --- a/Docs/core_concepts.md +++ b/Docs/core_concepts.md @@ -37,7 +37,7 @@ __Blueprints__ are already-made actor layouts necessary to spawn an actor. Basic ### 3rd- Maps and navigation -__The map__ is the object representing the simulated world, the town mostly. There are eight maps available. All of them use OpenDRIVE 1.4 standard to describe the roads. +__The map__ is the object representing the simulated world, the town mostly. There are eight maps available. All of them use ASAM OpenDRIVE 1.4 standard to describe the roads. __Roads, lanes and junctions__ are managed by the [Python API](python_api.md) to be accessed from the client. These are used along with the __waypoint__ class to provide vehicles with a navigation path. diff --git a/Docs/python_api.md b/Docs/python_api.md index 31d387b71..617d8518e 100644 --- a/Docs/python_api.md +++ b/Docs/python_api.md @@ -475,7 +475,7 @@ Executes a list of commands on a single simulation step, blocks until the comman - **generate_opendrive_world**(**self**, **opendrive**, **parameters**=(2.0, 50.0, 1.0, 0.6, true, true), **reset_settings**=True) Loads a new world with a basic 3D topology generated from the content of an OpenDRIVE file. This content is passed as a `string` parameter. It is similar to `client.load_world(map_name)` but allows for custom OpenDRIVE maps in server side. Cars can drive around the map, but there are no graphics besides the road and sidewalks. - **Parameters:** - - `opendrive` (_str_) - Content of an OpenDRIVE file as `string`, __not the path to the `.xodr`__. + - `opendrive` (_str_) - Content of an ASAM OpenDRIVE file as `string`, __not the path to the `.xodr`__. - `parameters` (_[carla.OpendriveGenerationParameters](#carla.OpendriveGenerationParameters)_) - Additional settings for the mesh generation. If none are provided, default values will be used. - `reset_settings` (_bool_) - Option to reset the episode setting to default values, set to false to keep the current settings. This is useful to keep sync mode when changing map and to keep deterministic scenarios. - **load_world**(**self**, **map_name**, **reset_settings**=True, **map_layers**=[carla.MapLayer.All](#carla.MapLayer.All)) @@ -1706,7 +1706,7 @@ Distance between `actor` and `other`. --- ## carla.OpendriveGenerationParameters -This class defines the parameters used when generating a world using an OpenDRIVE file. +This class defines the parameters used when generating a world using an ASAM OpenDRIVE file. ### Instance Variables - **vertex_distance** (_float_) @@ -2202,6 +2202,12 @@ Sensors compound a specific family of actors quite diverse and unique. They are When True the sensor will be waiting for data. ### Methods +- **disable_for_ros**(**self**) +Commands the sensor to not be processed for publishing in ROS2 if there is no any listen to it. +- **enable_for_ros**(**self**) +Commands the sensor to be processed to be able to publish in ROS2 without any listen to it. +- **is_enabled_for_ros**(**self**) +Returns if the sensor is enabled or not to publish in ROS2 if there is no any listen to it. - **is_listening**(**self**) Returns whether the sensor is in a listening state. - **is_listening_gbuffer**(**self**, **gbuffer_id**) @@ -4188,33 +4194,29 @@ document.getElementById("snipets-container").innerHTML = null; } -