diff --git a/Docs/adv_traffic_manager.md b/Docs/adv_traffic_manager.md index 60ac8e41b..864423377 100644 --- a/Docs/adv_traffic_manager.md +++ b/Docs/adv_traffic_manager.md @@ -318,7 +318,7 @@ The hybrid mode is disabled by default. There are two ways to enable it. The are two parameters ruling the hybrid mode. One is the __radius__ that states the proximity area around any ego vehicle where physics are enabled. The other is the __vehicle__ with , that will act as center of this radius. -* __Radius__ *(default = 70 meters)* — States the proximity area around the ego vehicle where physics are enabled. The value be changed with [traffic_manager.set_hybrid_mode_radius(r)](https://carla.readthedocs.io/en/latest/python_api/#carla.TrafficManager.set_hybrid_mode_radius). +* __Radius__ *(default = 70 meters)* — States the proximity area around the ego vehicle where physics are enabled. The value be changed with [traffic_manager.set_hybrid_physics_radius(r)](python_api.md#carla.TrafficManager.set_hybrid_physics_radius). * __Ego vehicle__ — A vehicle tagged with `role_name='hero'` that will act of the radius. * __If there is none,__ all the vehicles will disable physics. * __If there are many,__ the radius will be considered for all of them. That will create different areas of influence with physics enabled. diff --git a/Docs/python_api.md b/Docs/python_api.md index 2530b8870..bcc630c06 100644 --- a/Docs/python_api.md +++ b/Docs/python_api.md @@ -2117,8 +2117,6 @@ During the collision detection stage, which runs every frame, this method sets a - **Parameters:** - `actor` (_[carla.Actor](#carla.Actor)_) – The vehicle that is going to ignore walkers on scene. - `perc` (_float_) – Between 0 and 100. Amount of times collisions will be ignored. -- **reset_traffic_lights**(**self**) -Resets every traffic light in the map to its initial state. - **vehicle_percentage_speed_difference**(**self**, **actor**, **percentage**) Sets the difference the vehicle's intended speed and its current speed limit. Speed limits can be exceeded by setting the `perc` to a negative value. Default is 30. Exceeding a speed limit can be done using negative percentages. @@ -2136,14 +2134,14 @@ Returns the port where the Traffic Manager is connected. If the object is a TM-C Sets the minimum distance in meters that vehicles have to keep with the rest. The distance is in meters and will affect the minimum moving distance. It is computed from center to center of the vehicle objects. - **Parameters:** - `distance` (_float – meters_) – Meters between vehicles. -- **set_hybrid_mode_radius**(**self**, **r**=70.0) -With hybrid physics on, changes the radius of the area of influence where physics are enabled. - - **Parameters:** - - `r` (_float – meters_) – New radius where physics are enabled. - **set_hybrid_physics_mode**(**self**, **enabled**=False) Enables or disables the hybrid physics mode. In this mode, vehicle's farther than a certain radius from the ego vehicle will have their physics disabled. Computation cost will be reduced by not calculating vehicle dynamics. Vehicles will be teleported. - **Parameters:** - `enabled` (_bool_) – If __True__, enables the hybrid physics. +- **set_hybrid_physics_radius**(**self**, **r**=70.0) +With hybrid physics on, changes the radius of the area of influence where physics are enabled. + - **Parameters:** + - `r` (_float – meters_) – New radius where physics are enabled. - **set_osm_mode**(**self**, **mode_switch**=True) Enables or disables the OSM mode. This mode allows the user to run TM in a map created with the [OSM feature](tuto_G_openstreetmap.md). These maps allow having dead-end streets. Normally, if vehicles cannot find the next waypoint, TM crashes. If OSM mode is enabled, it will show a warning, and destroy vehicles when necessary. - **Parameters:** diff --git a/PythonAPI/docs/client.yml b/PythonAPI/docs/client.yml index b6b296db5..fbeddad43 100644 --- a/PythonAPI/docs/client.yml +++ b/PythonAPI/docs/client.yml @@ -426,10 +426,6 @@ doc: > During the collision detection stage, which runs every frame, this method sets a percent chance that collisions with walkers will be ignored for a vehicle. # -------------------------------------- - - def_name: reset_traffic_lights - doc: > - Resets every traffic light in the map to its initial state. - # -------------------------------------- - def_name: vehicle_percentage_speed_difference params: - param_name: actor @@ -471,7 +467,7 @@ doc: > Enables or disables the hybrid physics mode. In this mode, vehicle's farther than a certain radius from the ego vehicle will have their physics disabled. Computation cost will be reduced by not calculating vehicle dynamics. Vehicles will be teleported. # -------------------------------------- - - def_name: set_hybrid_mode_radius + - def_name: set_hybrid_physics_radius params: - param_name: r type: float