Skip to content

Commit 6d22acd

Browse files
xxEoD2242xxEoD2242
authored
Merge pull request #90 from JulianDev24/main
Update Blocks Environment with UE 5.4 Environment
2 parents 3bbfe9b + 07342b1 commit 6d22acd

File tree

318 files changed

+322
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+322
-297
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ ModelManifest.xml
278278
/AirLib/cmake_install.cmake
279279
/MavLinkCom/lib/libMavLinkCom.a
280280
/Unreal/Plugins/AirSim/Source/AirLib/
281-
/Unreal/Environments/Blocks/Plugins/AirSim/
281+
/Unreal/Environments/BlocksV2/Plugins/AirSim/
282282
/enc_temp_folder
283283
/cmake/MavLinkCom/MavLinkTest/MavLinkTest
284284
/cmake/MavLinkCom/lib/libMavLinkCom.a
@@ -398,7 +398,7 @@ build_docs/
398398
PythonClient/docs/_build
399399

400400
# Docker
401-
/docker/Blocks/
401+
/docker/BlocksV2/
402402

403403
# clangd generated folder, for e.g. from VSCode clangd extension
404404
.cache/

‎AirLib/include/api/RpcLibAdaptorsBase.hpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace airlib_rpclib
4343
struct Vector2r
4444
{
4545
msr::airlib::real_T x_val = 0, y_val = 0;
46-
MSGPACK_DEFINE_MAP(x_val, y_val);
46+
MSGPACK_DEFINE_ARRAY(x_val, y_val);
4747

4848
Vector2r()
4949
{
@@ -63,7 +63,7 @@ namespace airlib_rpclib
6363
struct Vector3r
6464
{
6565
msr::airlib::real_T x_val = 0, y_val = 0, z_val = 0;
66-
MSGPACK_DEFINE_MAP(x_val, y_val, z_val);
66+
MSGPACK_DEFINE_ARRAY(x_val, y_val, z_val);
6767

6868
Vector3r()
6969
{
@@ -92,7 +92,7 @@ namespace airlib_rpclib
9292
std::string object_name;
9393
int object_id = -1;
9494

95-
MSGPACK_DEFINE_MAP(has_collided, penetration_depth, time_stamp, normal, impact_point, position, object_name, object_id);
95+
MSGPACK_DEFINE_ARRAY(has_collided, penetration_depth, time_stamp, normal, impact_point, position, object_name, object_id);
9696

9797
CollisionInfo()
9898
{
@@ -119,7 +119,7 @@ namespace airlib_rpclib
119119
struct Quaternionr
120120
{
121121
msr::airlib::real_T w_val = 1, x_val = 0, y_val = 0, z_val = 0;
122-
MSGPACK_DEFINE_MAP(w_val, x_val, y_val, z_val);
122+
MSGPACK_DEFINE_ARRAY(w_val, x_val, y_val, z_val);
123123

124124
Quaternionr()
125125
{
@@ -142,7 +142,7 @@ namespace airlib_rpclib
142142
{
143143
Vector3r position;
144144
Quaternionr orientation;
145-
MSGPACK_DEFINE_MAP(position, orientation);
145+
MSGPACK_DEFINE_ARRAY(position, orientation);
146146

147147
Pose()
148148
{
@@ -162,7 +162,7 @@ namespace airlib_rpclib
162162
{
163163
double latitude = 0, longitude = 0;
164164
float altitude = 0;
165-
MSGPACK_DEFINE_MAP(latitude, longitude, altitude);
165+
MSGPACK_DEFINE_ARRAY(latitude, longitude, altitude);
166166

167167
GeoPoint()
168168
{
@@ -190,7 +190,7 @@ namespace airlib_rpclib
190190
bool is_initialized = false; //is RC connected?
191191
bool is_valid = false; //must be true for data to be valid
192192

193-
MSGPACK_DEFINE_MAP(timestamp, pitch, roll, throttle, yaw, left_z, right_z, switches, vendor_id, is_initialized, is_valid);
193+
MSGPACK_DEFINE_ARRAY(timestamp, pitch, roll, throttle, yaw, left_z, right_z, switches, vendor_id, is_initialized, is_valid);
194194

195195
RCData()
196196
{
@@ -233,7 +233,7 @@ namespace airlib_rpclib
233233
{
234234
float matrix[4][4];
235235

236-
MSGPACK_DEFINE_MAP(matrix);
236+
MSGPACK_DEFINE_ARRAY(matrix);
237237

238238
ProjectionMatrix()
239239
{
@@ -261,7 +261,7 @@ namespace airlib_rpclib
261261
Vector2r min;
262262
Vector2r max;
263263

264-
MSGPACK_DEFINE_MAP(min, max);
264+
MSGPACK_DEFINE_ARRAY(min, max);
265265

266266
Box2D()
267267
{
@@ -288,7 +288,7 @@ namespace airlib_rpclib
288288
Vector3r min;
289289
Vector3r max;
290290

291-
MSGPACK_DEFINE_MAP(min, max);
291+
MSGPACK_DEFINE_ARRAY(min, max);
292292

293293
Box3D()
294294
{
@@ -318,7 +318,7 @@ namespace airlib_rpclib
318318
Box3D box3D;
319319
Pose relative_pose;
320320

321-
MSGPACK_DEFINE_MAP(name, geo_point, box2D, box3D, relative_pose);
321+
MSGPACK_DEFINE_ARRAY(name, geo_point, box2D, box3D, relative_pose);
322322

323323
DetectionInfo()
324324
{
@@ -371,7 +371,7 @@ namespace airlib_rpclib
371371
float fov;
372372
ProjectionMatrix proj_mat;
373373

374-
MSGPACK_DEFINE_MAP(pose, fov, proj_mat);
374+
MSGPACK_DEFINE_ARRAY(pose, fov, proj_mat);
375375

376376
CameraInfo()
377377
{
@@ -406,7 +406,7 @@ namespace airlib_rpclib
406406
Vector3r linear_acceleration;
407407
Vector3r angular_acceleration;
408408

409-
MSGPACK_DEFINE_MAP(position, orientation, linear_velocity, angular_velocity, linear_acceleration, angular_acceleration);
409+
MSGPACK_DEFINE_ARRAY(position, orientation, linear_velocity, angular_velocity, linear_acceleration, angular_acceleration);
410410

411411
KinematicsState()
412412
{
@@ -447,7 +447,7 @@ namespace airlib_rpclib
447447
float temperature;
448448
float air_density;
449449

450-
MSGPACK_DEFINE_MAP(position, geo_point, gravity, air_pressure, temperature, air_density);
450+
MSGPACK_DEFINE_ARRAY(position, geo_point, gravity, air_pressure, temperature, air_density);
451451

452452
EnvironmentState()
453453
{
@@ -484,7 +484,7 @@ namespace airlib_rpclib
484484
bool pixels_as_float;
485485
bool compress;
486486

487-
MSGPACK_DEFINE_MAP(camera_name, image_type, pixels_as_float, compress);
487+
MSGPACK_DEFINE_ARRAY(camera_name, image_type, pixels_as_float, compress);
488488

489489
ImageRequest()
490490
{
@@ -538,7 +538,7 @@ namespace airlib_rpclib
538538
int width, height;
539539
msr::airlib::ImageCaptureBase::ImageType image_type;
540540

541-
MSGPACK_DEFINE_MAP(image_data_uint8, image_data_float, camera_position, camera_name,
541+
MSGPACK_DEFINE_ARRAY(image_data_uint8, image_data_float, camera_position, camera_name,
542542
camera_orientation, time_stamp, message, pixels_as_float, compress, width, height, image_type);
543543

544544
ImageResponse()
@@ -615,7 +615,7 @@ namespace airlib_rpclib
615615
Pose pose;
616616
std::vector<int> segmentation;
617617

618-
MSGPACK_DEFINE_MAP(time_stamp, point_cloud, pose, segmentation);
618+
MSGPACK_DEFINE_ARRAY(time_stamp, point_cloud, pose, segmentation);
619619

620620
LidarData()
621621
{
@@ -649,7 +649,7 @@ namespace airlib_rpclib
649649
Vector3r angular_velocity;
650650
Vector3r linear_acceleration;
651651

652-
MSGPACK_DEFINE_MAP(time_stamp, orientation, angular_velocity, linear_acceleration);
652+
MSGPACK_DEFINE_ARRAY(time_stamp, orientation, angular_velocity, linear_acceleration);
653653

654654
ImuData()
655655
{
@@ -683,7 +683,7 @@ namespace airlib_rpclib
683683
msr::airlib::real_T pressure;
684684
msr::airlib::real_T qnh;
685685

686-
MSGPACK_DEFINE_MAP(time_stamp, altitude, pressure, qnh);
686+
MSGPACK_DEFINE_ARRAY(time_stamp, altitude, pressure, qnh);
687687

688688
BarometerData()
689689
{
@@ -716,7 +716,7 @@ namespace airlib_rpclib
716716
Vector3r magnetic_field_body;
717717
std::vector<float> magnetic_field_covariance; // not implemented in MagnetometerBase.hpp
718718

719-
MSGPACK_DEFINE_MAP(time_stamp, magnetic_field_body, magnetic_field_covariance);
719+
MSGPACK_DEFINE_ARRAY(time_stamp, magnetic_field_body, magnetic_field_covariance);
720720

721721
MagnetometerData()
722722
{
@@ -749,7 +749,7 @@ namespace airlib_rpclib
749749
msr::airlib::GpsBase::GnssFixType fix_type;
750750
uint64_t time_utc = 0;
751751

752-
MSGPACK_DEFINE_MAP(geo_point, eph, epv, velocity, fix_type, time_utc);
752+
MSGPACK_DEFINE_ARRAY(geo_point, eph, epv, velocity, fix_type, time_utc);
753753

754754
GnssReport()
755755
{
@@ -786,7 +786,7 @@ namespace airlib_rpclib
786786
GnssReport gnss;
787787
bool is_valid = false;
788788

789-
MSGPACK_DEFINE_MAP(time_stamp, gnss, is_valid);
789+
MSGPACK_DEFINE_ARRAY(time_stamp, gnss, is_valid);
790790

791791
GpsData()
792792
{
@@ -819,7 +819,7 @@ namespace airlib_rpclib
819819
msr::airlib::real_T max_distance; //m
820820
Pose relative_pose;
821821

822-
MSGPACK_DEFINE_MAP(time_stamp, distance, min_distance, max_distance, relative_pose);
822+
MSGPACK_DEFINE_ARRAY(time_stamp, distance, min_distance, max_distance, relative_pose);
823823

824824
DistanceSensorData()
825825
{
@@ -857,7 +857,7 @@ namespace airlib_rpclib
857857
std::vector<uint32_t> indices;
858858
std::string name;
859859

860-
MSGPACK_DEFINE_MAP(position, orientation, vertices, indices, name);
860+
MSGPACK_DEFINE_ARRAY(position, orientation, vertices, indices, name);
861861

862862
MeshPositionVertexBuffersResponse()
863863
{

‎AirLib/include/vehicles/car/api/CarRpcLibAdaptors.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace airlib_rpclib
3232
int manual_gear = 0;
3333
bool gear_immediate = true;
3434

35-
MSGPACK_DEFINE_MAP(throttle, steering, brake, handbrake, is_manual_gear, manual_gear, gear_immediate);
35+
MSGPACK_DEFINE_ARRAY(throttle, steering, brake, handbrake, is_manual_gear, manual_gear, gear_immediate);
3636

3737
CarControls()
3838
{
@@ -64,7 +64,7 @@ namespace airlib_rpclib
6464
KinematicsState kinematics_estimated;
6565
uint64_t timestamp;
6666

67-
MSGPACK_DEFINE_MAP(speed, gear, rpm, maxrpm, handbrake, kinematics_estimated, timestamp);
67+
MSGPACK_DEFINE_ARRAY(speed, gear, rpm, maxrpm, handbrake, kinematics_estimated, timestamp);
6868

6969
CarState()
7070
{

‎AirLib/include/vehicles/multirotor/api/MultirotorRpcLibAdaptors.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace airlib_rpclib
2828
{
2929
bool is_rate = true;
3030
float yaw_or_rate = 0;
31-
MSGPACK_DEFINE_MAP(is_rate, yaw_or_rate);
31+
MSGPACK_DEFINE_ARRAY(is_rate, yaw_or_rate);
3232

3333
YawMode()
3434
{
@@ -51,7 +51,7 @@ namespace airlib_rpclib
5151
msr::airlib::real_T torque_scaler;
5252
msr::airlib::real_T speed;
5353

54-
MSGPACK_DEFINE_MAP(thrust, torque_scaler, speed);
54+
MSGPACK_DEFINE_ARRAY(thrust, torque_scaler, speed);
5555

5656
RotorParameters()
5757
{
@@ -75,7 +75,7 @@ namespace airlib_rpclib
7575
std::vector<RotorParameters> rotors;
7676
uint64_t timestamp;
7777

78-
MSGPACK_DEFINE_MAP(rotors, timestamp);
78+
MSGPACK_DEFINE_ARRAY(rotors, timestamp);
7979

8080
RotorStates()
8181
{
@@ -113,7 +113,7 @@ namespace airlib_rpclib
113113
std::vector<std::string> controller_messages;
114114
bool can_arm;
115115

116-
MSGPACK_DEFINE_MAP(collision, kinematics_estimated, gps_location, timestamp, landed_state, rc_data);
116+
MSGPACK_DEFINE_ARRAY(collision, kinematics_estimated, gps_location, timestamp, landed_state, rc_data);
117117

118118
MultirotorState()
119119
{

‎SGM/src/sgmstereo/sgmstereo.vcxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,14 @@
3838
<PropertyGroup Label="Globals">
3939
<ProjectGuid>{A01E543F-EF34-46BB-8F3F-29AB84E7A5D4}</ProjectGuid>
4040
<RootNamespace>Features</RootNamespace>
41-
<SccProjectName>SAK</SccProjectName>
42-
<SccAuxPath>SAK</SccAuxPath>
43-
<SccLocalPath>SAK</SccLocalPath>
44-
<SccProvider>SAK</SccProvider>
41+
<SccProjectName>
42+
</SccProjectName>
43+
<SccAuxPath>
44+
</SccAuxPath>
45+
<SccLocalPath>
46+
</SccLocalPath>
47+
<SccProvider>
48+
</SccProvider>
4549
<ProjectName>sgmstereo</ProjectName>
4650
</PropertyGroup>
4751
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎Unreal/Environments/Blocks/Blocks.uproject‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Unreal/Environments/Blocks/Config/DefaultEditor.ini‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)