Fix some warnings, cleanup

microsoft · Feb 12, 2021 · 7304f21 · 7304f21
1 parent 6d011f4
commit 7304f21
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/AirLib/include/api/WorldSimApiBase.hpp b/AirLib/include/api/WorldSimApiBase.hpp
@@ -5,6 +5,7 @@
 #define air_WorldSimApiBase_hpp
 
 #include "common/CommonStructs.hpp"
+#include "common/ImageCaptureBase.hpp"
 
 namespace msr { namespace airlib {
 

diff --git a/Unreal/Plugins/AirSim/Source/PawnSimApi.h b/Unreal/Plugins/AirSim/Source/PawnSimApi.h
@@ -33,7 +33,6 @@ class PawnSimApi : public msr::airlib::VehicleSimApiBase {
     typedef msr::airlib::real_T real_T;
     typedef msr::airlib::Utils Utils;
     typedef msr::airlib::AirSimSettings::VehicleSetting VehicleSetting;
-    typedef msr::airlib::ImageCaptureBase ImageCaptureBase;
 
     struct Params {
         APawn* pawn; 

diff --git a/Unreal/Plugins/AirSim/Source/WorldSimApi.h b/Unreal/Plugins/AirSim/Source/WorldSimApi.h
@@ -80,10 +80,10 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase {
     virtual std::vector<float> getDistortionParams(const std::string& camera_name, const std::string& vehicle_name = "",
                                                     bool external = false) const override;
 
-    std::vector<ImageCaptureBase::ImageResponse> getImages(const std::vector<ImageCaptureBase::ImageRequest>& requests, 
-        const std::string& vehicle_name = "", bool external = false) const;
-    std::vector<uint8_t> getImage(const std::string& camera_name, ImageCaptureBase::ImageType image_type,
-        const std::string& vehicle_name = "", bool external = false) const;
+    virtual std::vector<ImageCaptureBase::ImageResponse> getImages(const std::vector<ImageCaptureBase::ImageRequest>& requests, 
+        const std::string& vehicle_name = "", bool external = false) const override;
+    virtual std::vector<uint8_t> getImage(const std::string& camera_name, ImageCaptureBase::ImageType image_type,
+        const std::string& vehicle_name = "", bool external = false) const override;
 
 private:
     AActor* createNewActor(const FActorSpawnParameters& spawn_params, const FTransform& actor_transform, const Vector3r& scale, UStaticMesh* static_mesh);