Compare commits

..

73 Commits

Author SHA1 Message Date
Daraan d9e10a9456
Merge 5ab4425403 into 2a2cc5f1be 2024-10-14 15:30:29 +02:00
Daraan 5ab4425403
Merge branch 'dev' into doc-fixes 2024-10-14 15:30:26 +02:00
MattRoweEAIF 2a2cc5f1be
added unreal coord system, fixed v2x (#8251) 2024-10-07 15:27:01 +02:00
Daraan 0a095b948d
Merge branch 'dev' into doc-fixes 2024-10-05 16:39:25 +02:00
MattRoweEAIF f7ed6c25e9
fix typo in title (#8225) 2024-09-30 13:45:22 +02:00
Blyron 4feeb77b2b Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-09-25 08:26:25 +02:00
Daniel dad5f5dc7b Added and fixed Client.apply_batch signature 2024-09-23 19:34:28 +02:00
Daniel 944d0e225e Better clarification of WorldSnapshot
- removed deprecated frame_count from example
- also exposed WorldSnapshot.elapsed_seconds
2024-09-23 19:34:28 +02:00
Daniel cdb2664350 Added inverse_transform and fixes for Transform
inverse_transform from #7999
highlighted in-place character
2024-09-23 19:34:28 +02:00
Daniel e9d9a1cd36 corrected World.spaw_actor wrong parameter name 2024-09-23 19:34:28 +02:00
Daniel 9bb1e52581 Missing default value 2024-09-23 19:34:28 +02:00
Daniel dee22b138d Added OpendriveGenerationParameters.__init__ 2024-09-23 19:34:28 +02:00
Daniel a74476e9eb Added space between # and first heading in python_api.md 2024-09-23 19:34:28 +02:00
Daniel fd8d6122dd Apply changes to .md output 2024-09-23 19:34:28 +02:00
Daniel fa0b470a78 Removed reintroduced code of overwritten property 2024-09-23 19:34:28 +02:00
Daniel b5b1168892 Fix Spelling mistakes 2024-09-23 19:34:28 +02:00
Daniel db2697108a Fixed wrong `literal` in doc generation 2024-09-23 19:34:28 +02:00
Ylmdrin 92a6e71c6b
Correcting makefile typo to avoid override warning for target "downloadplugins" (#8167)
The downloadplugins target is already defined below (line 162).
2024-09-20 10:53:29 +02:00
Sergio Paniego Blanco c7339367b9
Fixed typo in CityScapes palette (#8137) 2024-09-13 21:07:25 +02:00
Jorge Virgos 4d09f0a660 Porting the changes done to UE5 to fix the recording leak to UE4
The slowdown is considerably more noticeable here since the engine runs much smoother. This makes evident that this is a stopgap measure, and should be looked into further down the line.
2024-09-12 14:26:28 +02:00
AreopagX 9e94feb3a5 navigation information is now loaded when changing maps 2024-09-11 22:01:15 +02:00
Blyron 00df447670 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-09-02 10:50:07 +02:00
MattRoweEAIF c097d7acf1
added digital twins video (#8090) 2024-08-29 14:58:48 +02:00
Daniel 334740ae53 Fixed Vector arithmetic 2024-08-28 12:58:24 +02:00
Daniel 7633334063 Corrections and additions
more setters
missing, wrong types corrected
spelling
2024-08-28 12:58:24 +02:00
Daniel 2b465bcd66 Improved Callable and callbacks signature 2024-08-28 12:58:24 +02:00
Daniel aec0b261af Added Transform.inverse_transform and corrected signature
parameter is called in_point not in_vector
2024-08-28 12:58:24 +02:00
Daniel 58e0374f4f Corrected [try_]spawn_actor keyword name 2024-08-28 12:58:24 +02:00
Daniel 26dc386724 Improved get_waypoints and Literal type hints 2024-08-28 12:58:24 +02:00
Daniel 798c9e144c Added setters for VehicleControl 2024-08-28 12:58:24 +02:00
Daniel 77856f467c Various fixes
- wrong signatures
- wrong names
2024-08-28 12:58:24 +02:00
Daniel ca81e35d59 Added self parameter to property signatures 2024-08-28 12:58:24 +02:00
Daniel da80757e27 Fixes for wrong stubs
- OpendriveGenerationParameter had no init
- missing @property
- wrong signatures
2024-08-28 12:58:24 +02:00
Daniel 453ceca112 Fix: Enum values were tuples. Added Flag or Int to Enums 2024-08-28 12:58:24 +02:00
Daniel a959577ccf Better usage of Enum if typing.Self is availiable
Using Self will not report an override / incompatible error.
2024-08-28 12:58:24 +02:00
Daniel b061f9e951 Fix spelling mistakes 2024-08-28 12:58:24 +02:00
Daniel f797e1593a Improved get_waypoint disambiguation
correctly added two overload function
2024-08-28 12:58:24 +02:00
Daniel 41e595c056 Corrected and more precise type-hints
- fixed carla.Waypoint.next_until_lane_end
2024-08-28 12:58:24 +02:00
Daniel d9c217ee3c Added stubs for HUD drawing
Functions from #7168
2024-08-28 12:58:24 +02:00
Daniel a089c3b800 Formatted some docstring to be shorter 2024-08-28 12:58:24 +02:00
Daniel 19b892f76b Fix missing @property 2024-08-28 12:58:24 +02:00
Daniel 8df99c0414 Fix intendation shadowing methods 2024-08-28 12:58:24 +02:00
Daniel 2935897950 Added type hints for `values` attribute on enums 2024-08-28 12:58:24 +02:00
Daniel ddb5834e38 Corrected Sensor.is_listening
Was changed to a function in 0.9.15. More info see: https://github.com/carla-simulator/carla/pull/7439
2024-08-28 12:58:24 +02:00
Daniel e765559384 Added undocumented variables
FutureActor
laod_world_if_different
2024-08-28 12:58:24 +02:00
Daniel df1eb25721 Disambiguated get_waypoint signature
Syntax fix (squased)
2024-08-28 12:58:24 +02:00
Daniel caac503fdb Fixed CityObjectLabels 2024-08-28 12:58:24 +02:00
Daniel 4c086ad7d9 ActorList.filter actually returns ActorList 2024-08-28 12:58:24 +02:00
Daniel 1d4450b026 Filled in missing information and types. 2024-08-28 12:58:24 +02:00
Daniel 0197e0ae5b FIX: added ApplyTransform, fixed ApplyTorque 2024-08-28 12:58:24 +02:00
Daniel de33210abd FIX: __init__ methods do not return 2024-08-28 12:58:24 +02:00
Daniel a0cff71434 Added missing return value to reload_world 2024-08-28 12:58:24 +02:00
Daniel 232cb8c250 Added missing -> World to load_world 2024-08-28 12:58:24 +02:00
Daniel 755c0d827d Removed wrong unit indication 2024-08-28 12:58:24 +02:00
Daniel 4c1104dc47 Fixed spelling misstakes 2024-08-28 12:58:24 +02:00
Daniel f275e47f4e Added missing type for Labelled Point 2024-08-28 12:58:24 +02:00
Daniel 7b2c1db39b Added DSVEventArray iterator 2024-08-28 12:58:24 +02:00
Daniel 251b293d61 Updated changelog
needs merge with dev version
2024-08-28 12:58:24 +02:00
Daniel bc6e7cd5ea Fixed missing return types 2024-08-28 12:58:24 +02:00
Daraan be8735fc28 Fixed Actor.parent
Can be None or an Actor
2024-08-28 12:58:24 +02:00
Daniel 951fcc4cc9 Fixes and missing Iterators 2024-08-28 12:58:24 +02:00
Minokori fd44ea0ca1 Add a `*.pyi` file for auto-completion & hints.
To enable auto-completion and hints in code editors such as VScode, create a `*.pyi` file. This feature is compatible with `python 3.9` and later versions.
2024-08-28 12:58:24 +02:00
Blyron e83b79be74 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-07-31 11:47:56 +02:00
Blyron 32f97eae66 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-07-19 09:33:24 +02:00
Blyron c83c045ada Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-07-10 10:01:02 +02:00
Blyron 7c47e7db37 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-07-08 08:36:42 +02:00
Blyron 17963902e5 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-05-30 14:58:53 +02:00
Blyron 5043ad73fc Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-05-28 11:49:41 +02:00
Blyron b86b1997fc Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-05-21 11:38:39 +02:00
Blyron 2a507990d3 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-05-15 08:55:48 +02:00
Blyron d854ab5f89 Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-05-14 12:40:04 +02:00
Blyron 649e2aa56b Merge branch 'dev' of https://github.com/carla-simulator/carla into dev 2024-05-13 16:07:17 +02:00
Blyron 5be0e2fd17 Fix OSM2ODR build 2024-05-06 16:29:17 +02:00
22 changed files with 5851 additions and 74 deletions

View File

@ -1,4 +1,5 @@
## Latest Changes
* Fixed a bug that caused navigation information not to be loaded when switching maps
* Prevent from segfault on failing SignalReference identification when loading OpenDrive files
* Added vehicle doors to the recorder
* Added functions to get actor' components transform
@ -18,6 +19,7 @@
* PythonAPI `Sensor.is_listening` was defined twice (property and method), cleaned and clarified it as a method.
* Added V2X sensors for cooperative awareness message and custom user-defined messages to support vehicle-to-vehicle communication
* Added named tuples for BasicAgent.py's detection result to allow for type-hints and better semantics.
* Added type-hint support for the PythonAPI
## CARLA 0.9.15

View File

@ -15,6 +15,8 @@
The __Digital Twin Tool__ enables procedural generation of unique 3D environments based on road networks derived from the [OpenStreetMap](https://www.openstreetmap.org) (OSM) service. Through the Digital Twin Tool interface in CARLA's Unreal Engine editor a user can select a region of map from OSM and download the road network as the basis for a new CARLA map. The tool then fills the spaces between the roads with procedurally generated 3D buildings that adjust to the layout of the road, creating a realistic 3D road environment with high variability.
<iframe width="100%" height="400px" src="https://www.youtube.com/embed/gTutXdS2UkQ?si=hssM3YRCAjSIzdXM" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
## Building the OSM renderer
If you are using Linux, you have the option of using the OSM renderer in the CARLA interface to navigate a large OSM map region that you have downloaded. You first need to build the OSM renderer before proceeding to build CARLA. Run `make osmrenderer` inside the CARLA root directory. You may need to upgrade your version of CMake to v3.2 or above in order for this to work. This will create two folders in your build directory called `libosmcout-source` and `libosmcout-build`. Before proceeding to build CARLA, you need to then edit the `Build.sh` file in the directory `$CARLA_ROOT/Build/libosmcout-source/maps` like so, to ensure the executable is found:

BIN
Docs/img/unreal_lhcs.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -505,15 +505,16 @@ Client constructor.
- `host` (_str_) - IP address where a CARLA Simulator instance is running. Default is localhost (127.0.0.1).
- `port` (_int_) - TCP port where the CARLA Simulator instance is running. Default are 2000 and the subsequent 2001.
- `worker_threads` (_int_) - Number of working threads used for background updates. If 0, use all available concurrency.
- <a name="carla.Client.apply_batch"></a>**<font color="#7fb800">apply_batch</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**commands**</font>)
- <a name="carla.Client.apply_batch"></a>**<font color="#7fb800">apply_batch</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**commands**</font>, <font color="#00a6ed">**do_tick**=False</font>)
Executes a list of commands on a single simulation step and retrieves no information. If you need information about the response of each command, use the __<font color="#7fb800">apply_batch_sync()</font>__ method. [Here](https://github.com/carla-simulator/carla/blob/master/PythonAPI/examples/generate_traffic.py) is an example on how to delete the actors that appear in [carla.ActorList](#carla.ActorList) all at once.
- **Parameters:**
- `commands` (_list_) - A list of commands to execute in batch. Each command is different and has its own parameters. They appear listed at the bottom of this page.
- <a name="carla.Client.apply_batch_sync"></a>**<font color="#7fb800">apply_batch_sync</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**commands**</font>, <font color="#00a6ed">**due_tick_cue**=False</font>)<button class="SnipetButton" id="carla.Client.apply_batch_sync-snipet_button">snippet &rarr;</button>
- `do_tick` (_bool_) - A boolean parameter to specify whether or not to perform a [carla.World.tick](#carla.World.tick) after applying the batch in _synchronous mode_. Defaults to __False__.
- <a name="carla.Client.apply_batch_sync"></a>**<font color="#7fb800">apply_batch_sync</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**commands**</font>, <font color="#00a6ed">**do_tick**=False</font>)<button class="SnipetButton" id="carla.Client.apply_batch_sync-snipet_button">snippet &rarr;</button>
Executes a list of commands on a single simulation step, blocks until the commands are linked, and returns a list of <b>command.Response</b> that can be used to determine whether a single command succeeded or not. [Here](https://github.com/carla-simulator/carla/blob/master/PythonAPI/examples/generate_traffic.py) is an example of it being used to spawn actors.
- **Parameters:**
- `commands` (_list_) - A list of commands to execute in batch. The commands available are listed right above, in the method **<font color="#7fb800">apply_batch()</font>**.
- `due_tick_cue` (_bool_) - A boolean parameter to specify whether or not to perform a [carla.World.tick](#carla.World.tick) after applying the batch in _synchronous mode_. It is __False__ by default.
- `do_tick` (_bool_) - A boolean parameter to specify whether or not to perform a [carla.World.tick](#carla.World.tick) after applying the batch in _synchronous mode_. Defaults to __False__.
- **Return:** _list(command.Response)_
- <a name="carla.Client.generate_opendrive_world"></a>**<font color="#7fb800">generate_opendrive_world</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**opendrive**</font>, <font color="#00a6ed">**parameters**=(2.0, 50.0, 1.0, 0.6, true, true)</font>, <font color="#00a6ed">**reset_settings**=True</font>)
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.
@ -2011,7 +2012,7 @@ Iterate over the [carla.RadarDetection](#carla.RadarDetection) retrieved as data
## carla.Rotation<a name="carla.Rotation"></a>
Class that represents a 3D rotation and therefore, an orientation in space. CARLA uses the Unreal Engine coordinates system. This is a Z-up left-handed system. <br>
<br>The constructor method follows a specific order of declaration: `(pitch, yaw, roll)`, which corresponds to `(Y-rotation,Z-rotation,X-rotation)`. <br> <br>![UE4_Rotation](https://d26ilriwvtzlb.cloudfront.net/8/83/BRMC_9.jpg) *Unreal Engine's coordinates system*.
<br>The constructor method follows a specific order of declaration: `(pitch, yaw, roll)`, which corresponds to `(Y-rotation,Z-rotation,X-rotation)`. <br> <br>![UE4_Rotation](/img/unreal_lhcs.png) *Unreal Engine's coordinates system*.
### Instance Variables
- <a name="carla.Rotation.pitch"></a>**<font color="#f8805a">pitch</font>** (_float<small> - degrees</small>_)
@ -2794,14 +2795,18 @@ Describes a rotation for an object according to Unreal Engine's axis system.
- **Parameters:**
- `location` (_[carla.Location](#carla.Location)_)
- `rotation` (_[carla.Rotation](#carla.Rotation)<small> - degrees (pitch, yaw, roll)</small>_)
- <a name="carla.Transform.inverse_transform"></a>**<font color="#7fb800">inverse_transform</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**in_point**</font>)
Applies the inverse of `transform` by translating a 3D point in place from global to local coordinates using the current transformation as frame of reference.
- **Parameters:**
- `in_point` (_[carla.Vector3D](#carla.Vector3D)_) - Location in the space to which the inverse transformation will be applied.
- <a name="carla.Transform.transform"></a>**<font color="#7fb800">transform</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**in_point**</font>)
Translates a 3D point from local to global coordinates using the current transformation as frame of reference.
Translates a 3D point in place from local to global coordinates using the current transformation as frame of reference.
- **Parameters:**
- `in_point` (_[carla.Location](#carla.Location)_) - Location in the space to which the transformation will be applied.
- <a name="carla.Transform.transform_vector"></a>**<font color="#7fb800">transform_vector</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**in_vector**</font>)
Rotates a vector using the current transformation as frame of reference, without applying translation. Use this to transform, for example, a velocity.
- `in_point` (_[carla.Vector3D](#carla.Vector3D)_) - Location in the space to which the transformation will be applied.
- <a name="carla.Transform.transform_vector"></a>**<font color="#7fb800">transform_vector</font>**(<font color="#00a6ed">**self**</font>, <font color="#00a6ed">**in_point**</font>)
Rotates a vector in place using the current transformation as frame of reference, without applying translation. Use this to transform, for example, a velocity.
- **Parameters:**
- `in_vector` (_[carla.Vector3D](#carla.Vector3D)_) - Vector to which the transformation will be applied.
- `in_point` (_[carla.Vector3D](#carla.Vector3D)_) - Vector to which the transformation will be applied.
##### Getters
- <a name="carla.Transform.get_forward_vector"></a>**<font color="#7fb800">get_forward_vector</font>**(<font color="#00a6ed">**self**</font>)
@ -3930,6 +3935,8 @@ This snapshot comprises all the information for every actor on scene at a certai
A value unique for every snapshot to differentiate them.
- <a name="carla.WorldSnapshot.frame"></a>**<font color="#f8805a">frame</font>** (_int_)
Simulation frame in which the snapshot was taken.
- <a name="carla.WorldSnapshot.elapsed_seconds"></a>**<font color="#f8805a">elapsed_seconds</font>** (_float<small> - seconds</small>_)
Simulated seconds elapsed since the beginning of the current episode.
- <a name="carla.WorldSnapshot.timestamp"></a>**<font color="#f8805a">timestamp</font>** (_[carla.Timestamp](#carla.Timestamp)<small> - seconds</small>_)
Precise moment in time when snapshot was taken. This class works in seconds as given by the operative system.

View File

@ -736,7 +736,7 @@ The following tags are currently available (Note, tags changed from version 0.9.
| `14` | Car | `(0, 0, 142)` | Cars, vans |
| `15` | Truck | `(0, 0, 70)` | Trucks |
| `16` | Bus | `(0, 60, 100)` | Busses |
| `17` | Train | `(0, 60, 100)` | Trains |
| `17` | Train | `(0, 80, 100)` | Trains |
| `18` | Motorcycle | `(0, 0, 230)` | Motorcycle, Motorbike |
| `19` | Bicycle | `(119, 11, 32)` | Bicylces |
| `20` | Static | `(110, 190, 160)` | Elements in the scene and props that are immovable. <br> E.g. fire hydrants, fixed benches, fountains, bus stops, etc. |
@ -940,21 +940,19 @@ While the visibility is simulated within CARLA, the scenario can be configured b
* __Output:__ [carla.CAMData](python_api.md#carla.CAMData), triggered according to the ETSI CAM standard, unless configured otherwise
Triggering conditions according to ETSI standard:
- Heading angle change > $4$°
- Position difference > $4$ m
- Speed change > $5$ m/s
- Heading angle change > 4°
- Position difference > 4 m
- Speed change > 5 m/s
- Time elapsed > CAM Generation time (configurable)
- Low Frequency Container Time Elapsed $> 500$ ms
- Low Frequency Container Time Elapsed > 500 ms
For the CAM V2X sensor, additional blueprint attributes apply:
| Blueprint attribute | Type | Default | Description |
|-------------------------|--------|-------------------------|------------------------------------|
| <td colspan=4> Message generation |
| gen\_cam\_min | float | $0.1$ | Minimum elapsed time between two successive CAMs in seconds (s) |
| gen\_cam\_max | float | $1.0$ | Maximum elapsed time between two successive CAMs in seconds (s) |
| gen\_cam\_min | float | 0.1 | Minimum elapsed time between two successive CAMs in seconds (s) |
| gen\_cam\_max | float | 1.0 | Maximum elapsed time between two successive CAMs in seconds (s) |
| fixed\_rate | bool | false [true] | Generate a CAM in every CARLA tick (only for debug purposes, will result in slowdown) |
| <td colspan=4> Data generation |
| `noise_vel_stddev_x` | float | 0\.0 | Standard deviation parameter in the noise model for velocity (X axis). |
| `noise_accel_stddev_x` | float | 0\.0 | Standard deviation parameter in the noise model for acceleration (X axis). |
| `noise_accel_stddev_y` | float | 0\.0 | Standard deviation parameter in the noise model for acceleration (Y axis). |
@ -993,14 +991,14 @@ Example:
| Blueprint attribute | Type | Default | Description |
|-------------------------|--------|-------------------------|------------------------------------|
| transmit\_power | float | $21.5$ | Sender transmission power in dBm |
| receiver\_sensitivity | float | $-99$ | Receiver sensitivity in dBm |
| frequency\_ghz | float | $5.9$ | Transmission frequency in GHz. 5.9 GHz is standard for several physical channels. |
| noise\_seed | int | $0$ | Random parameter for initialization of noise |
| filter\_distance | float | $500$ | Maximum transmission distance in meter, path loss calculations above are skipped for simulation speed |
| <td colspan=4> __Path loss model parameters__ |
| combined\_antenna\_gain | float | $10.0$ | Combined gain of sender and receiver antennas in dBi, parameter for radiation efficiency and directivity |
| d\_ref | float | $ 1.0 $ | reference distance for Log-distance path loss model in meter |
| transmit\_power | float | 21.5 | Sender transmission power in dBm |
| receiver\_sensitivity | float | -99 | Receiver sensitivity in dBm |
| frequency\_ghz | float | 5.9 | Transmission frequency in GHz. 5.9 GHz is standard for several physical channels. |
| noise\_seed | int | 0 | Random parameter for initialization of noise |
| filter\_distance | float | 500 | Maximum transmission distance in meter, path loss calculations above are skipped for simulation speed |
| __Path loss model parameters__ | | | |
| combined\_antenna\_gain | float | 10.0 | Combined gain of sender and receiver antennas in dBi, parameter for radiation efficiency and directivity |
| d\_ref | float | 1.0 | reference distance for Log-distance path loss model in meter |
| path\_loss\_exponent | float | 2.7 | Loss parameter for non-line of sight due to building obstruction |
| scenario | string | urban | Options: [urban, rural, highway], defines the fading noise parameters |
| path\_loss\_model | string | geometric | general path loss model to be used. Options: [geometric, winner] |

View File

@ -88,6 +88,12 @@ namespace detail {
const auto id = GetCurrentEpisode().GetId();
_client.LoadEpisode(std::move(map_name), reset_settings, map_layers);
// delete the pointer to _episode so that the Navigation information
// will be loaded for the correct map
assert(_episode.use_count() == 1);
_episode.reset();
GetReadyCurrentEpisode();
// We are waiting 50ms for the server to reload the episode.
// If in this time we have not detected a change of episode, we try again
// 'number_of_attempts' times.

View File

@ -15,7 +15,6 @@
#include <boost/asio/connect.hpp>
#include <boost/asio/read.hpp>
#include <boost/asio/write.hpp>
#include <boost/asio/post.hpp>
#include <boost/asio/bind_executor.hpp>
#include <exception>
@ -86,7 +85,6 @@ namespace tcp {
void Client::Connect() {
auto self = shared_from_this();
boost::asio::post(_strand, [this, self]() {
if (_done) {
return;
}
@ -139,18 +137,15 @@ namespace tcp {
log_debug("streaming client: connecting to", ep);
_socket.async_connect(ep, boost::asio::bind_executor(_strand, handle_connect));
});
}
void Client::Stop() {
_connection_timer.cancel();
auto self = shared_from_this();
boost::asio::post(_strand, [this, self]() {
_done = true;
if (_socket.is_open()) {
_socket.close();
}
});
}
void Client::Reconnect() {
@ -165,7 +160,6 @@ namespace tcp {
void Client::ReadData() {
auto self = shared_from_this();
boost::asio::post(_strand, [this, self]() {
if (_done) {
return;
}
@ -182,7 +176,7 @@ namespace tcp {
// Move the buffer to the callback function and start reading the next
// piece of data.
// log_debug("streaming client: success reading data, calling the callback");
boost::asio::post(_strand, [self, message]() { self->_callback(message->pop()); });
self->_callback(message->pop());
ReadData();
} else {
// As usual, if anything fails start over from the very top.
@ -219,7 +213,6 @@ namespace tcp {
_socket,
message->size_as_buffer(),
boost::asio::bind_executor(_strand, handle_read_header));
});
}
} // namespace tcp

View File

@ -79,7 +79,6 @@ namespace tcp {
DEBUG_ASSERT(message != nullptr);
DEBUG_ASSERT(!message->empty());
auto self = shared_from_this();
boost::asio::post(_strand, [=]() {
if (!_socket.is_open()) {
return;
}
@ -111,11 +110,8 @@ namespace tcp {
log_debug("session", _session_id, ": sending message of", message->size(), "bytes");
_deadline.expires_from_now(_timeout);
boost::asio::async_write(
_socket,
message->GetBufferSequence(),
handle_sent);
});
boost::asio::async_write(_socket, message->GetBufferSequence(),
boost::asio::bind_executor(_strand, handle_sent));
}
void ServerSession::Close() {

File diff suppressed because it is too large Load Diff

View File

@ -41,6 +41,11 @@
type: list
doc: >
A list of commands to execute in batch. Each command is different and has its own parameters. They appear listed at the bottom of this page.
- param_name: do_tick
type: bool
default: false
doc: >
A boolean parameter to specify whether or not to perform a carla.World.tick after applying the batch in _synchronous mode_. Defaults to __False__.
doc: >
Executes a list of commands on a single simulation step and retrieves no information. If you need information about the response of each command, use the __<font color="#7fb800">apply_batch_sync()</font>__ method.
[Here](https://github.com/carla-simulator/carla/blob/master/PythonAPI/examples/generate_traffic.py) is an example on how to delete the actors that appear in carla.ActorList all at once.
@ -51,11 +56,11 @@
type: list
doc: >
A list of commands to execute in batch. The commands available are listed right above, in the method **<font color="#7fb800">apply_batch()</font>**.
- param_name: due_tick_cue
- param_name: do_tick
type: bool
default: false
doc: >
A boolean parameter to specify whether or not to perform a carla.World.tick after applying the batch in _synchronous mode_. It is __False__ by default.
A boolean parameter to specify whether or not to perform a carla.World.tick after applying the batch in _synchronous mode_. Defaults to __False__.
return: list(command.Response)
doc: >
Executes a list of commands on a single simulation step, blocks until the commands are linked, and returns a list of <b>command.Response</b> that can be used to determine whether a single command succeeded or not. [Here](https://github.com/carla-simulator/carla/blob/master/PythonAPI/examples/generate_traffic.py) is an example of it being used to spawn actors.

View File

@ -328,7 +328,7 @@
Class that represents a 3D rotation and therefore, an orientation in space. CARLA uses the Unreal Engine coordinates system. This is a Z-up left-handed system. <br>
<br>The constructor method follows a specific order of declaration: `(pitch, yaw, roll)`, which corresponds to `(Y-rotation,Z-rotation,X-rotation)`. <br>
<br>![UE4_Rotation](https://d26ilriwvtzlb.cloudfront.net/8/83/BRMC_9.jpg)
<br>![UE4_Rotation](/img/unreal_lhcs.png)
*Unreal Engine's coordinates system*
# - PROPERTIES -------------------------
instance_variables:
@ -438,20 +438,29 @@
- def_name: transform
params:
- param_name: in_point
type: carla.Location
type: carla.Vector3D
doc: >
Location in the space to which the transformation will be applied.
doc: >
Translates a 3D point from local to global coordinates using the current transformation as frame of reference.
Translates a 3D point in place from local to global coordinates using the current transformation as frame of reference.
# --------------------------------------
- def_name: inverse_transform
params:
- param_name: in_point
type: carla.Vector3D
doc: >
Location in the space to which the inverse transformation will be applied.
doc: >
Applies the inverse of `transform` by translating a 3D point in place from global to local coordinates using the current transformation as frame of reference.
# --------------------------------------
- def_name: transform_vector
params:
- param_name: in_vector
- param_name: in_point
type: carla.Vector3D
doc: >
Vector to which the transformation will be applied.
doc: >
Rotates a vector using the current transformation as frame of reference, without applying translation. Use this to transform, for example, a velocity.
Rotates a vector in place using the current transformation as frame of reference, without applying translation. Use this to transform, for example, a velocity.
# --------------------------------------
- def_name: get_forward_vector
return: carla.Vector3D

View File

@ -17,6 +17,11 @@
type: int
doc: >
Simulation frame in which the snapshot was taken.
- var_name: elapsed_seconds
type: float
var_units: seconds
doc: >
Simulated seconds elapsed since the beginning of the current episode.
- var_name: timestamp
type: carla.Timestamp
var_units: seconds

View File

@ -685,11 +685,11 @@ class HUD(object):
self._show_ackermann_info = False
self._ackermann_control = carla.VehicleAckermannControl()
def on_world_tick(self, timestamp):
def on_world_tick(self, world_snapshot):
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, world, clock):
self._notifications.tick(world, clock)

View File

@ -282,12 +282,12 @@ class HUD(object):
self._info_text = []
self._server_clock = pygame.time.Clock()
def on_world_tick(self, timestamp):
"""Gets informations from the world at every tick"""
def on_world_tick(self, world_snapshot):
"""Gets information from the world at every tick"""
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame_count
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, world, clock):
"""HUD method for every tick"""

View File

@ -685,11 +685,12 @@ class HUD(object):
self._show_ackermann_info = False
self._ackermann_control = carla.VehicleAckermannControl()
def on_world_tick(self, timestamp):
def on_world_tick(self, world_snapshot):
"""Gets information from the world at every tick"""
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, world, clock):
self._notifications.tick(world, clock)

View File

@ -575,11 +575,12 @@ class HUD(object):
self._info_text = []
self._server_clock = pygame.time.Clock()
def on_world_tick(self, timestamp):
def on_world_tick(self, world_snapshot):
"""Gets information from the world at every tick"""
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, world, clock):
self._notifications.tick(world, clock)

View File

@ -594,11 +594,12 @@ class HUD(object):
self._info_text = []
self._server_clock = pygame.time.Clock()
def on_world_tick(self, timestamp):
def on_world_tick(self, world_snapshot):
"""Gets information from the world at every tick"""
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, world, clock):
self._notifications.tick(world, clock)

View File

@ -399,11 +399,12 @@ class HUD(object):
self._info_text = []
self._server_clock = pygame.time.Clock()
def on_world_tick(self, timestamp):
def on_world_tick(self, world_snapshot):
"""Gets information from the world at every tick"""
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, world, clock):
self._notifications.tick(world, clock)

View File

@ -993,7 +993,7 @@ class World(object):
# Register event for receiving server tick
weak_self = weakref.ref(self)
self.world.on_tick(lambda timestamp: World.on_world_tick(weak_self, timestamp))
self.world.on_tick(lambda world_snapshot: World.on_world_tick(weak_self, world_snapshot))
def select_hero_actor(self):
"""Selects only one hero actor if there are more than one. If there are not any, it will spawn one."""
@ -1081,7 +1081,7 @@ class World(object):
self._hud.add_info('HERO', hero_mode_text)
@staticmethod
def on_world_tick(weak_self, timestamp):
def on_world_tick(weak_self, world_snapshot):
"""Updates the server tick"""
self = weak_self()
if not self:
@ -1089,7 +1089,7 @@ class World(object):
self.server_clock.tick()
self.server_fps = self.server_clock.get_fps()
self.simulation_time = timestamp.elapsed_seconds
self.simulation_time = world_snapshot.elapsed_seconds
def _show_nearby_vehicles(self, vehicles):
"""Shows nearby vehicles of the hero actor"""

View File

@ -616,11 +616,12 @@ class HUD(object):
self._server_clock = pygame.time.Clock()
self.rss_state_visualizer = RssStateVisualizer(self.dim, self._font_mono, self._world)
def on_world_tick(self, timestamp):
def on_world_tick(self, world_snapshot):
"""Gets information from the world at every tick"""
self._server_clock.tick()
self.server_fps = self._server_clock.get_fps()
self.frame = timestamp.frame
self.simulation_time = timestamp.elapsed_seconds
self.frame = world_snapshot.frame
self.simulation_time = world_snapshot.elapsed_seconds
def tick(self, player, clock):
self._notifications.tick(clock)

View File

@ -138,7 +138,7 @@ LibCarla.client.rss.release: setup ad-rss
plugins:
@${CARLA_BUILD_TOOLS_FOLDER}/Plugins.sh $(ARGS)
setup downloadplugins:
setup: downloadplugins
@${CARLA_BUILD_TOOLS_FOLDER}/Setup.sh $(ARGS)
ad-rss: