diff --git a/Unreal/CarlaUE4/Config/DefaultGame.ini b/Unreal/CarlaUE4/Config/DefaultGame.ini index f92a9d20d..3dacd5147 100644 --- a/Unreal/CarlaUE4/Config/DefaultGame.ini +++ b/Unreal/CarlaUE4/Config/DefaultGame.ini @@ -49,6 +49,8 @@ bCompressed=False bEncryptIniFiles=False bEncryptPakIndex=False bSkipEditorContent=False +bNativizeBlueprintAssets=False +bNativizeOnlySelectedBlueprints=False +MapsToCook=(FilePath="/Game/Carla/Maps/Town01") +MapsToCook=(FilePath="/Game/Carla/Maps/Town01_Opt") +MapsToCook=(FilePath="/Game/Carla/Maps/Town02") @@ -73,6 +75,12 @@ bSkipEditorContent=False +MapsToCook=(FilePath="/Game/Carla/Maps/Town12/Town12") +MapsToCook=(FilePath="/Game/Carla/Maps/Town13/Town13") +MapsToCook=(FilePath="/Game/Carla/Maps/Town15/Town15") +; 打包 HUTB 地图 ++MapsToCook=(FilePath="/Game/Carla/RoadRunner/Maps/HutbCarlaCity") ++DirectoriesToAlwaysCook=(Path="/Game/Carla/RoadRunner/Static") ++DirectoriesToAlwaysCook=(Path="/Game/Carla/Static/Other") ++DirectoriesToAlwaysCook=(Path="/Game/Carla/Static/Bridge") ++DirectoriesToAlwaysStageAsUFS=(Path="Carla/RoadRunner/Maps/OpenDrive") +DirectoriesToAlwaysCook=(Path="/AirSim/HUDAssets") +DirectoriesToAlwaysCook=(Path="Carla/Static/GenericMaterials/Licenseplates/Textures") +DirectoriesToAlwaysCook=(Path="Carla/Static/Car/4Wheeled/ParkedVehicles") @@ -82,12 +90,12 @@ bSkipEditorContent=False +DirectoriesToAlwaysCook=(Path="/Carla/PostProcessingMaterials") +DirectoriesToAlwaysCook=(Path="/Game/StarterContent") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/OpenDrive") -; 大地图的材质 -+DirectoriesToAlwaysCook=(Path="/Carla/Maps/Town15/DefaultMaterials") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Nav") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/TM") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Config") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Nav") +; 大地图的材质 ++DirectoriesToAlwaysCook=(Path="/Carla/Maps/Town15/DefaultMaterials") ; 拷贝大地图烘焙时候所缺少的 OpenDrive, TM (Nav) 文件夹 +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Town11/OpenDrive") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Town11/TM") @@ -98,8 +106,12 @@ bSkipEditorContent=False +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Town15/Nav") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Town15/OpenDrive") +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Town15/TM") -bNativizeBlueprintAssets=False -bNativizeOnlySelectedBlueprints=False +; 中电软件园资产 ++MapsToCook=(FilePath="/Game/roadrunner/map/baidutest2test") ++DirectoriesToAlwaysCook=(Path="/Game/roadrunner/static") ++DirectoriesToAlwaysCook=(Path="/Game/roadrunner/map") ++DirectoriesToAlwaysStageAsUFS=(Path="roadrunner/map/OpenDrive") ++DirectoriesToAlwaysStageAsUFS=(Path="roadrunner/ccsp") [/Script/VRSSettingsEditor.VRSSettings] vrs.EnableVRS=True diff --git a/setup.bat b/setup.bat index 2b9c4000e..de299b0ab 100644 --- a/setup.bat +++ b/setup.bat @@ -7,6 +7,7 @@ set FILE_N=-[%~n0]: set skip_prerequisites=false set launch=false +set package=false set interactive=false set python_path=python set python_root= @@ -52,8 +53,12 @@ rem -- PARSE COMMAND LINE ARGUMENTS -- set interactive=true ) else if "%1"=="--skip-prerequisites" ( set skip_prerequisites=true - ) else if "%1"=="-p" ( + ) else if "%1"=="-s" ( set skip_prerequisites=true + ) else if "%1"=="--package" ( + set package=true + ) else if "%1"=="-p" ( + set package=true ) else if "%1"=="--launch" ( set launch=true ) else if "%1"=="-l" ( @@ -89,16 +94,20 @@ rem ============================================================================ if not exist "%cd%\Build" ( mkdir "%cd%\Build" ) else ( - if not exist "%cd%\Build\git" ( - if not exist "%cd%\Build\git.zip" ( - echo Downloading git.zip ... - pushd "%cd%\Build" - curl -L -o git.zip https://gitee.com/OpenHUTB/sw/releases/download/up/git.zip || exit /b - popd - ) - echo Unzipping git... - powershell -Command "Expand-Archive -Path '%cd%\Build\git.zip' -DestinationPath '%cd%\Build\' -Force" || exit /b + echo "%cd%\Build" folder already exists. +) + +if not exist "%cd%\Build\git" ( + if not exist "%cd%\Build\git.zip" ( + echo Downloading git.zip ... + pushd "%cd%\Build" + curl -L -o git.zip https://gitee.com/OpenHUTB/sw/releases/download/up/git.zip || exit /b + popd ) + echo Unzipping git... + powershell -Command "Expand-Archive -Path '%cd%\Build\git.zip' -DestinationPath '%cd%\Build\' -Force" || exit /b +) else ( + echo "%cd%\Build\git" folder already exists. ) :: clone prerequisites https://git.code.tencent.com/OpenHUTB/dependencies to Build\prerequisites @@ -130,6 +139,29 @@ if exist "%cd%\Build\dependencies\" ( echo 7zip folder already exists. ) + + rem --------------------------------------------------------------------------------------------------------------- + rem Unzip Plugins + rem --------------------------------------------------------------------------------------------------------------- + rem Unzip RoadRunner Plugins + if not exist "%cd%\Unreal\CarlaUE4\Plugins\RoadRunnerRuntime" ( + echo Unzipping Roadrunner Plugins ... + "prerequisites\7zip\7z.exe" x "Plugins\RoadRunner_Plugins.zip" -o"%cd%\Unreal\CarlaUE4\Plugins\" -y >nul + ) else ( + echo RoadRunner Plugins already exists. + ) + rem Unzip CesiumForUnreal Plugin + if not exist "%cd%\Unreal\CarlaUE4\Plugins\CesiumForUnreal" ( + echo Unzipping CesiumForUnreal Plugin ... + "prerequisites\7zip\7z.exe" x "Plugins\CesiumForUnreal-426-v1.18.0-ue4.zip" -o"%cd%\Unreal\CarlaUE4\Plugins\" -y >nul + ) else ( + echo CesiumForUnreal Plugin already exists. + ) + + + rem --------------------------------------------------------------------------------------------------------------- + rem Unzip dependencies + rem --------------------------------------------------------------------------------------------------------------- rem fix no XINPUT1_3.dll error when lanunch UE4Editor rem install directx_Jun2010_redist.exe when DirectX folder not exist REG QUERY HKEY_CURRENT_USER\Software\Microsoft |find "DirectX" >nul @@ -180,6 +212,12 @@ if exist "%cd%\Build\dependencies\" ( ) else ( echo dotnet folder already exists. ) + if not exist "prerequisites\git\" ( + echo Unzipping git ... + "prerequisites\7zip\7z.exe" x "prerequisites\git.zip" -o"prerequisites\" -y >nul + ) else ( + echo git folder already exists. + ) if not exist "prerequisites\GnuWin32\" ( echo Unzipping GnuWin32 ... "prerequisites\7zip\7z.exe" x "prerequisites\GnuWin32.zip" -o"prerequisites\" -y >nul @@ -295,6 +333,18 @@ if %skip_prerequisites%==false ( rem Activate VS terminal development environment: set "vs_env_bat=" +rem for vs 2019 +if exist "%programfiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" ( + set "vs_env_bat=%programfiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" +) +if exist "%programfiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" ( + set "vs_env_bat=%programfiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" +) +if exist "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" ( + set "vs_env_bat=%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" +) + +rem for vs 2022 if exist "%ProgramW6432%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" ( set "vs_env_bat=%ProgramW6432%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" ) @@ -309,7 +359,7 @@ if not "%vs_env_bat%"=="" ( echo Activating "x64 Native Tools Command Prompt" terminal environment. call "%vs_env_bat%" || exit /b ) else ( - echo Could not find vcvars64.bat for VS 2022, aborting setup... + echo Could not find vcvars64.bat for VS, aborting setup... exit 1 ) @@ -319,9 +369,14 @@ rem make PythonAPI ARGS="--chrono" >python.log rem call %cd%\Build\dependencies\prerequisites\GnuWin32\bin\make launch ARGS="--chrono" -rem make launch ARGS="--chrono" >launch.log - -rem make package ARGS="--chrono" >package.log +if %launch% == true ( + echo Launching Unreal Editor, log to launch.log... + make launch ARGS="--chrono" >launch.log +) +if %package% == true ( + echo Packaging HUTB, log to package.log... + make package ARGS="--chrono" >package.log +)