Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Blocks Environment with UE 5.4 Environment #90

Merged
merged 2 commits into from
Jul 7, 2024
Merged

Update Blocks Environment with UE 5.4 Environment #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
829d9bc
Replaced Blocks vs BlocksV2
JulianDev24 Jul 7, 2024
07342b1
Fix name qualification
JulianDev24 Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
48 changes: 24 additions & 24 deletions AirLib/include/api/RpcLibAdaptorsBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand All @@ -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()
{
Expand All @@ -142,7 +142,7 @@ namespace airlib_rpclib
{
Vector3r position;
Quaternionr orientation;
MSGPACK_DEFINE_MAP(position, orientation);
MSGPACK_DEFINE_ARRAY(position, orientation);

Pose()
{
Expand All @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -233,7 +233,7 @@ namespace airlib_rpclib
{
float matrix[4][4];

MSGPACK_DEFINE_MAP(matrix);
MSGPACK_DEFINE_ARRAY(matrix);

ProjectionMatrix()
{
Expand Down Expand Up @@ -261,7 +261,7 @@ namespace airlib_rpclib
Vector2r min;
Vector2r max;

MSGPACK_DEFINE_MAP(min, max);
MSGPACK_DEFINE_ARRAY(min, max);

Box2D()
{
Expand All @@ -288,7 +288,7 @@ namespace airlib_rpclib
Vector3r min;
Vector3r max;

MSGPACK_DEFINE_MAP(min, max);
MSGPACK_DEFINE_ARRAY(min, max);

Box3D()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down
4 changes: 2 additions & 2 deletions AirLib/include/vehicles/car/api/CarRpcLibAdaptors.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down
8 changes: 4 additions & 4 deletions AirLib/include/vehicles/multirotor/api/MultirotorRpcLibAdaptors.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -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()
{
Expand All @@ -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()
{
Expand Down Expand Up @@ -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()
{
Expand Down
12 changes: 8 additions & 4 deletions SGM/src/sgmstereo/sgmstereo.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
30 changes: 0 additions & 30 deletions Unreal/Environments/Blocks/Blocks.uproject
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions Unreal/Environments/Blocks/Config/DefaultEditor.ini
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini
View file
Open in desktop

This file was deleted.

Loading
Loading