diff --git a/AirLib/include/api/RpcLibClientBase.hpp b/AirLib/include/api/RpcLibClientBase.hpp index 53e27392fc..47fdb7fa9b 100644 --- a/AirLib/include/api/RpcLibClientBase.hpp +++ b/AirLib/include/api/RpcLibClientBase.hpp @@ -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 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(); diff --git a/AirLib/include/api/WorldSimApiBase.hpp b/AirLib/include/api/WorldSimApiBase.hpp index c9bf790088..833e590d7d 100644 --- a/AirLib/include/api/WorldSimApiBase.hpp +++ b/AirLib/include/api/WorldSimApiBase.hpp @@ -74,8 +74,8 @@ namespace airlib virtual bool setObjectScale(const std::string& object_name, const Vector3r& scale) = 0; virtual std::unique_ptr> 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 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; @@ -104,8 +104,6 @@ namespace airlib const std::string& vehicle_name, bool external) const = 0; virtual std::vector getImage(ImageCaptureBase::ImageType image_type, const CameraDetails& camera_details) const = 0; - - //CinemAirSim virtual std::vector getPresetLensSettings(const CameraDetails& camera_details) = 0; virtual std::string getLensSettings(const CameraDetails& camera_details) = 0; diff --git a/AirLib/src/api/RpcLibClientBase.cpp b/AirLib/src/api/RpcLibClientBase.cpp index 0cc4a621fc..36c0c1cf9b 100644 --- a/AirLib/src/api/RpcLibClientBase.cpp +++ b/AirLib/src/api/RpcLibClientBase.cpp @@ -272,7 +272,6 @@ __pragma(warning(disable : 4239)) return result; } - //CinemAirSim std::vector RpcLibClientBase::simGetPresetLensSettings(const std::string& camera_name, const std::string& vehicle_name, bool external) { diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h b/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h index 851cb1942c..e458798c28 100644 --- a/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h +++ b/Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h @@ -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> 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 listSceneObjects(const std::string& name_regex) const override; virtual Pose getObjectPose(const std::string& object_name) const override; diff --git a/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp b/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp index afe88a5e97..11e7b6cf97 100644 --- a/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp +++ b/Unreal/Plugins/AirSim/Source/WorldSimApi.cpp @@ -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; @@ -920,8 +918,6 @@ std::vector WorldSimApi::getImage(ImageCaptureBase::ImageType image_typ return std::vector(); } - - //CinemAirSim std::vector WorldSimApi::getPresetLensSettings(const CameraDetails& camera_details) { diff --git a/Unreal/Plugins/AirSim/Source/WorldSimApi.h b/Unreal/Plugins/AirSim/Source/WorldSimApi.h index 90ea6a5069..a65a8187ef 100644 --- a/Unreal/Plugins/AirSim/Source/WorldSimApi.h +++ b/Unreal/Plugins/AirSim/Source/WorldSimApi.h @@ -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> 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 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; @@ -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 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;