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

Merge branch 'dev' of https://github.com/carla-simulator/carla into dev

This commit is contained in:
Blyron 2024-05-21 11:38:39 +02:00
parent 2a507990d3 6886d25c13
commit b86b1997fc
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset
View File

Binary file not shown.

BIN
Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset
View File

Binary file not shown.

3
Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py
View File

@ -30,9 +30,10 @@ if os.name == "nt":
editor_path = "%s/Engine/Binaries/%s/UE4Editor" % (ue4_path, sys_name)
command = [editor_path, uproject_path, run]
command.extend(arguments)
full_command = editor_path + " " + uproject_path + " " + run + " " + arguments
print("Commandlet:", command)
print("Arguments:", arguments)
subprocess.check_call(command, shell=True)
subprocess.check_call(full_command, shell=True)
elif os.name == "posix":
sys_name = "Linux"
editor_path = "%s/Engine/Binaries/%s/UE4Editor" % (ue4_path, sys_name)

6
Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
View File

@ -293,11 +293,13 @@ AActor* UOpenDriveToMap::SpawnActorWithCheckNoCollisions(UClass* ActorClassToSpa
void UOpenDriveToMap::GenerateTileStandalone(){
UE_LOG(LogCarlaToolsMapGenerator, Log, TEXT("UOpenDriveToMap::GenerateTileStandalone Function called"));
#if PLATFORM_WINDOWS
GenerateTile();
#else
ExecuteTileCommandlet();
#endif
UEditorLoadingAndSavingUtils::SaveDirtyPackages(true, true);
UEditorLevelLibrary::SaveCurrentLevel();
}
void UOpenDriveToMap::GenerateTile(){

2
Util/BuildTools/BuildPythonAPI.sh
View File

@ -105,7 +105,7 @@ if ${BUILD_PYTHONAPI} ; then
cp dist/.tmp/$(ls dist/.tmp | grep .whl) dist
else
/usr/bin/env python${PY_VERSION} setup.py bdist_egg bdist_wheel --dist-dir dist/.tmp --plat ${TARGET_WHEEL_PLATFORM}
/usr/bin/env python3 -m auditwheel repair --plat ${TARGET_WHEEL_PLATFORM} --wheel-dir dist dist/.tmp/$(ls dist/.tmp | grep .whl)
/usr/bin/env python${PY_VERSION} -m auditwheel repair --plat ${TARGET_WHEEL_PLATFORM} --wheel-dir dist dist/.tmp/$(ls dist/.tmp | grep .whl)
fi
rm -rf dist/.tmp

2
Util/BuildTools/Setup.sh
View File

@ -761,7 +761,7 @@ cp -p ${PROJ_SERVER_LIB} ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
# -- Get and compile patchelf --------------------------------------------------
# ==============================================================================
PATCHELF_VERSION=0.12
PATCHELF_VERSION=0.14
PATCHELF_REPO=https://github.com/NixOS/patchelf/archive/${PATCHELF_VERSION}.tar.gz
PATCHELF_TAR=${PATCHELF_VERSION}.tar.gz