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

Fixed file transfer file paths

This commit is contained in:
Axel 2021-07-27 11:33:56 +02:00 committed by bernat
parent fb30cbafac
commit daf269dd94
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp
View File

@ -50,11 +50,19 @@ ACarlaGameModeBase::ACarlaGameModeBase(const FObjectInitializer& ObjectInitializ
CarlaSettingsDelegate = CreateDefaultSubobject<UCarlaSettingsDelegate>(TEXT("CarlaSettingsDelegate")); CarlaSettingsDelegate = CreateDefaultSubobject<UCarlaSettingsDelegate>(TEXT("CarlaSettingsDelegate"));
} }
const FString ACarlaGameModeBase::GetMapPath() const const FString ACarlaGameModeBase::GetRelativeMapPath() const
{ {
UWorld* World = GetWorld(); UWorld* World = GetWorld();
TSoftObjectPtr<UWorld> AssetPtr (World); TSoftObjectPtr<UWorld> AssetPtr (World);
return AssetPtr.GetLongPackageName(); FString Path = FPaths::GetPath(AssetPtr.GetLongPackageName());
Path.RemoveFromStart("/Game/");
return Path;
}
const FString ACarlaGameModeBase::GetFullMapPath() const
{
FString Path = GetRelativeMapPath();
return FPaths::ConvertRelativePathToFull(FPaths::ProjectContentDir()) + Path;
} }
void ACarlaGameModeBase::InitGame( void ACarlaGameModeBase::InitGame(

5
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.h
View File

@ -48,7 +48,10 @@ public:
return Map; return Map;
} }
const FString GetMapPath() const; const FString GetFullMapPath() const;
// get path relative to Content folder
const FString GetRelativeMapPath() const;
UFUNCTION(Exec, Category = "CARLA Game Mode") UFUNCTION(Exec, Category = "CARLA Game Mode")
void DebugShowSignals(bool enable); void DebugShowSignals(bool enable);

4
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDrive.cpp
View File

@ -70,9 +70,7 @@ FString UOpenDrive::GetXODR(const UWorld *World)
ACarlaGameModeBase* GameMode = UCarlaStatics::GetGameMode(World); ACarlaGameModeBase* GameMode = UCarlaStatics::GetGameMode(World);
auto RelativePath = FPaths::GetPath(GameMode->GetMapPath()); auto MapDir = GameMode->GetFullMapPath();
RelativePath.RemoveFromStart("/Game/");
auto MapDir = FPaths::ProjectContentDir() + RelativePath;
const auto FolderDir = MapDir + "/OpenDrive/"; const auto FolderDir = MapDir + "/OpenDrive/";
const auto FileName = MapDir.EndsWith(MapName) ? "*" : MapName; const auto FileName = MapDir.EndsWith(MapName) ? "*" : MapName;

10
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp
View File

@ -343,7 +343,7 @@ void FCarlaServer::FPimpl::BindActions()
REQUIRE_CARLA_EPISODE(); REQUIRE_CARLA_EPISODE();
ACarlaGameModeBase* GameMode = UCarlaStatics::GetGameMode(Episode->GetWorld()); ACarlaGameModeBase* GameMode = UCarlaStatics::GetGameMode(Episode->GetWorld());
const auto &SpawnPoints = Episode->GetRecommendedSpawnPoints(); const auto &SpawnPoints = Episode->GetRecommendedSpawnPoints();
FString FullMapPath = FPaths::GetPath(GameMode->GetMapPath()); FString FullMapPath = GameMode->GetFullMapPath();
FString MapDir = FullMapPath.RightChop(FullMapPath.Find("Content/", ESearchCase::CaseSensitive) + 8); FString MapDir = FullMapPath.RightChop(FullMapPath.Find("Content/", ESearchCase::CaseSensitive) + 8);
MapDir += "/" + Episode->GetMapName(); MapDir += "/" + Episode->GetMapName();
return cr::MapInfo{ return cr::MapInfo{
@ -378,14 +378,14 @@ void FCarlaServer::FPimpl::BindActions()
// Get the map's folder absolute path and check if it's in its own folder // Get the map's folder absolute path and check if it's in its own folder
ACarlaGameModeBase* GameMode = UCarlaStatics::GetGameMode(Episode->GetWorld()); ACarlaGameModeBase* GameMode = UCarlaStatics::GetGameMode(Episode->GetWorld());
const auto mapDir = FPaths::GetPath(GameMode->GetMapPath()); const auto mapDir = GameMode->GetFullMapPath();
const auto folderDir = mapDir + "/" + folder.c_str(); const auto folderDir = mapDir + folder.c_str();
const auto fileName = mapDir.EndsWith(Episode->GetMapName()) ? "*" : Episode->GetMapName(); const auto fileName = mapDir.EndsWith(Episode->GetMapName()) ? "*" : Episode->GetMapName();
// Find all the xodr and bin files from the map // Find all the xodr and bin files from the map
TArray<FString> Files; TArray<FString> Files;
IFileManager::Get().FindFilesRecursive(Files, *folderDir, *FString(fileName + ".xodr"), true, false, false); IFileManager::Get().FindFilesRecursive(Files, *folderDir, *(fileName + ".xodr"), true, false, false);
IFileManager::Get().FindFilesRecursive(Files, *folderDir, *FString(fileName + ".bin"), true, false, false); IFileManager::Get().FindFilesRecursive(Files, *folderDir, *(fileName + ".bin"), true, false, false);
// Remove the start of the path until the content folder and put each file in the result // Remove the start of the path until the content folder and put each file in the result
std::vector<std::string> result; std::vector<std::string> result;