diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 76e2546..50969c0 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -184,7 +184,7 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=MixedReality_Right_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y) -+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=OculusTouch_Right_A_Click) ++AxisMappings=(AxisName="TeleportAxis",Scale=1.000000,Key=OculusTouch_Right_A_Click) DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultInputComponentClass=/Script/Engine.InputComponent DefaultTouchInterface=None diff --git a/Content/Material/M_Vignette.uasset b/Content/Material/M_Vignette.uasset new file mode 100644 index 0000000..7d12cf3 --- /dev/null +++ b/Content/Material/M_Vignette.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8214ad76b37c3930d0d74074bb34aa07e224560dbeffa03622c74e932357bc0 +size 87673 diff --git a/Content/VRTemplate/Blueprints/VRPawn.uasset b/Content/VRTemplate/Blueprints/VRPawn.uasset index 4f19191..b38c05b 100644 --- a/Content/VRTemplate/Blueprints/VRPawn.uasset +++ b/Content/VRTemplate/Blueprints/VRPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f904284eb6b54554a213c1cbb07904e3946f292fc1829c2db2e5ec85f4e39f00 -size 689573 +oid sha256:5e8ead004c71d2a7668855b638cb58cec425a554bc0e9f45682f537defaa917b +size 720229 diff --git a/PackageBuild/Android_ASTC/Install_VR_HelloWorld-arm64.bat b/PackageBuild/Android_ASTC/Install_VR_HelloWorld-arm64.bat new file mode 100644 index 0000000..5bc8948 --- /dev/null +++ b/PackageBuild/Android_ASTC/Install_VR_HelloWorld-arm64.bat @@ -0,0 +1,51 @@ +setlocal +if NOT "%UE_SDKS_ROOT%"=="" (call %UE_SDKS_ROOT%\HostWin64\Android\SetupEnvironmentVars.bat) +set ANDROIDHOME=%ANDROID_HOME% +if "%ANDROIDHOME%"=="" set ANDROIDHOME=C:\Users\helenaso\AppData\Local\Android\Sdk +set ADB=%ANDROIDHOME%\platform-tools\adb.exe +set DEVICE= +if not "%1"=="" set DEVICE=-s %1 +for /f "delims=" %%A in ('%ADB% %DEVICE% shell "echo $EXTERNAL_STORAGE"') do @set STORAGE=%%A +@echo. +@echo Uninstalling existing application. Failures here can almost always be ignored. +%ADB% %DEVICE% uninstall com.epicgames.VR_HelloWorld +@echo. +@echo Installing existing application. Failures here indicate a problem with the device (connection or storage permissions) and are fatal. +%ADB% %DEVICE% install VR_HelloWorld-arm64.apk +@if "%ERRORLEVEL%" NEQ "0" goto Error +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/UE4CommandLine.txt +%ADB% %DEVICE% shell rm -r %STORAGE%/obb/com.epicgames.VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/Android/obb/com.epicgames.VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/Download/obb/com.epicgames.VR_HelloWorld + + + + + + + + + + + + + + +@echo. +@echo Grant READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE to the apk for reading OBB file or game file in external storage. +%ADB% %DEVICE% shell pm grant com.epicgames.VR_HelloWorld android.permission.READ_EXTERNAL_STORAGE +%ADB% %DEVICE% shell pm grant com.epicgames.VR_HelloWorld android.permission.WRITE_EXTERNAL_STORAGE + +@echo. +@echo Installation successful +goto:eof +:Error +@echo. +@echo There was an error installing the game or the obb file. Look above for more info. +@echo. +@echo Things to try: +@echo Check that the device (and only the device) is listed with "%ADB$ devices" from a command prompt. +@echo Make sure all Developer options look normal on the device +@echo Check that the device has an SD card. +@pause diff --git a/PackageBuild/Android_ASTC/Install_VR_HelloWorld-armv7.bat b/PackageBuild/Android_ASTC/Install_VR_HelloWorld-armv7.bat new file mode 100644 index 0000000..a0de80c --- /dev/null +++ b/PackageBuild/Android_ASTC/Install_VR_HelloWorld-armv7.bat @@ -0,0 +1,51 @@ +setlocal +if NOT "%UE_SDKS_ROOT%"=="" (call %UE_SDKS_ROOT%\HostWin64\Android\SetupEnvironmentVars.bat) +set ANDROIDHOME=%ANDROID_HOME% +if "%ANDROIDHOME%"=="" set ANDROIDHOME=C:\Users\helenaso\AppData\Local\Android\Sdk +set ADB=%ANDROIDHOME%\platform-tools\adb.exe +set DEVICE= +if not "%1"=="" set DEVICE=-s %1 +for /f "delims=" %%A in ('%ADB% %DEVICE% shell "echo $EXTERNAL_STORAGE"') do @set STORAGE=%%A +@echo. +@echo Uninstalling existing application. Failures here can almost always be ignored. +%ADB% %DEVICE% uninstall com.epicgames.VR_HelloWorld +@echo. +@echo Installing existing application. Failures here indicate a problem with the device (connection or storage permissions) and are fatal. +%ADB% %DEVICE% install VR_HelloWorld-armv7.apk +@if "%ERRORLEVEL%" NEQ "0" goto Error +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/UE4CommandLine.txt +%ADB% %DEVICE% shell rm -r %STORAGE%/obb/com.epicgames.VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/Android/obb/com.epicgames.VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/Download/obb/com.epicgames.VR_HelloWorld + + + + + + + + + + + + + + +@echo. +@echo Grant READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE to the apk for reading OBB file or game file in external storage. +%ADB% %DEVICE% shell pm grant com.epicgames.VR_HelloWorld android.permission.READ_EXTERNAL_STORAGE +%ADB% %DEVICE% shell pm grant com.epicgames.VR_HelloWorld android.permission.WRITE_EXTERNAL_STORAGE + +@echo. +@echo Installation successful +goto:eof +:Error +@echo. +@echo There was an error installing the game or the obb file. Look above for more info. +@echo. +@echo Things to try: +@echo Check that the device (and only the device) is listed with "%ADB$ devices" from a command prompt. +@echo Make sure all Developer options look normal on the device +@echo Check that the device has an SD card. +@pause diff --git a/PackageBuild/Android_ASTC/Uninstall_VR_HelloWorld-arm64.bat b/PackageBuild/Android_ASTC/Uninstall_VR_HelloWorld-arm64.bat new file mode 100644 index 0000000..6015e7d --- /dev/null +++ b/PackageBuild/Android_ASTC/Uninstall_VR_HelloWorld-arm64.bat @@ -0,0 +1,19 @@ +setlocal +if NOT "%UE_SDKS_ROOT%"=="" (call %UE_SDKS_ROOT%\HostWin64\Android\SetupEnvironmentVars.bat) +set ANDROIDHOME=%ANDROID_HOME% +if "%ANDROIDHOME%"=="" set ANDROIDHOME=C:\Users\helenaso\AppData\Local\Android\Sdk +set ADB=%ANDROIDHOME%\platform-tools\adb.exe +set DEVICE= +if not "%1"=="" set DEVICE=-s %1 +for /f "delims=" %%A in ('%ADB% %DEVICE% shell "echo $EXTERNAL_STORAGE"') do @set STORAGE=%%A +@echo. +@echo Uninstalling existing application. Failures here can almost always be ignored. +%ADB% %DEVICE% uninstall com.epicgames.VR_HelloWorld +@echo. +echo Removing old data. Failures here are usually fine - indicating the files were not on the device. +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/UE4CommandLine.txt +%ADB% %DEVICE% shell rm -r %STORAGE%/obb/com.epicgames.VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/Android/obb/com.epicgames.VR_HelloWorld +@echo. +@echo Uninstall completed diff --git a/PackageBuild/Android_ASTC/Uninstall_VR_HelloWorld-armv7.bat b/PackageBuild/Android_ASTC/Uninstall_VR_HelloWorld-armv7.bat new file mode 100644 index 0000000..6015e7d --- /dev/null +++ b/PackageBuild/Android_ASTC/Uninstall_VR_HelloWorld-armv7.bat @@ -0,0 +1,19 @@ +setlocal +if NOT "%UE_SDKS_ROOT%"=="" (call %UE_SDKS_ROOT%\HostWin64\Android\SetupEnvironmentVars.bat) +set ANDROIDHOME=%ANDROID_HOME% +if "%ANDROIDHOME%"=="" set ANDROIDHOME=C:\Users\helenaso\AppData\Local\Android\Sdk +set ADB=%ANDROIDHOME%\platform-tools\adb.exe +set DEVICE= +if not "%1"=="" set DEVICE=-s %1 +for /f "delims=" %%A in ('%ADB% %DEVICE% shell "echo $EXTERNAL_STORAGE"') do @set STORAGE=%%A +@echo. +@echo Uninstalling existing application. Failures here can almost always be ignored. +%ADB% %DEVICE% uninstall com.epicgames.VR_HelloWorld +@echo. +echo Removing old data. Failures here are usually fine - indicating the files were not on the device. +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/UE4Game/UE4CommandLine.txt +%ADB% %DEVICE% shell rm -r %STORAGE%/obb/com.epicgames.VR_HelloWorld +%ADB% %DEVICE% shell rm -r %STORAGE%/Android/obb/com.epicgames.VR_HelloWorld +@echo. +@echo Uninstall completed diff --git a/PackageBuild/Android_ASTC/VR_HelloWorld-arm64.apk b/PackageBuild/Android_ASTC/VR_HelloWorld-arm64.apk new file mode 100644 index 0000000..8e3dfc7 Binary files /dev/null and b/PackageBuild/Android_ASTC/VR_HelloWorld-arm64.apk differ diff --git a/PackageBuild/Android_ASTC/VR_HelloWorld-armv7.apk b/PackageBuild/Android_ASTC/VR_HelloWorld-armv7.apk new file mode 100644 index 0000000..f2047d6 Binary files /dev/null and b/PackageBuild/Android_ASTC/VR_HelloWorld-armv7.apk differ diff --git a/VR_HelloWorld.uproject b/VR_HelloWorld.uproject index 840e5d1..41b1adf 100644 --- a/VR_HelloWorld.uproject +++ b/VR_HelloWorld.uproject @@ -12,15 +12,6 @@ "Name": "ResonanceAudio", "Enabled": true }, - { - "Name": "OculusVR", - "Enabled": false, - "SupportedTargetPlatforms": [ - "Win32", - "Win64", - "Android" - ] - }, { "Name": "OpenXR", "Enabled": true,