mirror of
https://github.com/DrBeef/ioq3quest.git
synced 2024-11-29 07:11:44 +00:00
52799aa99d
commit0adeb4ba3b
Merge:7feea565
d8653ad7
Author: Simon <simonbrown77@googlemail.com> Date: Sat May 7 14:32:21 2022 +0100 Merge branch 'OpenXR' of https://github.com/DrBeef/ioq3quest into OpenXR commit7feea56514
Author: Simon <simonbrown77@googlemail.com> Date: Sat May 7 14:32:14 2022 +0100 Update Version Number commitd8653ad70e
Merge:79983b2b
7e6aa6da
Author: Simon <simonbrown77@googlemail.com> Date: Sat May 7 14:31:45 2022 +0100 Merge pull request #76 from lvonasek/OpenXR OpenXR delayed controller pose fixed commit79983b2bc5
Merge:325641f9
7f89d6d1
Author: Simon <simonbrown77@googlemail.com> Date: Sat May 7 14:31:31 2022 +0100 Merge pull request #77 from petr666/OpenXR Update gamma values to better suit OpenXR build commit7f89d6d19b
Author: Petr Bartos <petr.bartos@plus4u.net> Date: Sat May 7 13:56:03 2022 +0200 Update gamma values to better suit OpenXR build commit7e6aa6dab8
Author: Lubos <tridosm@gmail.com> Date: Sat May 7 11:32:11 2022 +0200 OpenXR sync actions before updating controllers commit027a7e96c3
Author: Lubos <tridosm@gmail.com> Date: Fri May 6 10:34:50 2022 +0200 OpenXR implement controller velocity again commitaf80d5c284
Author: Lubos <tridosm@gmail.com> Date: Fri May 6 10:18:51 2022 +0200 Compile fix commitab1e853554
Author: Lubos <tridosm@gmail.com> Date: Fri May 6 10:14:08 2022 +0200 OpenXR input cleanup commitbe158b4ad9
Author: Lubos <tridosm@gmail.com> Date: Fri May 6 09:39:49 2022 +0200 OpenXR sync input actions from renderer commited96160ffc
Author: Lubos <tridosm@gmail.com> Date: Fri May 6 09:25:59 2022 +0200 OpenXR do not use pose velocity to track controllers commit42bf984ef8
Author: Lubos <tridosm@gmail.com> Date: Thu May 5 22:39:10 2022 +0200 OpenXR apply controller pose from renderer commit92941b3547
Author: Lubos <tridosm@gmail.com> Date: Thu May 5 22:26:33 2022 +0200 OpenXR delayed controller pose fixed commit325641f90e
Merge:de198fba
3ee3f590
Author: Simon <simonbrown77@googlemail.com> Date: Thu May 5 16:30:07 2022 +0100 Merge pull request #75 from lvonasek/OpenXR OpenXR menuyaw and recenter support added commit3ee3f59058
Author: Lubos <tridosm@gmail.com> Date: Thu May 5 12:22:36 2022 +0200 OpenXR do not recenter on renderer reload commit7072b0b89e
Author: Lubos <tridosm@gmail.com> Date: Wed May 4 21:05:45 2022 +0200 OpenXR recenter sets yaw always to 0 commit8e5f6414a6
Author: Lubos <tridosm@gmail.com> Date: Wed May 4 16:19:48 2022 +0200 OpenXR recenter integrated commit08a4fc7fbf
Author: Lubos <tridosm@gmail.com> Date: Tue May 3 18:37:28 2022 +0200 OpenXR use the same coordinate system in all layers commita1de0e1ffe
Author: Lubos <tridosm@gmail.com> Date: Mon May 2 22:17:53 2022 +0200 OpenXR menuYaw support added commitde198fba0d
Author: Simon <simonbrown77@googlemail.com> Date: Mon May 2 10:01:42 2022 +0100 Update version numbers and add openxr identifier commitb83f99fe5b
Merge:c623bf13
9c14728b
Author: Simon <simonbrown77@googlemail.com> Date: Mon May 2 09:43:47 2022 +0100 Merge pull request #74 from lvonasek/OpenXR OpenXR left controller mapping fixed commit9c14728bc9
Merge:11a849b1
0695c7ac
Author: Lubos <tridosm@gmail.com> Date: Sun May 1 19:41:45 2022 +0200 Merge branch 'master' into OpenXR commit11a849b189
Author: Lubos <tridosm@gmail.com> Date: Sun May 1 19:09:12 2022 +0200 OpenXR controller mapping fixed commit712584eae8
Merge:df4bc0c0
c623bf13
Author: Luboš Vonásek <tridosm@gmail.com> Date: Sun May 1 19:04:45 2022 +0200 Merge branch 'DrBeef:OpenXR' into OpenXR commitc623bf1399
Merge:cb152467
e42a2f4e
Author: Simon <simonbrown77@googlemail.com> Date: Sun May 1 14:10:23 2022 +0100 Merge pull request #72 from lvonasek/OpenXR OpenXR jitter fixed commite42a2f4e0d
Author: Lubos <tridosm@gmail.com> Date: Sun May 1 14:34:38 2022 +0200 Compile fix commitacbff1e736
Author: Lubos <tridosm@gmail.com> Date: Sun May 1 13:59:41 2022 +0200 OpenXR camera view moved into renderer commitcb152467ba
Merge:decc2d02
26071937
Author: Simon <simonbrown77@googlemail.com> Date: Sun May 1 10:20:40 2022 +0100 Merge pull request #69 from lvonasek/feature_openxr OpenXR integration commit26071937c8
Author: Lubos <tridosm@gmail.com> Date: Sun May 1 11:17:50 2022 +0200 OpenXR frameskip integrated commitf735535dce
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 30 22:57:48 2022 +0200 OpenXR attempt to fix flickering commit0eb1d43b4a
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 30 21:28:26 2022 +0200 2D aspect ratio fixed commit9d07c27604
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 30 21:23:53 2022 +0200 Hud model rendering fixed commit30c9b4eaa0
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 30 17:03:54 2022 +0200 Release build fixed commit405ca571ad
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 30 14:10:27 2022 +0200 OpenXR foveation removed commit61b3192bce
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 30 14:02:21 2022 +0200 OpenXR projection matrix calculation from example code commitecd50dbcb1
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 29 21:21:10 2022 +0200 OpenXR low framerate fixed commitf5a8429fc1
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 29 19:21:29 2022 +0200 Solution for black rectangles in the scene commit9ae93a5fe9
Merge:10548445
decc2d02
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 29 14:58:35 2022 +0200 Merge branch 'master' into feature_openxr commit1054844524
Merge:65e2031e
3cdf1858
Author: Lubos <tridosm@gmail.com> Date: Wed Apr 27 21:52:55 2022 +0200 Merge branch 'master' into feature_openxr commit65e2031e95
Author: Lubos <tridosm@gmail.com> Date: Tue Apr 26 22:02:04 2022 +0200 OpenXR integration fixes commitc321b97894
Author: Lubos <tridosm@gmail.com> Date: Mon Apr 25 16:48:09 2022 +0200 OpenXR multiview integrated commit5947168966
Author: Lubos <tridosm@gmail.com> Date: Sun Apr 24 20:25:19 2022 +0200 OpenXR minor fixes commit249847930b
Author: Lubos <tridosm@gmail.com> Date: Sun Apr 24 18:06:02 2022 +0200 OpenXR use just one framebuffer commitb11122e368
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 23 21:06:35 2022 +0200 OpenXR touch controllers completely implemented commit0bf485664c
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 23 19:44:18 2022 +0200 OpenXR haptics and refreshrate fixed commit4716387e52
Author: Lubos <tridosm@gmail.com> Date: Sat Apr 23 15:54:07 2022 +0200 OpenXR input except buttons implemented commit7bd1fe31c2
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 21:18:49 2022 +0200 OpenXR input in progress commit3c26e08f01
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 18:41:26 2022 +0200 Old code removed commit4d2644cae2
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 18:32:42 2022 +0200 OpenXR fov fixed commit501869a051
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 17:56:14 2022 +0200 OpenXR motion tracking in game mode added commitb152d21ddc
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 16:14:36 2022 +0200 OpenXR cylinder projection added commit3e9c80679e
Merge:0de4a0d1
39f669dd
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 14:13:18 2022 +0200 Merge branch 'master' into feature_openxr commit0de4a0d196
Author: Lubos <tridosm@gmail.com> Date: Fri Apr 22 13:45:22 2022 +0200 OpenXR tracking added init, first working rendering commit8431b1aa83
Author: Lubos <tridosm@gmail.com> Date: Thu Apr 21 21:15:02 2022 +0200 OpenXR add missing foveation commit4ff90d8ba0
Author: Lubos <tridosm@gmail.com> Date: Thu Apr 21 21:00:02 2022 +0200 OpenXR renderer cleanup commitd736af15bd
Merge:7b9d51ec
fe180129
Author: Lubos <tridosm@gmail.com> Date: Thu Mar 31 17:47:45 2022 +0200 Merge branch 'master' into feature_openxr commit7b9d51ec30
Author: Lubos <tridosm@gmail.com> Date: Thu Mar 31 17:47:36 2022 +0200 OpenXR renderer in progress commite7a2229edc
Merge:abeaf046
bcf9287a
Author: Lubos <tridosm@gmail.com> Date: Wed Mar 30 09:44:15 2022 +0200 Merge branch 'master' into feature_openxr commitabeaf04607
Author: Lubos <tridosm@gmail.com> Date: Tue Mar 29 19:57:47 2022 +0200 OpenXR initialization fixed commitf2fefbf708
Author: Lubos <tridosm@gmail.com> Date: Tue Mar 29 17:13:48 2022 +0200 OpenXR initialization added commit96bf69cb15
Author: Lubos <tridosm@gmail.com> Date: Tue Mar 29 12:56:37 2022 +0200 VR API removed
126 lines
2.8 KiB
Batchfile
126 lines
2.8 KiB
Batchfile
@echo off
|
|
|
|
setlocal
|
|
|
|
set BUILD_TYPE=release
|
|
set VERSION=0.32.1-openxr
|
|
|
|
@REM Define the following environment variables to sign a release build
|
|
@REM set KEYSTORE=
|
|
@REM set KEYSTORE_PASS=
|
|
|
|
|
|
set ANDROID_SDK_ROOT=%AppData%\..\Local\Android\Sdk
|
|
set adb="%ANDROID_SDK_ROOT%\platform-tools\adb.exe"
|
|
set make="%ANDROID_SDK_ROOT%\ndk\21.1.6352462\prebuilt\windows-x86_64\bin\make.exe"
|
|
set apksigner="%ANDROID_SDK_ROOT%\build-tools\29.0.2\apksigner.bat"
|
|
set JAVA_HOME=C:\Program Files\Android\Android Studio\jre\jre
|
|
|
|
if "%1"=="clean" (
|
|
rm -rf .\build
|
|
rm -rf .\android\build
|
|
rm -rf .\android\app\src\main\jniLibs\arm64-v8a
|
|
)
|
|
|
|
if %BUILD_TYPE%==release (
|
|
set GRADLE_BUILD_TYPE=:app:assembleRelease
|
|
)
|
|
if %BUILD_TYPE%==debug (
|
|
set GRADLE_BUILD_TYPE=:app:assembleDebug
|
|
)
|
|
|
|
REM package our special pk3
|
|
pushd android\app\src\main
|
|
call make_pakQ3Q.bat
|
|
popd
|
|
|
|
echo #define Q3QVERSION "%VERSION%" > .\android\app\src\main\cpp\code\vr\vr_version.h
|
|
|
|
pushd %~dp0\..
|
|
%make% -j %NUMBER_OF_PROCESSORS% %BUILD_TYPE%
|
|
|
|
if %ERRORLEVEL% NEQ 0 (
|
|
popd
|
|
echo "Failed to build ioq3"
|
|
exit /b 1
|
|
)
|
|
|
|
pushd android
|
|
|
|
set GRADLE_EXIT_CONSOLE=1
|
|
call gradlew.bat %GRADLE_BUILD_TYPE%
|
|
|
|
if %ERRORLEVEL% NEQ 0 (
|
|
popd
|
|
popd
|
|
echo "Failed to build android project"
|
|
exit /b 1
|
|
)
|
|
|
|
set PACKAGE_NAME=com.drbeef.ioq3quest
|
|
set ANDROID_STORAGE_LOCATION=/sdcard/ioquake3quest/
|
|
set APK_LOCATION=.\app\build\outputs\apk\%BUILD_TYPE%\ioq3quest-%BUILD_TYPE%-%VERSION%.apk
|
|
|
|
if %BUILD_TYPE%==release (
|
|
echo "Signing Release APK"
|
|
call %apksigner% sign --ks ../%KEYSTORE% --out %APK_LOCATION% --v2-signing-enabled true --ks-pass pass:%KEYSTORE_PASS% .\app\build\outputs\apk\%BUILD_TYPE%\app-%BUILD_TYPE%-unsigned.apk
|
|
)
|
|
|
|
if %BUILD_TYPE%==debug (
|
|
echo "Copying Debug APK"
|
|
copy .\app\build\outputs\apk\%BUILD_TYPE%\app-%BUILD_TYPE%.apk %APK_LOCATION%
|
|
)
|
|
|
|
if "%1"=="nodeploy" (
|
|
goto :END
|
|
)
|
|
|
|
%adb% install -r %APK_LOCATION%
|
|
if %ERRORLEVEL% NEQ 0 (
|
|
%adb% uninstall %PACKAGE_NAME%
|
|
%adb% install %APK_LOCATION%
|
|
if %ERRORLEVEL% NEQ 0 (
|
|
popd
|
|
popd
|
|
echo "Failed to install apk."
|
|
exit /b 1
|
|
)
|
|
)
|
|
|
|
@REM %adb% shell mkdir -p %ANDROID_STORAGE_LOCATION%
|
|
@REM %adb% push --sync "D:\Program Files (x86)\Steam\steamapps\common\Quake 3 Arena\baseq3" %ANDROID_STORAGE_LOCATION%
|
|
@REM if %ERRORLEVEL% NEQ 0 (
|
|
@REM popd
|
|
@REM popd
|
|
@REM echo "Failed to transfer files."
|
|
@REM exit /b 1
|
|
@REM )
|
|
|
|
@REM %adb% push --sync ..\code\renderergl2\glsl %ANDROID_STORAGE_LOCATION%/baseq3/
|
|
@REM if %ERRORLEVEL% NEQ 0 (
|
|
@REM popd
|
|
@REM popd
|
|
@REM echo "Failed to transfer shaders."
|
|
@REM exit /b 1
|
|
@REM )
|
|
|
|
@REM %adb% push --sync autoexec.cfg %ANDROID_STORAGE_LOCATION%/baseq3/
|
|
@REM if %ERRORLEVEL% NEQ 0 (
|
|
@REM popd
|
|
@REM popd
|
|
@REM echo "Failed to transfer autoexec."
|
|
@REM exit /b 1
|
|
@REM )
|
|
|
|
%adb% logcat -c
|
|
%adb% shell am start -n %PACKAGE_NAME%/.MainActivity
|
|
if %ERRORLEVEL% NEQ 0 (
|
|
popd
|
|
popd
|
|
echo "Failed to start application."
|
|
exit 1
|
|
)
|
|
%adb% logcat *:S Quake3:V SDL:V DEBUG:V
|
|
|
|
:END
|
|
endlocal
|