refactor car keyboard controls

microsoft · Nov 30, 2017 · 0293441 · 0293441
1 parent f327504
commit 0293441
Show file tree

Hide file tree

Showing 11 changed files with 275 additions and 231 deletions.
diff --git a/AirLib/include/api/VehicleApiBase.hpp b/AirLib/include/api/VehicleApiBase.hpp
@@ -14,7 +14,7 @@ class VehicleApiBase {
 public:
     virtual GeoPoint getHomeGeoPoint() = 0;
     virtual void enableApiControl(bool is_enabled) = 0;
-    virtual bool isApiControlEnabled() = 0;
+    virtual bool isApiControlEnabled() const = 0;
     virtual void reset() = 0;
 
     virtual vector<VehicleCameraBase::ImageResponse> simGetImages(const vector<VehicleCameraBase::ImageRequest>& request) = 0;

diff --git a/AirLib/include/vehicles/car/api/CarApiBase.hpp b/AirLib/include/vehicles/car/api/CarApiBase.hpp
@@ -65,6 +65,8 @@ class CarApiBase : public VehicleApiBase  {
 
     virtual void setCarControls(const CarControls& controls) = 0;
     virtual CarState getCarState() = 0;
+    virtual const CarApiBase::CarControls& getCarControls() const = 0;
+
     virtual ~CarApiBase() = default;
 };
 

diff --git a/AirLib/include/vehicles/multirotor/api/DroneApi.hpp b/AirLib/include/vehicles/multirotor/api/DroneApi.hpp
@@ -278,7 +278,7 @@ class DroneApi : public VehicleApiBase {
         vehicle_->printLogMessage(message, message_param, severity);
     }
 
-    virtual bool isApiControlEnabled() override
+    virtual bool isApiControlEnabled() const override
     {
         return controller_->isApiControlEnabled();
     }

diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h
@@ -34,6 +34,7 @@ class UAirBlueprintLib : public UBlueprintFunctionLibrary
 
 public:
     static void LogMessageString(const std::string &prefix, const std::string &suffix, LogDebugLevel level, float persist_sec = 60);
+    UFUNCTION(BlueprintCallable, Category = "Utils")
     static void LogMessage(const FString &prefix, const FString &suffix, LogDebugLevel level, float persist_sec = 60);
     static float GetWorldToMetersScale(const AActor* context);