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

Fix the merge of vehicleActorFactory

This commit is contained in:
Blyron 2024-11-05 16:41:49 +01:00
parent 84e4733982 c37d00d671
commit 9fa56a499f
1 changed files with 5 additions and 36 deletions
Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/Factory
VehicleActorFactory.cpp

41
Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/Factory/VehicleActorFactory.cpp
View File

@ -56,11 +56,7 @@ TSharedPtr<FJsonObject> AVehicleActorFactory::FVehicleParametersToJsonObject(con
JsonObject->SetStringField(TEXT("Make"), VehicleParams.Make);
JsonObject->SetStringField(TEXT("Model"), VehicleParams.Model);
<<<<<<< HEAD
JsonObject->SetStringField(TEXT("Class"), VehicleParams.Class ? VehicleParams.Class->GetName() : "");
=======
JsonObject->SetStringField(TEXT("Class"), VehicleParams.Class ? VehicleParams.Class->GetPathName() : "");
>>>>>>> c37d00d6710e39996778dd59cea15a685d5fae49
JsonObject->SetNumberField(TEXT("NumberOfWheels"), VehicleParams.NumberOfWheels);
JsonObject->SetNumberField(TEXT("Generation"), VehicleParams.Generation);
JsonObject->SetStringField(TEXT("ObjectType"), VehicleParams.ObjectType);
@ -125,19 +121,12 @@ void AVehicleActorFactory::SaveVehicleParametersArrayToFile(const TArray<FVehicl
// Save the JSON to a file
if (FFileHelper::SaveStringToFile(JsonContent, *FilePath))
{
<<<<<<< HEAD
UE_LOG(LogTemp, Log, TEXT("JSON file successfully saved at: %s"), *FilePath);
}
else
{
UE_LOG(LogTemp, Error, TEXT("Failed to save JSON file at: %s"), *FilePath);
=======
UE_LOG(LogCarla, Log, TEXT("JSON file successfully saved at: %s"), *FilePath);
}
else
{
UE_LOG(LogCarla, Error, TEXT("Failed to save JSON file at: %s"), *FilePath);
>>>>>>> c37d00d6710e39996778dd59cea15a685d5fae49
}
}
@ -147,16 +136,10 @@ bool AVehicleActorFactory::JsonToFVehicleParameters(const TSharedPtr<FJsonObject
JsonObject->TryGetStringField(TEXT("Make"), OutVehicleParams.Make);
JsonObject->TryGetStringField(TEXT("Model"), OutVehicleParams.Model);
// Convert "Class" string back to a class reference if necessary
<<<<<<< HEAD
// JsonObject->TryGetStringField(TEXT("Class"), OutVehicleParams.Class); // Custom conversion required if needed
=======
FString ClassPath;
JsonObject->TryGetStringField(TEXT("Class"), ClassPath); // Custom conversion required if needed
JsonObject->TryGetStringField(TEXT("Class"), ClassPath);
OutVehicleParams.Class = StaticLoadClass(ACarlaWheeledVehicle::StaticClass(), nullptr, *ClassPath);
>>>>>>> c37d00d6710e39996778dd59cea15a685d5fae49
JsonObject->TryGetNumberField(TEXT("NumberOfWheels"), OutVehicleParams.NumberOfWheels);
JsonObject->TryGetNumberField(TEXT("Generation"), OutVehicleParams.Generation);
JsonObject->TryGetStringField(TEXT("ObjectType"), OutVehicleParams.ObjectType);
@ -206,11 +189,8 @@ bool AVehicleActorFactory::JsonToFVehicleParametersArray(const FString& JsonStri
if (!FJsonSerializer::Deserialize(Reader, RootObject) || !RootObject.IsValid())
{
<<<<<<< HEAD
UE_LOG(LogTemp, Error, TEXT("Failed to parse JSON."));
=======
UE_LOG(LogCarla, Error, TEXT("Failed to parse JSON."));
>>>>>>> c37d00d6710e39996778dd59cea15a685d5fae49
return false;
}
@ -248,27 +228,16 @@ void AVehicleActorFactory::LoadVehicleParametersArrayFromFile(const FString& Fil
// Parse the JSON and populate the TArray<FVehicleParameters>
if (JsonToFVehicleParametersArray(JsonContent, OutVehicleParamsArray))
{
<<<<<<< HEAD
UE_LOG(LogTemp, Log, TEXT("Vehicle parameters loaded successfully from %s"), *FilePath);
}
else
{
UE_LOG(LogTemp, Error, TEXT("Failed to parse vehicle parameters from %s"), *FilePath);
=======
UE_LOG(LogCarla, Log, TEXT("Vehicle parameters loaded successfully from %s"), *FilePath);
}
else
{
UE_LOG(LogCarla, Error, TEXT("Failed to parse vehicle parameters from %s"), *FilePath);
>>>>>>> c37d00d6710e39996778dd59cea15a685d5fae49
}
}
else
{
<<<<<<< HEAD
UE_LOG(LogTemp, Error, TEXT("Failed to load file: %s"), *FilePath);
=======
UE_LOG(LogCarla, Error, TEXT("Failed to load file: %s"), *FilePath);
>>>>>>> c37d00d6710e39996778dd59cea15a685d5fae49
UE_LOG(LogCarla, Error, TEXT("Failed to load file: %s"), *FilePath);
}
}