From 4d635d5c92001bffddf997aa28bab2e6daabcf9c Mon Sep 17 00:00:00 2001 From: Daniel Santos-Olivan Date: Thu, 26 Nov 2020 14:25:26 +0100 Subject: [PATCH] Disable Wheel Sweep for bikes --- .../Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp | 4 ++++ .../Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp index 7ff4f75a9..652a78f58 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp @@ -42,6 +42,10 @@ void ACarlaWheeledVehicle::SetWheelCollision(UWheeledVehicleMovementComponent4W const FVehiclePhysicsControl &PhysicsControl ) { #ifdef WHEEL_SWEEP_ENABLED + const bool IsBike = IsTwoWheeledVehicle(); + + if (IsBike) + return; const bool IsEqual = Vehicle4W->UseSweepWheelCollision == PhysicsControl.UseSweepWheelCollision; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h index ee8f285a5..68c546440 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h @@ -122,6 +122,12 @@ public: void SetVehicleLightState(const FVehicleLightState &LightState); + UFUNCTION(BlueprintNativeEvent) + bool IsTwoWheeledVehicle(); + virtual bool IsTwoWheeledVehicle_Implementation() { + return false; + } + /// @} // =========================================================================== /// @name Vehicle input control