diff --git a/CMake/CarlaDependencies.cmake b/CMake/CarlaDependencies.cmake index ea729cb48..d806a138f 100644 --- a/CMake/CarlaDependencies.cmake +++ b/CMake/CarlaDependencies.cmake @@ -57,6 +57,7 @@ macro (carla_dependency_add NAME URL TAG) GIT_REPOSITORY ${URL} GIT_TAG ${TAG} OVERRIDE_FIND_PACKAGE + ${ARGN} ) list (APPEND CARLA_DEPENDENCIES ${NAME}) endmacro () @@ -169,6 +170,15 @@ if (BUILD_OSM_WORLD_RENDERER) ) endif () +if (BUILD_CARLA_UE) + carla_dependency_add ( + StreetMap + https://github.com/carla-simulator/StreetMap.git + ${CARLA_STREETMAP_TAG} + SOURCE_DIR ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/StreetMap + ) +endif () + # carla_dependency_add ( # gtest # https://github.com/google/googletest.git diff --git a/CMake/CarlaOptions.cmake b/CMake/CarlaOptions.cmake index 673659627..a001426f8 100644 --- a/CMake/CarlaOptions.cmake +++ b/CMake/CarlaOptions.cmake @@ -250,3 +250,18 @@ carla_string_option ( "Target libosmscout git tag." ${CARLA_LIBOSMSCOUT_VERSION} ) + + +# ==== STREETMAP ==== + +carla_string_option ( + CARLA_STREETMAP_VERSION + "Target StreetMap version." + UE5Native +) + +carla_string_option ( + CARLA_STREETMAP_TAG + "Target StreetMap git tag." + ${CARLA_LIBOSMSCOUT_VERSION} +) diff --git a/Configure.py b/Configure.py index b317ce61d..6d3de66e1 100644 --- a/Configure.py +++ b/Configure.py @@ -1385,7 +1385,7 @@ def BuildCarlaUEMain(): if os.name == 'nt': LaunchSubprocessImmediate([ UNREAL_ENGINE_PATH / 'Engine' / 'Build' / 'BatchFiles' / 'Build.bat', - 'CarlaUE4Editor', + 'CarlaUnrealEditor', 'Win64', 'Development', '-WaitMutex', diff --git a/Docs/build_faq.md b/Docs/build_faq.md index 042b27f45..c9a4f4742 100644 --- a/Docs/build_faq.md +++ b/Docs/build_faq.md @@ -386,7 +386,7 @@ CARLA forum > This happens from time to time due to Linux updates. There is a special target in the Makefile for this issue. It takes a long time but fixes the issue: > > make hard-clean -> make CarlaUE4Editor +> make CarlaUnrealEditor diff --git a/Docs/build_system.md b/Docs/build_system.md index c12135bdf..c4d365995 100644 --- a/Docs/build_system.md +++ b/Docs/build_system.md @@ -2,7 +2,7 @@ * [__Setup__](#setup) * [__LibCarla__](#libcarla) -* [__CarlaUE4 and Carla plugin__](#carlaue4-and-carla-plugin) +* [__CarlaUnreal and Carla plugin__](#carlaue4-and-carla-plugin) * [__PythonAPI__](#pythonapi) - [Versions 0.9.12+](#versions-0912) - [Versions prior to 0.9.12](#versions-prior-to-0912) @@ -65,7 +65,7 @@ Both compiled at the same step with Unreal Engine build tool. They require the ` Command ```sh -make CarlaUE4Editor +make CarlaUnrealEditor ``` To launch Unreal Engine's Editor run diff --git a/Jenkinsfile b/Jenkinsfile index cf8b11457..fbf3d8433 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { sh 'make LibCarla' sh 'make PythonAPI ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' - sh 'make CarlaUE4Editor ARGS="--chrono"' + sh 'make CarlaUnrealEditor ARGS="--chrono"' sh 'make plugins' sh 'make examples' } @@ -262,7 +262,7 @@ pipeline """ bat """ call ../setEnv64.bat - make CarlaUE4Editor ARGS="--chrono" + make CarlaUnrealEditor ARGS="--chrono" """ bat """ call ../setEnv64.bat diff --git a/Makefile b/Makefile index 5faab3686..2a20f7365 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ -include Util/BuildTools/Vars.mk -ifeq ($(OS),Windows_NT) -include Util/BuildTools/Windows.mk -else -include Util/BuildTools/Linux.mk -endif +launch PythonAPI LibCarla CarlaUE4Editor CarlaUnrealEditor launch-only: + @echo "MakeFile build is currently disabled." + +# include Util/BuildTools/Vars.mk +# ifeq ($(OS),Windows_NT) +# include Util/BuildTools/Windows.mk +# else +# include Util/BuildTools/Linux.mk +# endif diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt index 85f37034a..0be649fd9 100644 --- a/Unreal/CMakeLists.txt +++ b/Unreal/CMakeLists.txt @@ -24,33 +24,29 @@ set ( ${CARLA_UE_PATH}/CarlaUnreal.uproject ) -add_custom_target ( - carla-ue-generate-project-files - ALL - DEPENDS - carla-server - COMMENT - "Generating Carla UE project files..." +execute_process ( COMMAND ${CARLA_UE_GENERATE_PROJECT_SCRIPT} -project=${CARLA_UE_PROJECT_PATH} -game -engine -makefiles + RESULT_VARIABLE + GENERATE_RPJECT_FILES_RESULT ) -add_custom_target ( - carla-ue-build - ALL - DEPENDS - carla-ue-generate-project-files - COMMENT - "Building Carla UE..." - COMMAND - make -C ${CARLA_UE_PROJECT_PATH} CarlaUE4Editor -) +if (NOT ${GENERATE_RPJECT_FILES_RESULT}) + message ( + FATAL_ERROR + "Could not generate Unreal Engine project files." + ) +endif () file ( MAKE_DIRECTORY ${CARLA_UE_PATH}/Content/Carla/ExportedMaps +) + +add_subdirectory ( + CarlaUnreal ) \ No newline at end of file diff --git a/Util/BuildTools/BuildCarlaUE4.bat b/Util/BuildTools/BuildCarlaUE4.bat index be46f5195..68e9005fb 100644 --- a/Util/BuildTools/BuildCarlaUE4.bat +++ b/Util/BuildTools/BuildCarlaUE4.bat @@ -184,7 +184,7 @@ if %BUILD_UE4_EDITOR% == true ( echo %FILE_N% Building Unreal Editor... call "%UE4_ROOT%Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4Editor^ + CarlaUnrealEditor^ Win64^ Development^ -WaitMutex^ diff --git a/Util/BuildTools/BuildCarlaUE4.sh b/Util/BuildTools/BuildCarlaUE4.sh index cafad2016..51159a9f5 100755 --- a/Util/BuildTools/BuildCarlaUE4.sh +++ b/Util/BuildTools/BuildCarlaUE4.sh @@ -114,7 +114,7 @@ if ${HARD_CLEAN} ; then log "Doing a \"hard\" clean of the Unreal Engine project." - make CarlaUE4Editor ARGS=-clean + make CarlaUnrealEditor ARGS=-clean fi @@ -200,7 +200,7 @@ if ${BUILD_CARLAUE4} ; then fi log "Build CarlaUnreal project." - make CarlaUE4Editor + make CarlaUnrealEditor #Providing the user with the ExportedMaps folder EXPORTED_MAPS="${CARLAUE4_ROOT_FOLDER}/Content/Carla/ExportedMaps" diff --git a/Util/BuildTools/Linux.mk b/Util/BuildTools/Linux.mk index 8e64f7689..ede34c521 100644 --- a/Util/BuildTools/Linux.mk +++ b/Util/BuildTools/Linux.mk @@ -5,18 +5,18 @@ help: launch: LibCarla.server.release osm2odr downloadplugins @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build --launch $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --build --launch $(ARGS) launch-only: - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --launch $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --launch $(ARGS) -import: CarlaUE4Editor PythonAPI +import: CarlaUnrealEditor PythonAPI @${CARLA_BUILD_TOOLS_FOLDER}/Import.sh $(ARGS) -package: CarlaUE4Editor PythonAPI +package: CarlaUnrealEditor PythonAPI @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) -package.rss: CarlaUE4Editor PythonAPI.rss.rebuild +package.rss: CarlaUnrealEditor PythonAPI.rss.rebuild @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) docs: @@ -27,23 +27,23 @@ clean.LibCarla: @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean clean.PythonAPI: @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean -clean.CarlaUE4Editor: +clean.CarlaUnrealEditor: @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --clean + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --clean clean.osm2odr: @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean -clean: clean.CarlaUE4Editor clean.PythonAPI clean.LibCarla clean.osm2odr +clean: clean.CarlaUnrealEditor clean.PythonAPI clean.LibCarla clean.osm2odr rebuild: setup @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --rebuild @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --rebuild @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --rebuild $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --rebuild $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --rebuild $(ARGS) hard-clean: @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --hard-clean + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --hard-clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean @@ -83,9 +83,9 @@ examples: run-examples: @for D in ${CARLA_EXAMPLES_FOLDER}/*; do [ -d "$${D}" ] && make -C $${D} run.only; done -CarlaUE4Editor: LibCarla.server.release osm2odr downloadplugins +CarlaUnrealEditor: LibCarla.server.release osm2odr downloadplugins @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS) - @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build $(ARGS) + @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --build $(ARGS) .PHONY: PythonAPI PythonAPI: LibCarla.client.release osm2odr diff --git a/Util/BuildTools/Linux.mk.help b/Util/BuildTools/Linux.mk.help index 1dafc4024..b00a78e42 100644 --- a/Util/BuildTools/Linux.mk.help +++ b/Util/BuildTools/Linux.mk.help @@ -71,7 +71,7 @@ for developers: Build (and run) the C++ client examples. - CarlaUE4Editor: + CarlaUnrealEditor: Build CarlaUnreal project, but do not launch the editor. @@ -83,7 +83,7 @@ for developers: Build LibCarla, "Server" and/or "Client" configurations. - clean.(LibCarla|PythonAPI|CarlaUE4Editor) + clean.(LibCarla|PythonAPI|CarlaUnrealEditor) Remove intermediate build files for the specific module. diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat index 86e59fceb..617983e6e 100644 --- a/Util/BuildTools/Package.bat +++ b/Util/BuildTools/Package.bat @@ -129,7 +129,7 @@ if %DO_PACKAGE%==true ( if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!" call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^ - CarlaUE4Editor^ + CarlaUnrealEditor^ Win64^ Development^ -WaitMutex^ @@ -457,7 +457,7 @@ rem ============================================================================ :error_build_editor echo. - echo %FILE_N% [ERROR] There was a problem while building the CarlaUE4Editor. + echo %FILE_N% [ERROR] There was a problem while building the CarlaUnrealEditor. echo [ERROR] Please read the screen log for more information. goto bad_exit diff --git a/Util/BuildTools/Windows.mk b/Util/BuildTools/Windows.mk index 1728f1a72..6c358b36d 100644 --- a/Util/BuildTools/Windows.mk +++ b/Util/BuildTools/Windows.mk @@ -16,17 +16,17 @@ help: import: server @"${CARLA_BUILD_TOOLS_FOLDER}/Import.py" $(ARGS) -CarlaUE4Editor: LibCarla osm2odr - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --build $(ARGS) +CarlaUnrealEditor: LibCarla osm2odr + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --build $(ARGS) -launch: CarlaUE4Editor - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch $(ARGS) +launch: CarlaUnrealEditor + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --launch $(ARGS) launch-only: - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch $(ARGS) + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --launch $(ARGS) package: PythonAPI - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --at-least-write-optionalmodules $(ARGS) + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --at-least-write-optionalmodules $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.26 $(ARGS) .PHONY: docs @@ -40,13 +40,13 @@ PythonAPI.docs: clean: @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.26 - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --clean + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --clean rebuild: setup - @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --rebuild + @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --rebuild diff --git a/Util/CARLA.sublime-project b/Util/CARLA.sublime-project index 46d555bca..fe91c30cd 100644 --- a/Util/CARLA.sublime-project +++ b/Util/CARLA.sublime-project @@ -59,13 +59,13 @@ "build_systems": [ { - "name": "CARLA - make CarlaUE4Editor", + "name": "CARLA - make CarlaUnrealEditor", "working_dir": "${project_path}/..", "file_regex": "(Unreal\\/CarlaUnreal\\/[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", "syntax": "Packages/Makefile/Make Output.sublime-syntax", "linux": { - "shell_cmd": "CARLA_BUILD_NO_COLOR=true make CarlaUE4Editor" + "shell_cmd": "CARLA_BUILD_NO_COLOR=true make CarlaUnrealEditor" } }, { diff --git a/Util/Docker/Carla.Dockerfile b/Util/Docker/Carla.Dockerfile index 65f5d67dd..a7982a3a7 100644 --- a/Util/Docker/Carla.Dockerfile +++ b/Util/Docker/Carla.Dockerfile @@ -10,7 +10,7 @@ RUN cd /home/carla/ && \ else git clone --depth 1 --branch $GIT_BRANCH https://github.com/carla-simulator/carla.git; fi && \ cd /home/carla/carla && \ ./Update.sh && \ - make CarlaUE4Editor && \ + make CarlaUnrealEditor && \ make PythonAPI && \ make build.utils && \ make package && \