Expose traffic sign's trigger volumes on Python API

CHANGELOG.md

@@ -20,7 +20,7 @@
   * Fixed static objects present in the map were marked as "movable"
   * Fixed BP_MultipleFloor, tweaked offset in BaseFloor to adjust meshes between them
   * New traffic signs assets: one-way, no-turn, more speed limits, do not enter, arrow floors, Michigan left, and lane end
-
+  * Expose traffic sign's trigger volumes on Python API
 
 ## CARLA 0.9.3
 

LibCarla/source/carla/client/TrafficLight.h

@@ -6,43 +6,52 @@
 
 #pragma once
 
-#include "carla/client/Actor.h"
+#include "carla/client/TrafficSign.h"
 #include "carla/rpc/TrafficLightState.h"
 
 namespace carla {
 namespace client {
 
-  class TrafficLight : public Actor {
+  class TrafficLight : public TrafficSign {
   public:
 
-    explicit TrafficLight(ActorInitializer init) : Actor(std::move(init)) {}
+    explicit TrafficLight(ActorInitializer init) : TrafficSign(std::move(init)) {}
+
+    void SetState(rpc::TrafficLightState state);
 
     /// Return the current state of the traffic light.
     ///
-    /// @note These functions do not call the simulator, they return the
-    /// data received in the last tick.
-    void SetState(rpc::TrafficLightState state);
-
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     rpc::TrafficLightState GetState() const;
 
     void SetGreenTime(float green_time);
 
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     float GetGreenTime() const;
 
     void SetYellowTime(float yellow_time);
 
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     float GetYellowTime() const;
 
     void SetRedTime(float red_time);
 
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     float GetRedTime() const;
 
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     float GetElapsedTime() const;
 
     void Freeze(bool freeze);
 
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     bool IsFrozen() const;
-
   };
 
 } // namespace client

LibCarla/source/carla/client/TrafficSign.h

@@ -0,0 +1,25 @@
+// Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+// de Barcelona (UAB).
+//
+// This work is licensed under the terms of the MIT license.
+// For a copy, see <https://opensource.org/licenses/MIT>.
+
+#pragma once
+
+#include "carla/client/Actor.h"
+
+namespace carla {
+namespace client {
+
+  class TrafficSign : public Actor {
+  public:
+
+    explicit TrafficSign(ActorInitializer init) : Actor(std::move(init)) {}
+
+    const geom::BoundingBox &GetTriggerVolume() const {
+      return ActorState::GetBoundingBox();
+    }
+  };
+
+} // namespace client
+} // namespace carla

LibCarla/source/carla/client/Vehicle.h

@@ -23,6 +23,8 @@ namespace client {
 
     explicit Vehicle(ActorInitializer init) : Actor(std::move(init)) {}
 
+    using ActorState::GetBoundingBox;
+
     /// Switch on/off this vehicle's autopilot.
     void SetAutopilot(bool enabled = true);
 
@@ -34,19 +36,35 @@ namespace client {
 
     /// Return the control last applied to this vehicle.
     ///
-    /// @note The following functions do not call the simulator, they return the
-    /// data
+    /// @note This function does not call the simulator, it returns the data
     /// received in the last tick.
-    //////////////////////////////////////////////////////////////////////////////////
     Control GetControl() const;
     PhysicsControl GetPhysicsControl() const;
 
+    /// Return the speed limit currently affecting this vehicle.
+    ///
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     float GetSpeedLimit() const;
 
+    /// Return the state of the traffic light currently affecting this vehicle.
+    ///
+    /// @return Green If no traffic light is affecting the vehicle.
+    ///
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     rpc::TrafficLightState GetTrafficLightState() const;
 
+    /// Return whether a traffic light is affecting this vehicle.
+    ///
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     bool IsAtTrafficLight();
 
+    /// Retrieve the traffic light actor currently affecting this vehicle.
+    ///
+    /// @note This function does not call the simulator, it returns the data
+    /// received in the last tick.
     SharedPtr<TrafficLight> GetTrafficLight() const;
 
 

LibCarla/source/carla/client/Walker.h

@@ -19,6 +19,8 @@ namespace client {
 
     explicit Walker(ActorInitializer init) : Actor(std::move(init)) {}
 
+    using ActorState::GetBoundingBox;
+
     /// Apply @a control to this Walker.
     void ApplyControl(const Control &control);
 

LibCarla/source/carla/client/detail/ActorFactory.cpp

@@ -9,10 +9,11 @@
 #include "carla/Logging.h"
 #include "carla/StringUtil.h"
 #include "carla/client/Actor.h"
-#include "carla/client/LaneDetector.h"
 #include "carla/client/GnssSensor.h"
+#include "carla/client/LaneDetector.h"
 #include "carla/client/ServerSideSensor.h"
 #include "carla/client/TrafficLight.h"
+#include "carla/client/TrafficSign.h"
 #include "carla/client/Vehicle.h"
 #include "carla/client/Walker.h"
 #include "carla/client/World.h"
@@ -84,6 +85,8 @@ namespace detail {
       return MakeActorImpl<Walker>(std::move(init), gc);
     } else if (StringUtil::StartsWith(description.description.id, "traffic.traffic_light")) {
       return MakeActorImpl<TrafficLight>(std::move(init), gc);
+    } else if (StringUtil::StartsWith(description.description.id, "traffic.")) {
+      return MakeActorImpl<TrafficSign>(std::move(init), gc);
     }
     return MakeActorImpl<Actor>(std::move(init), gc);
   }

LibCarla/source/carla/client/detail/ActorState.h

@@ -34,10 +34,6 @@ namespace detail {
       return _display_id;
     }
 
-    const geom::BoundingBox &GetBoundingBox() const {
-      return _description.bounding_box;
-    }
-
     const std::vector<uint8_t> &GetSemanticTags() const {
       return _description.semantic_tags;
     }
@@ -57,6 +53,10 @@ namespace detail {
 
   protected:
 
+    const geom::BoundingBox &GetBoundingBox() const {
+      return _description.bounding_box;
+    }
+
     const rpc::Actor &GetActorDescription() const {
       return _description;
     }

PythonAPI/source/libcarla/Actor.cpp

@@ -73,8 +73,7 @@ void export_actor() {
     .def(self_ns::str(self_ns::self))
   ;
 
-  class_<cc::Vehicle, bases<cc::Actor>, boost::noncopyable, boost::shared_ptr<cc::Vehicle>>("Vehicle",
-      no_init)
+  class_<cc::Vehicle, bases<cc::Actor>, boost::noncopyable, boost::shared_ptr<cc::Vehicle>>("Vehicle", no_init)
     .add_property("bounding_box", CALL_RETURNING_COPY(cc::Vehicle, GetBoundingBox))
     .def("apply_control", &cc::Vehicle::ApplyControl, (arg("control")))
     .def("get_control", &cc::Vehicle::GetControl)
@@ -95,6 +94,12 @@ void export_actor() {
     .def(self_ns::str(self_ns::self))
   ;
 
+  class_<cc::TrafficSign, bases<cc::Actor>, boost::noncopyable, boost::shared_ptr<cc::TrafficSign>>(
+      "TrafficSign",
+      no_init)
+    .add_property("trigger_volume", CALL_RETURNING_COPY(cc::TrafficSign, GetTriggerVolume))
+  ;
+
   enum_<cr::TrafficLightState>("TrafficLightState")
     .value("Red", cr::TrafficLightState::Red)
     .value("Yellow", cr::TrafficLightState::Yellow)
@@ -103,7 +108,7 @@ void export_actor() {
     .value("Unknown", cr::TrafficLightState::Unknown)
   ;
 
-  class_<cc::TrafficLight, bases<cc::Actor>, boost::noncopyable, boost::shared_ptr<cc::TrafficLight>>(
+  class_<cc::TrafficLight, bases<cc::TrafficSign>, boost::noncopyable, boost::shared_ptr<cc::TrafficLight>>(
       "TrafficLight",
       no_init)
     .add_property("state", &cc::TrafficLight::GetState)

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/TrafficSignBase.h

@@ -12,6 +12,8 @@
 
 #include "TrafficSignBase.generated.h"
 
+class UBoxComponent;
+
 UENUM(BlueprintType)
 enum class ETrafficSignState : uint8 {
   UNKNOWN            = 0u   UMETA(DisplayName = "UNKNOWN"),
@@ -49,6 +51,9 @@ public:
     TrafficSignState = State;
   }
 
+  UFUNCTION(BlueprintImplementableEvent)
+  UBoxComponent *GetTriggerVolume() const;
+
 private:
 
   UPROPERTY(Category = "Traffic Sign", EditAnywhere)

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.cpp

@@ -7,6 +7,7 @@
 #include "Carla.h"
 #include "Carla/Util/BoundingBoxCalculator.h"
 
+#include "Carla/Traffic/TrafficSignBase.h"
 #include "Carla/Vehicle/CarlaWheeledVehicle.h"
 
 #include "Components/CapsuleComponent.h"
@@ -39,6 +40,23 @@ FBoundingBox UBoundingBoxCalculator::GetActorBoundingBox(const AActor *Actor)
         return {Origin, Extent};
       }
     }
+    // Traffic sign.
+    auto TrafficSign = Cast<ATrafficSignBase>(Actor);
+    if (TrafficSign != nullptr)
+    {
+      auto TriggerVolume = TrafficSign->GetTriggerVolume();
+      if (TriggerVolume != nullptr)
+      {
+        FVector Origin = TriggerVolume->GetRelativeTransform().GetTranslation();
+        FVector Extent = TriggerVolume->GetScaledBoxExtent();
+        return {Origin, Extent};
+      }
+      else
+      {
+        UE_LOG(LogCarla, Warning, TEXT("Traffic sign missing trigger volume: %s"), *Actor->GetName());
+        return {};
+      }
+    }
   }
   return {};
 }

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/BoundingBoxCalculator.h

@@ -25,6 +25,8 @@ public:
   ///
   /// @warning If the actor type is not supported a default initialized bounding
   /// box is returned.
+  ///
+  /// @warning Traffic signs return its trigger box instead.
   UFUNCTION(Category = "Carla Actor", BlueprintCallable)
   static FBoundingBox GetActorBoundingBox(const AActor *Actor);
 };