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

Fix loop being in commandlet, loop on tiles should be out of them

This commit is contained in:
Aaron Samaniego 2024-02-26 10:20:04 +01:00
parent 286e7afd15
commit 79555a7c5d
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Unreal/CarlaUE4/Plugins/CarlaTools/Content/LevelWorldPartition/WBP_SetProperPositionForWorldPartition.uasset
View File

Binary file not shown.

2
Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/set_proper_position_for_world_partition.py
View File

@ -7,7 +7,7 @@ import subprocess
"""Generic function for running a commandlet with its arguments."""
ue4_path = os.environ["UE4_ROOT"]
ue4_path = os.environ["UE5_ROOT"]
uproject_path = unreal.Paths.project_dir() + ("CarlaUE4.uproject")
run = "-run=%s" % ("SetProperPositionForWorldPartitionCommandlet")

18
Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/SetProperPositionForWorldPartitionCommandlet.cpp
View File

@ -44,8 +44,8 @@ int32 USetProperPositionForWorldPartitionCommandlet::Main(const FString &Params)
ParseCommandLine(*Params, Tokens, Switches, ParamsMap );
FString BaseLevelName = ParamsMap["BaseLevelName"];
FIntVector CurrentTilesInXY = FIntVector(FCString::Atof(*ParamsMap["CTileX"]), FCString::Atof(*ParamsMap["CTileY"]), 0);
UEditorLevelLibrary::LoadLevel(*BaseLevelName);
UE_LOG(LogCarlaToolsMapSetProperPositionForWorldPartitionCommandlet, Warning, TEXT("Valid Map loaded, MapName %s"), *BaseLevelName);
AActor* QueryActor = UGameplayStatics::GetActorOfClass( GEditor->GetEditorWorldContext().World(), ALargeMapManager::StaticClass());
if (QueryActor != nullptr) {
@ -58,19 +58,9 @@ int32 USetProperPositionForWorldPartitionCommandlet::Main(const FString &Params)
UEditorLevelLibrary::SaveCurrentLevel();
for(int TileX = 0; TileX < NumTilesInXY.X; TileX++)
{
for(int TileY = 0; TileY < NumTilesInXY.Y; TileY++)
{
if(TileX != 0 || TileY != 0)
{
UEditorLevelLibrary::LoadLevel(*BaseLevelName);
UEditorLevelLibrary::SaveCurrentLevel();
ProcessTile(FIntVector(TileX, TileY, 0), TileSize);
}
}
}
UEditorLevelLibrary::LoadLevel(*BaseLevelName);
ProcessTile(FIntVector(CurrentTilesInXY.X, CurrentTilesInXY.Y, 0), TileSize);
UEditorLevelLibrary::SaveCurrentLevel();
}
else {
UE_LOG(LogCarlaToolsMapSetProperPositionForWorldPartitionCommandlet, Error, TEXT("Largemapmanager not found "));