Skip to content

apply style from clang-format #1

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

Open
zimmy87 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

apply style from clang-format #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AirLib/include/api/RpcLibClientBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ namespace airlib
void simSetKinematics(const Kinematics::State& state, bool ignore_collision, const std::string& vehicle_name = "");
msr::airlib::Environment::State simGetGroundTruthEnvironment(const std::string& vehicle_name = "") const;
std::vector<std::string> simSwapTextures(const std::string& tags, int tex_id = 0, int component_id = 0, int material_id = 0);
bool simSetObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id=0);
bool simSetObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id=0);
bool simSetObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id = 0);
bool simSetObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id = 0);

// Recording APIs
void startRecording();
Expand Down
6 changes: 2 additions & 4 deletions AirLib/include/api/WorldSimApiBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ namespace airlib
virtual bool setObjectScale(const std::string& object_name, const Vector3r& scale) = 0;
virtual std::unique_ptr<std::vector<std::string>> swapTextures(const std::string& tag, int tex_id = 0, int component_id = 0, int material_id = 0) = 0;
virtual bool setLightIntensity(const std::string& light_name, float intensity) = 0;
virtual bool setObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id=0) = 0;
virtual bool setObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id=0) = 0;
virtual bool setObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id = 0) = 0;
virtual bool setObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id = 0) = 0;
virtual vector<MeshPositionVertexBuffersResponse> getMeshPositionVertexBuffers() const = 0;

virtual bool createVoxelGrid(const Vector3r& position, const int& x_size, const int& y_size, const int& z_size, const float& res, const std::string& output_file) = 0;
Expand Down Expand Up @@ -104,8 +104,6 @@ namespace airlib
const std::string& vehicle_name, bool external) const = 0;
virtual std::vector<uint8_t> getImage(ImageCaptureBase::ImageType image_type, const CameraDetails& camera_details) const = 0;



//CinemAirSim
virtual std::vector<std::string> getPresetLensSettings(const CameraDetails& camera_details) = 0;
virtual std::string getLensSettings(const CameraDetails& camera_details) = 0;
Expand Down
1 change: 0 additions & 1 deletion AirLib/src/api/RpcLibClientBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ __pragma(warning(disable : 4239))
return result;
}


//CinemAirSim
std::vector<std::string> RpcLibClientBase::simGetPresetLensSettings(const std::string& camera_name, const std::string& vehicle_name, bool external)
{
Expand Down
4 changes: 2 additions & 2 deletions Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase

virtual bool setLightIntensity(const std::string& light_name, float intensity) override;
virtual std::unique_ptr<std::vector<std::string>> swapTextures(const std::string& tag, int tex_id = 0, int component_id = 0, int material_id = 0) override;
virtual bool setObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id=0) override;
virtual bool setObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id=0) override;
virtual bool setObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id = 0) override;
virtual bool setObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id = 0) override;
virtual std::vector<std::string> listSceneObjects(const std::string& name_regex) const override;
virtual Pose getObjectPose(const std::string& object_name) const override;

Expand Down
4 changes: 0 additions & 4 deletions Unreal/Plugins/AirSim/Source/WorldSimApi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,6 @@ std::string WorldSimApi::getSettingsString() const
return msr::airlib::AirSimSettings::singleton().settings_text_;
}



bool WorldSimApi::testLineOfSightBetweenPoints(const msr::airlib::GeoPoint& lla1, const msr::airlib::GeoPoint& lla2) const
{
bool hit;
Expand Down Expand Up @@ -920,8 +918,6 @@ std::vector<uint8_t> WorldSimApi::getImage(ImageCaptureBase::ImageType image_typ
return std::vector<uint8_t>();
}



//CinemAirSim
std::vector<std::string> WorldSimApi::getPresetLensSettings(const CameraDetails& camera_details)
{
Expand Down
6 changes: 2 additions & 4 deletions Unreal/Plugins/AirSim/Source/WorldSimApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase

virtual bool setLightIntensity(const std::string& light_name, float intensity) override;
virtual std::unique_ptr<std::vector<std::string>> swapTextures(const std::string& tag, int tex_id = 0, int component_id = 0, int material_id = 0) override;
virtual bool setObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id=0) override;
virtual bool setObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id=0) override;
virtual bool setObjectMaterial(const std::string& object_name, const std::string& material_name, const int component_id = 0) override;
virtual bool setObjectMaterialFromTexture(const std::string& object_name, const std::string& texture_path, const int component_id = 0) override;
virtual std::vector<std::string> listSceneObjects(const std::string& name_regex) const override;
virtual Pose getObjectPose(const std::string& object_name) const override;
virtual bool setObjectPose(const std::string& object_name, const Pose& pose, bool teleport) override;
Expand Down Expand Up @@ -84,8 +84,6 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase
virtual bool testLineOfSightBetweenPoints(const msr::airlib::GeoPoint& point1, const msr::airlib::GeoPoint& point2) const override;
virtual std::vector<msr::airlib::GeoPoint> getWorldExtents() const override;



// Camera APIs
virtual msr::airlib::CameraInfo getCameraInfo(const CameraDetails& camera_details) const override;
virtual void setCameraPose(const msr::airlib::Pose& pose, const CameraDetails& camera_details) override;
Expand Down