p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing chrono macros

This commit is contained in:
Axel 2021-03-02 15:47:56 +01:00 committed by Axel1092
parent 04482af93d
commit 74180b0fe7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp
View File

@ -8,7 +8,9 @@
#include "ChronoMovementComponent.h"
#include "compiler/disable-ue4-macros.h"
#include <carla/rpc/String.h>
#ifdef WITH_CHRONO
#include "chrono_vehicle/utils/ChUtilsJSON.h"
#endif
#include "compiler/enable-ue4-macros.h"
#include "Carla/Util/RayTracer.h"
@ -154,7 +156,7 @@ void UChronoMovementComponent::BeginPlay()
// Set base path for vehicle JSON files
vehicle::SetDataPath(carla::rpc::FromFString(BaseJSONPath));
std::string BasePath_string = carla::rpc::FromFString(BaseJSONPath);
// Create full path for json files
@ -167,12 +169,12 @@ void UChronoMovementComponent::BeginPlay()
std::string PowerTrainJSON_string = carla::rpc::FromFString(PowertrainJSON);
std::string PowerTrain_string = BasePath_string + PowerTrainJSON_string;
FString PowerTrainJSONPath = carla::rpc::ToFString(PowerTrain_string);
std::string TireJSON_string = carla::rpc::FromFString(TireJSON);
std::string Tire_string = BasePath_string + TireJSON_string;
FString TireJSONPath = carla::rpc::ToFString(Tire_string);
UE_LOG(LogCarla, Log, TEXT("Loading Chrono files: Vehicle: %s, PowerTrain: %s, Tire: %s"),
UE_LOG(LogCarla, Log, TEXT("Loading Chrono files: Vehicle: %s, PowerTrain: %s, Tire: %s"),
*VehicleJSONPath,
*PowerTrainJSONPath,
*TireJSONPath);