From c0fbe43f8d105df712ae033546d4fd76ece8be7b Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 27 Jan 2023 22:04:30 +0000 Subject: [PATCH] Some tidy up and improvement to selection of openxr_loader.so based on OPENXR_HMD --- Projects/Android/Android.iml | 122 ------------- Projects/Android/build.bat | 29 --- Projects/Android/build.py | 29 --- Projects/Android/gradlew | 172 ------------------ Projects/Android/gradlew.bat | 84 --------- Projects/Android/jni/Android.mk | 8 +- Projects/Android/jni/Application.mk | 7 +- .../Android/jni/QuakeQuestSrc/OpenXrInput.c | 2 + Projects/AndroidPrebuilt/jni/Android.mk | 29 +++ Projects/Projects.iml | 27 --- XrSamples-QuakeQuest.iml | 27 --- 11 files changed, 36 insertions(+), 500 deletions(-) delete mode 100644 Projects/Android/Android.iml delete mode 100644 Projects/Android/build.bat delete mode 100644 Projects/Android/build.py delete mode 100644 Projects/Android/gradlew delete mode 100644 Projects/Android/gradlew.bat create mode 100644 Projects/AndroidPrebuilt/jni/Android.mk delete mode 100644 Projects/Projects.iml delete mode 100644 XrSamples-QuakeQuest.iml diff --git a/Projects/Android/Android.iml b/Projects/Android/Android.iml deleted file mode 100644 index 6ec0846..0000000 --- a/Projects/Android/Android.iml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/Android/build.bat b/Projects/Android/build.bat deleted file mode 100644 index facf79f..0000000 --- a/Projects/Android/build.bat +++ /dev/null @@ -1,29 +0,0 @@ -@rem Only edit the master copy of this file in SDK_ROOT/bin/scripts/build/perproject - -@setlocal enableextensions enabledelayedexpansion - -@if not exist "build.gradle" @echo Build script must be executed from project directory. & goto :Abort - -@set P=.. - -:TryAgain - -@rem @echo P = %P% - -@if exist "%P%\bin\scripts\build\build.py.bat" goto :Found - -@if exist "%P%\bin\scripts\build" @echo "Could not find build.py.bat" & goto :Abort - -@set P=%P%\.. - -@goto :TryAgain - -:Found - -@set P=%P%\bin\scripts\build -@call %P%\build.py.bat %1 %2 %3 %4 %5 -@goto :End - -:Abort - -:End diff --git a/Projects/Android/build.py b/Projects/Android/build.py deleted file mode 100644 index 36335c3..0000000 --- a/Projects/Android/build.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/python - -# This first bit of code is common bootstrapping code -# to determine the SDK root, and to set up the import -# path for additional python code. - -#begin bootstrap -import os -import sys - -def init(): - root = os.path.realpath( os.path.dirname(os.path.realpath(__file__) ) ) - os.chdir(root) # make sure we are always executing from the project directory - while( os.path.isdir( os.path.join(root, 'bin/scripts/build') ) == False ): - root = os.path.realpath( os.path.join(root, '..') ) - if( len(root) <= 5 ): # Should catch both Posix and Windows root directories (e.g. '/' and 'C:\') - print('Unable to find SDK root. Exiting.') - sys.exit(1) - root = os.path.abspath(root) - os.environ['OCULUS_SDK_PATH'] = root - sys.path.append( root + "/bin/scripts/build" ) - -init() -import ovrbuild -ovrbuild.init() -#end bootstrap - - -ovrbuild.build() diff --git a/Projects/Android/gradlew b/Projects/Android/gradlew deleted file mode 100644 index cccdd3d..0000000 --- a/Projects/Android/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/Projects/Android/gradlew.bat b/Projects/Android/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/Projects/Android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Projects/Android/jni/Android.mk b/Projects/Android/jni/Android.mk index a6bdcb1..0664f69 100644 --- a/Projects/Android/jni/Android.mk +++ b/Projects/Android/jni/Android.mk @@ -7,10 +7,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Uncomment for the correct headset - slight changes required in OpenXR implementation -OPENXR_HMD = -DMETA_QUEST -#OPENXR_HMD = -DPICO_XR +OPENXR_HMD = META_QUEST +#OPENXR_HMD = PICO_XR -LOCAL_CFLAGS := $(OPENXR_HMD) +LOCAL_CFLAGS := -D$(OPENXR_HMD) LOCAL_MODULE := quakequest LOCAL_LDLIBS := -llog -landroid -lGLESv3 -lEGL -lOpenSLES # include default libraries @@ -144,4 +144,4 @@ LOCAL_SRC_FILES := \ include $(BUILD_SHARED_LIBRARY) include $(SUPPORT_LIBS)/liboggvorbis/Android.mk -$(call import-module,OpenXR/Projects/AndroidPrebuilt/jni) \ No newline at end of file +$(call import-module,AndroidPrebuilt/jni) diff --git a/Projects/Android/jni/Application.mk b/Projects/Android/jni/Application.mk index 0fd7759..c556377 100644 --- a/Projects/Android/jni/Application.mk +++ b/Projects/Android/jni/Application.mk @@ -1,14 +1,9 @@ -# MAKEFILE_LIST specifies the current used Makefiles, of which this is the last -# one. I use that to obtain the Application.mk dir then import the root -# Application.mk. -ROOT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))../../../../.. -NDK_MODULE_PATH := $(ROOT_DIR) - APP_PLATFORM := android-24 APP_CFLAGS += -Wl,--no-undefined APPLICATIONMK_PATH = $(call my-dir) +NDK_MODULE_PATH := $(APPLICATIONMK_PATH)/../.. TOP_DIR := $(APPLICATIONMK_PATH) SUPPORT_LIBS := $(APPLICATIONMK_PATH)/SupportLibs diff --git a/Projects/Android/jni/QuakeQuestSrc/OpenXrInput.c b/Projects/Android/jni/QuakeQuestSrc/OpenXrInput.c index c20546b..86816a5 100644 --- a/Projects/Android/jni/QuakeQuestSrc/OpenXrInput.c +++ b/Projects/Android/jni/QuakeQuestSrc/OpenXrInput.c @@ -439,6 +439,7 @@ void TBXR_UpdateControllers( ) //button mapping leftTrackedRemoteState_new.Buttons = 0; + leftTrackedRemoteState_new.Touches = 0; if (GetActionStateBoolean(backAction, SIDE_LEFT).currentState) leftTrackedRemoteState_new.Buttons |= xrButton_Enter; if (GetActionStateBoolean(XAction, SIDE_LEFT).currentState) leftTrackedRemoteState_new.Buttons |= xrButton_X; if (GetActionStateBoolean(XTouchAction, SIDE_LEFT).currentState) leftTrackedRemoteState_new.Touches |= xrButton_X; @@ -456,6 +457,7 @@ void TBXR_UpdateControllers( ) if (GetActionStateBoolean(ThumbrestTouchAction, SIDE_LEFT).currentState) leftTrackedRemoteState_new.Touches |= xrButton_ThumbRest; rightTrackedRemoteState_new.Buttons = 0; + rightTrackedRemoteState_new.Touches = 0; if (GetActionStateBoolean(backAction, SIDE_RIGHT).currentState) rightTrackedRemoteState_new.Buttons |= xrButton_Enter; if (GetActionStateBoolean(AAction, SIDE_RIGHT).currentState) rightTrackedRemoteState_new.Buttons |= xrButton_A; if (GetActionStateBoolean(ATouchAction, SIDE_RIGHT).currentState) rightTrackedRemoteState_new.Touches |= xrButton_A; diff --git a/Projects/AndroidPrebuilt/jni/Android.mk b/Projects/AndroidPrebuilt/jni/Android.mk new file mode 100644 index 0000000..60f9434 --- /dev/null +++ b/Projects/AndroidPrebuilt/jni/Android.mk @@ -0,0 +1,29 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := openxr_loader + +ifeq ($(NDK_DEBUG),1) + BUILDTYPE := Debug +else + BUILDTYPE := Release +endif + + +# Meta provide Debug and Release libraries +ifeq ($(OPENXR_HMD),META_QUEST) + LOCAL_SRC_FILES := ../../../../../OpenXR/Libs/Android/$(TARGET_ARCH_ABI)/$(BUILDTYPE)/lib$(LOCAL_MODULE).so +endif + +# Pico only provide the one loader +ifeq ($(OPENXR_HMD),PICO_XR) + LOCAL_SRC_FILES := ../../../../../OpenXR/libs/android.$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so +endif + + +# NOTE: This check is added to prevent the following error when running a "make clean" where +# the prebuilt lib may have been deleted: "LOCAL_SRC_FILES points to a missing file" +ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES))) + include $(PREBUILT_SHARED_LIBRARY) +endif diff --git a/Projects/Projects.iml b/Projects/Projects.iml deleted file mode 100644 index 4cfaa76..0000000 --- a/Projects/Projects.iml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/XrSamples-QuakeQuest.iml b/XrSamples-QuakeQuest.iml deleted file mode 100644 index 9a0b9bb..0000000 --- a/XrSamples-QuakeQuest.iml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file