Merge pull request #90 from JulianDev24/main

Update Blocks Environment with UE 5.4 Environment
CodexLabsLLC · Jul 7, 2024 · 6d22acd · 6d22acd
2 parents 3bbfe9b + 07342b1
commit 6d22acd
Show file tree

Hide file tree

Showing 318 changed files with 322 additions and 297 deletions.
diff --git a/.gitignore b/.gitignore
@@ -278,7 +278,7 @@ ModelManifest.xml
 /AirLib/cmake_install.cmake
 /MavLinkCom/lib/libMavLinkCom.a
 /Unreal/Plugins/AirSim/Source/AirLib/
-/Unreal/Environments/Blocks/Plugins/AirSim/
+/Unreal/Environments/BlocksV2/Plugins/AirSim/
 /enc_temp_folder
 /cmake/MavLinkCom/MavLinkTest/MavLinkTest
 /cmake/MavLinkCom/lib/libMavLinkCom.a
@@ -398,7 +398,7 @@ build_docs/
 PythonClient/docs/_build
 
 # Docker
-/docker/Blocks/
+/docker/BlocksV2/
 
 # clangd generated folder, for e.g. from VSCode clangd extension
 .cache/
diff --git a/AirLib/include/api/RpcLibAdaptorsBase.hpp b/AirLib/include/api/RpcLibAdaptorsBase.hpp
@@ -43,7 +43,7 @@ namespace airlib_rpclib
         struct Vector2r
         {
             msr::airlib::real_T x_val = 0, y_val = 0;
-            MSGPACK_DEFINE_MAP(x_val, y_val);
+            MSGPACK_DEFINE_ARRAY(x_val, y_val);
 
             Vector2r()
             {
@@ -63,7 +63,7 @@ namespace airlib_rpclib
         struct Vector3r
         {
             msr::airlib::real_T x_val = 0, y_val = 0, z_val = 0;
-            MSGPACK_DEFINE_MAP(x_val, y_val, z_val);
+            MSGPACK_DEFINE_ARRAY(x_val, y_val, z_val);
 
             Vector3r()
             {
@@ -92,7 +92,7 @@ namespace airlib_rpclib
             std::string object_name;
             int object_id = -1;
 
-            MSGPACK_DEFINE_MAP(has_collided, penetration_depth, time_stamp, normal, impact_point, position, object_name, object_id);
+            MSGPACK_DEFINE_ARRAY(has_collided, penetration_depth, time_stamp, normal, impact_point, position, object_name, object_id);
 
             CollisionInfo()
             {
@@ -119,7 +119,7 @@ namespace airlib_rpclib
         struct Quaternionr
         {
             msr::airlib::real_T w_val = 1, x_val = 0, y_val = 0, z_val = 0;
-            MSGPACK_DEFINE_MAP(w_val, x_val, y_val, z_val);
+            MSGPACK_DEFINE_ARRAY(w_val, x_val, y_val, z_val);
 
             Quaternionr()
             {
@@ -142,7 +142,7 @@ namespace airlib_rpclib
         {
             Vector3r position;
             Quaternionr orientation;
-            MSGPACK_DEFINE_MAP(position, orientation);
+            MSGPACK_DEFINE_ARRAY(position, orientation);
 
             Pose()
             {
@@ -162,7 +162,7 @@ namespace airlib_rpclib
         {
             double latitude = 0, longitude = 0;
             float altitude = 0;
-            MSGPACK_DEFINE_MAP(latitude, longitude, altitude);
+            MSGPACK_DEFINE_ARRAY(latitude, longitude, altitude);
 
             GeoPoint()
             {
@@ -190,7 +190,7 @@ namespace airlib_rpclib
             bool is_initialized = false; //is RC connected?
             bool is_valid = false; //must be true for data to be valid
 
-            MSGPACK_DEFINE_MAP(timestamp, pitch, roll, throttle, yaw, left_z, right_z, switches, vendor_id, is_initialized, is_valid);
+            MSGPACK_DEFINE_ARRAY(timestamp, pitch, roll, throttle, yaw, left_z, right_z, switches, vendor_id, is_initialized, is_valid);
 
             RCData()
             {
@@ -233,7 +233,7 @@ namespace airlib_rpclib
         {
             float matrix[4][4];
 
-            MSGPACK_DEFINE_MAP(matrix);
+            MSGPACK_DEFINE_ARRAY(matrix);
 
             ProjectionMatrix()
             {
@@ -261,7 +261,7 @@ namespace airlib_rpclib
             Vector2r min;
             Vector2r max;
 
-            MSGPACK_DEFINE_MAP(min, max);
+            MSGPACK_DEFINE_ARRAY(min, max);
 
             Box2D()
             {
@@ -288,7 +288,7 @@ namespace airlib_rpclib
             Vector3r min;
             Vector3r max;
 
-            MSGPACK_DEFINE_MAP(min, max);
+            MSGPACK_DEFINE_ARRAY(min, max);
 
             Box3D()
             {
@@ -318,7 +318,7 @@ namespace airlib_rpclib
             Box3D box3D;
             Pose relative_pose;
 
-            MSGPACK_DEFINE_MAP(name, geo_point, box2D, box3D, relative_pose);
+            MSGPACK_DEFINE_ARRAY(name, geo_point, box2D, box3D, relative_pose);
 
             DetectionInfo()
             {
@@ -371,7 +371,7 @@ namespace airlib_rpclib
             float fov;
             ProjectionMatrix proj_mat;
 
-            MSGPACK_DEFINE_MAP(pose, fov, proj_mat);
+            MSGPACK_DEFINE_ARRAY(pose, fov, proj_mat);
 
             CameraInfo()
             {
@@ -406,7 +406,7 @@ namespace airlib_rpclib
             Vector3r linear_acceleration;
             Vector3r angular_acceleration;
 
-            MSGPACK_DEFINE_MAP(position, orientation, linear_velocity, angular_velocity, linear_acceleration, angular_acceleration);
+            MSGPACK_DEFINE_ARRAY(position, orientation, linear_velocity, angular_velocity, linear_acceleration, angular_acceleration);
 
             KinematicsState()
             {
@@ -447,7 +447,7 @@ namespace airlib_rpclib
             float temperature;
             float air_density;
 
-            MSGPACK_DEFINE_MAP(position, geo_point, gravity, air_pressure, temperature, air_density);
+            MSGPACK_DEFINE_ARRAY(position, geo_point, gravity, air_pressure, temperature, air_density);
 
             EnvironmentState()
             {
@@ -484,7 +484,7 @@ namespace airlib_rpclib
             bool pixels_as_float;
             bool compress;
 
-            MSGPACK_DEFINE_MAP(camera_name, image_type, pixels_as_float, compress);
+            MSGPACK_DEFINE_ARRAY(camera_name, image_type, pixels_as_float, compress);
 
             ImageRequest()
             {
@@ -538,7 +538,7 @@ namespace airlib_rpclib
             int width, height;
             msr::airlib::ImageCaptureBase::ImageType image_type;
 
-            MSGPACK_DEFINE_MAP(image_data_uint8, image_data_float, camera_position, camera_name,
+            MSGPACK_DEFINE_ARRAY(image_data_uint8, image_data_float, camera_position, camera_name,
                                camera_orientation, time_stamp, message, pixels_as_float, compress, width, height, image_type);
 
             ImageResponse()
@@ -615,7 +615,7 @@ namespace airlib_rpclib
             Pose pose;
             std::vector<int> segmentation;
 
-            MSGPACK_DEFINE_MAP(time_stamp, point_cloud, pose, segmentation);
+            MSGPACK_DEFINE_ARRAY(time_stamp, point_cloud, pose, segmentation);
 
             LidarData()
             {
@@ -649,7 +649,7 @@ namespace airlib_rpclib
             Vector3r angular_velocity;
             Vector3r linear_acceleration;
 
-            MSGPACK_DEFINE_MAP(time_stamp, orientation, angular_velocity, linear_acceleration);
+            MSGPACK_DEFINE_ARRAY(time_stamp, orientation, angular_velocity, linear_acceleration);
 
             ImuData()
             {
@@ -683,7 +683,7 @@ namespace airlib_rpclib
             msr::airlib::real_T pressure;
             msr::airlib::real_T qnh;
 
-            MSGPACK_DEFINE_MAP(time_stamp, altitude, pressure, qnh);
+            MSGPACK_DEFINE_ARRAY(time_stamp, altitude, pressure, qnh);
 
             BarometerData()
             {
@@ -716,7 +716,7 @@ namespace airlib_rpclib
             Vector3r magnetic_field_body;
             std::vector<float> magnetic_field_covariance; // not implemented in MagnetometerBase.hpp
 
-            MSGPACK_DEFINE_MAP(time_stamp, magnetic_field_body, magnetic_field_covariance);
+            MSGPACK_DEFINE_ARRAY(time_stamp, magnetic_field_body, magnetic_field_covariance);
 
             MagnetometerData()
             {
@@ -749,7 +749,7 @@ namespace airlib_rpclib
             msr::airlib::GpsBase::GnssFixType fix_type;
             uint64_t time_utc = 0;
 
-            MSGPACK_DEFINE_MAP(geo_point, eph, epv, velocity, fix_type, time_utc);
+            MSGPACK_DEFINE_ARRAY(geo_point, eph, epv, velocity, fix_type, time_utc);
 
             GnssReport()
             {
@@ -786,7 +786,7 @@ namespace airlib_rpclib
             GnssReport gnss;
             bool is_valid = false;
 
-            MSGPACK_DEFINE_MAP(time_stamp, gnss, is_valid);
+            MSGPACK_DEFINE_ARRAY(time_stamp, gnss, is_valid);
 
             GpsData()
             {
@@ -819,7 +819,7 @@ namespace airlib_rpclib
             msr::airlib::real_T max_distance; //m
             Pose relative_pose;
 
-            MSGPACK_DEFINE_MAP(time_stamp, distance, min_distance, max_distance, relative_pose);
+            MSGPACK_DEFINE_ARRAY(time_stamp, distance, min_distance, max_distance, relative_pose);
 
             DistanceSensorData()
             {
@@ -857,7 +857,7 @@ namespace airlib_rpclib
             std::vector<uint32_t> indices;
             std::string name;
 
-            MSGPACK_DEFINE_MAP(position, orientation, vertices, indices, name);
+            MSGPACK_DEFINE_ARRAY(position, orientation, vertices, indices, name);
 
             MeshPositionVertexBuffersResponse()
             {

diff --git a/AirLib/include/vehicles/car/api/CarRpcLibAdaptors.hpp b/AirLib/include/vehicles/car/api/CarRpcLibAdaptors.hpp
@@ -32,7 +32,7 @@ namespace airlib_rpclib
             int manual_gear = 0;
             bool gear_immediate = true;
 
-            MSGPACK_DEFINE_MAP(throttle, steering, brake, handbrake, is_manual_gear, manual_gear, gear_immediate);
+            MSGPACK_DEFINE_ARRAY(throttle, steering, brake, handbrake, is_manual_gear, manual_gear, gear_immediate);
 
             CarControls()
             {
@@ -64,7 +64,7 @@ namespace airlib_rpclib
             KinematicsState kinematics_estimated;
             uint64_t timestamp;
 
-            MSGPACK_DEFINE_MAP(speed, gear, rpm, maxrpm, handbrake, kinematics_estimated, timestamp);
+            MSGPACK_DEFINE_ARRAY(speed, gear, rpm, maxrpm, handbrake, kinematics_estimated, timestamp);
 
             CarState()
             {

diff --git a/AirLib/include/vehicles/multirotor/api/MultirotorRpcLibAdaptors.hpp b/AirLib/include/vehicles/multirotor/api/MultirotorRpcLibAdaptors.hpp
@@ -28,7 +28,7 @@ namespace airlib_rpclib
         {
             bool is_rate = true;
             float yaw_or_rate = 0;
-            MSGPACK_DEFINE_MAP(is_rate, yaw_or_rate);
+            MSGPACK_DEFINE_ARRAY(is_rate, yaw_or_rate);
 
             YawMode()
             {
@@ -51,7 +51,7 @@ namespace airlib_rpclib
             msr::airlib::real_T torque_scaler;
             msr::airlib::real_T speed;
 
-            MSGPACK_DEFINE_MAP(thrust, torque_scaler, speed);
+            MSGPACK_DEFINE_ARRAY(thrust, torque_scaler, speed);
 
             RotorParameters()
             {
@@ -75,7 +75,7 @@ namespace airlib_rpclib
             std::vector<RotorParameters> rotors;
             uint64_t timestamp;
 
-            MSGPACK_DEFINE_MAP(rotors, timestamp);
+            MSGPACK_DEFINE_ARRAY(rotors, timestamp);
 
             RotorStates()
             {
@@ -113,7 +113,7 @@ namespace airlib_rpclib
             std::vector<std::string> controller_messages;
             bool can_arm;
 
-            MSGPACK_DEFINE_MAP(collision, kinematics_estimated, gps_location, timestamp, landed_state, rc_data);
+            MSGPACK_DEFINE_ARRAY(collision, kinematics_estimated, gps_location, timestamp, landed_state, rc_data);
 
             MultirotorState()
             {

diff --git a/SGM/src/sgmstereo/sgmstereo.vcxproj b/SGM/src/sgmstereo/sgmstereo.vcxproj
@@ -38,10 +38,14 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A01E543F-EF34-46BB-8F3F-29AB84E7A5D4}</ProjectGuid>
     <RootNamespace>Features</RootNamespace>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccProvider>
+    </SccProvider>
     <ProjectName>sgmstereo</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Unreal/Environments/Blocks/Blocks.uproject b/Unreal/Environments/Blocks/Blocks.uproject
diff --git a/Unreal/Environments/Blocks/Config/DefaultEditor.ini b/Unreal/Environments/Blocks/Config/DefaultEditor.ini
diff --git a/Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini b/Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini