From 52c9389f7b2acf92b6f935237ee64056c0bb8c44 Mon Sep 17 00:00:00 2001 From: Andron666 <> Date: Thu, 20 Apr 2023 16:10:31 +0500 Subject: [PATCH] =?UTF-8?q?=D1=84=D1=8B=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Blueprints/Player/MyPC.uasset | Bin 303225 -> 300761 bytes .../Inc/EasyXMLParser/UHT/Timestamp | 8 +- .../WebServers/get_ps_servers.bat | 110 ++++++++++++++++++ .../WebServers/get_ps_servers.sh | 93 +++++++++++++++ lifeResidence.uproject | 4 + 5 files changed, 211 insertions(+), 4 deletions(-) create mode 100644 Samples/PixelStreaming/WebServers/get_ps_servers.bat create mode 100644 Samples/PixelStreaming/WebServers/get_ps_servers.sh diff --git a/Content/Blueprints/Player/MyPC.uasset b/Content/Blueprints/Player/MyPC.uasset index 42c77357226500eba1d53529b4364445d1708f47..014d094d6a0bcb1b28830e1445f79a6a8229aa00 100644 GIT binary patch delta 4167 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 diff --git a/Plugins/EasyXMLParser/Intermediate/Build/Win64/UnrealGame/Inc/EasyXMLParser/UHT/Timestamp b/Plugins/EasyXMLParser/Intermediate/Build/Win64/UnrealGame/Inc/EasyXMLParser/UHT/Timestamp index c43fc8ad..f978f991 100644 --- a/Plugins/EasyXMLParser/Intermediate/Build/Win64/UnrealGame/Inc/EasyXMLParser/UHT/Timestamp +++ b/Plugins/EasyXMLParser/Intermediate/Build/Win64/UnrealGame/Inc/EasyXMLParser/UHT/Timestamp @@ -1,7 +1,7 @@ -E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLAsyncLoadFromFile.h -E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLElement.h E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLAsyncLoadFromString.h -E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLParseManager.h +E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLAsyncLoadFromFile.h E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLAttribute.h -E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLParserEnums.h +E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLElement.h +E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLParseManager.h E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLObject.h +E:\Projects\dron666_lifeResidence\Plugins\EasyXMLParser\Source\EasyXMLParser\Public\EasyXMLParserEnums.h diff --git a/Samples/PixelStreaming/WebServers/get_ps_servers.bat b/Samples/PixelStreaming/WebServers/get_ps_servers.bat new file mode 100644 index 00000000..d816f11f --- /dev/null +++ b/Samples/PixelStreaming/WebServers/get_ps_servers.bat @@ -0,0 +1,110 @@ +@Rem Copyright Epic Games, Inc. All Rights Reserved. + +@echo off + +@Rem Set script location as working directory for commands. +pushd "%~dp0" + +:arg_loop_start +SET ARG=%1 +if DEFINED ARG ( + if "%ARG%"=="/h" ( + goto print_help + ) + if "%ARG%"=="/v" ( + SET UEVersion=%2 + SHIFT + ) + if "%ARG%"=="/b" ( + SET PSInfraTagOrBranch=%2 + SET IsTag=0 + SHIFT + ) + if "%ARG%"=="/t" ( + SET PSInfraTagOrBranch=%2 + SET IsTag=1 + SHIFT + ) + SHIFT + goto arg_loop_start +) + +@Rem Name and version of ps-infra that we are downloading +SET PSInfraOrg=EpicGames +SET PSInfraRepo=PixelStreamingInfrastructure + +@Rem If a UE version is supplied set the right branch or tag to fetch for that version of UE +if DEFINED UEVersion ( + if "%UEVersion%"=="4.26" ( + SET PSInfraTagOrBranch=UE4.26 + SET IsTag=0 + ) + if "%UEVersion%"=="4.27" ( + SET PSInfraTagOrBranch=UE4.27 + SET IsTag=0 + ) + if "%UEVersion%"=="5.0" ( + SET PSInfraTagOrBranch=UE5.0 + SET IsTag=0 + ) +) + +@Rem If no arguments select a specific version, fetch the appropriate default +if NOT DEFINED PSInfraTagOrBranch ( + SET PSInfraTagOrBranch=master + SET IsTag=0 +) + +@Rem Whether the named reference is a tag or a branch affects the URL we fetch it on +if %IsTag%==1 ( + SET RefType=tags +) else ( + SET RefType=heads +) + +@Rem Look for a SignallingWebServer directory next to this script +if exist SignallingWebServer\ ( + echo SignallingWebServer directory found...skipping install. +) else ( + echo SignallingWebServer directory not found...beginning ps-infra download. + + @Rem Download ps-infra and follow redirects. + curl -L https://github.com/%PSInfraOrg%/%PSInfraRepo%/archive/refs/%RefType%/%PSInfraTagOrBranch%.zip > ps-infra.zip + + @Rem Unarchive the .zip + tar -xmf ps-infra.zip || echo bad archive, contents: && type ps-infra.zip && exit 0 + + @Rem Rename the extracted, versioned, directory + for /d %%i in ("PixelStreamingInfrastructure-*") do ( + for /d %%j in ("%%i/*") do ( + echo "%%i\%%j" + move "%%i\%%j" . + ) + for %%j in ("%%i/*") do ( + echo "%%i\%%j" + move "%%i\%%j" . + ) + + echo "%%i" + rmdir /s /q "%%i" + ) + + @Rem Delete the downloaded zip + del ps-infra.zip +) + +exit 0 + +:print_help +echo. +echo Tool for fetching PixelStreaming Infrastructure. If no flags are set specifying a version to fetch, +echo the recommended version will be chosen as a default. +echo. +echo Usage: +echo %~n0%~x0 [^/h] [^/v ^] [^/b ^] [^/t ^] +echo Where: +echo /v Specify a version of Unreal Engine to download the recommended release for +echo /b Specify a specific branch for the tool to download from repo +echo /t Specify a specific tag for the tool to download from repo +echo /h Display this help message +exit 1 \ No newline at end of file diff --git a/Samples/PixelStreaming/WebServers/get_ps_servers.sh b/Samples/PixelStreaming/WebServers/get_ps_servers.sh new file mode 100644 index 00000000..a402611c --- /dev/null +++ b/Samples/PixelStreaming/WebServers/get_ps_servers.sh @@ -0,0 +1,93 @@ +#!/bin/bash +# Copyright Epic Games, Inc. All Rights Reserved. + +BASH_LOCATION=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +pushd "${BASH_LOCATION}" > /dev/null + +print_help() { + echo " + Tool for fetching PixelStreaming Infrastructure. If no flags are set specifying a version to fetch, + the recommended version will be chosen as a default. + + Usage: + ${0} [-h] [-v ] [-b ] [-t ] + Where: + -v Specify a version of Unreal Engine to download the recommended + release for + -b Specify a specific branch for the tool to download from repo + -t Specify a specific tag for the tool to download from repo + -h Display this help message +" + exit 1 +} + +while(($#)) ; do + case "$1" in + -h ) print_help;; + -v ) UEVersion="$2"; shift 2;; + -b ) PSInfraTagOrBranch="$2"; IsTag=0; shift 2;; + -t ) PSInfraTagOrBranch="$2"; IsTag=1; shift 2;; + * ) echo "Unknown command: $1"; shift;; + esac + done + +# Name and version of ps-infra that we are downloading +PSInfraOrg=EpicGames +PSInfraRepo=PixelStreamingInfrastructure + +# If a UE version is supplied set the right branch or tag to fetch for that version of UE +if [ ! -z "$UEVersion" ] +then + if [ "$UEVersion" = "4.26" ] + then + PSInfraTagOrBranch=UE4.26 + IsTag=0 + fi + if [ "$UEVersion" = "4.27" ] + then + PSInfraTagOrBranch=UE4.27 + IsTag=0 + fi + if [ "$UEVersion" = "5.0" ] + then + PSInfraTagOrBranch=UE5.0 + IsTag=0 + fi +fi + +# If no arguments select a specific version, fetch the appropriate default +if [ -z "$PSInfraTagOrBranch" ] +then + PSInfraTagOrBranch=master + IsTag=0 +fi + +# Whether the named reference is a tag or a branch affects the URL we fetch it on +if [ "$IsTag" -eq 1 ] +then + RefType=tags +else + RefType=heads +fi + +# Look for a SignallingWebServer directory next to this script +if [ -d SignallingWebServer ] +then + echo "SignallingWebServer directory found...skipping install." +else + echo "SignallingWebServer directory not found...beginning ps-infra download." + + # Download ps-infra and follow redirects. + curl -L https://github.com/$PSInfraOrg/$PSInfraRepo/archive/refs/$RefType/$PSInfraTagOrBranch.tar.gz > ps-infra.tar.gz + + # Unarchive the .tar + tar -xmf ps-infra.tar.gz || $(echo "bad archive, contents:" && head --lines=20 ps-infra.tar.gz && exit 0) + + # Move the server folders into the current directory (WebServers) and delete the original directory + mv PixelStreamingInfrastructure-*/* . + rm -rf PixelStreamingInfrastructure-* + + # Delete the downloaded tar + rm ps-infra.tar.gz +fi \ No newline at end of file diff --git a/lifeResidence.uproject b/lifeResidence.uproject index 71e72367..d0d31596 100644 --- a/lifeResidence.uproject +++ b/lifeResidence.uproject @@ -221,6 +221,10 @@ "Name": "VaRest", "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/e47be161e7a24e928560290abd5dcc4f" + }, + { + "Name": "PixelStreaming", + "Enabled": true } ], "TargetPlatforms": [