teambeef/quakequest
0
0
Fork 0
mirror of https://github.com/DrBeef/QuakeQuest.git synced 2024-11-27 22:42:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Quit menu option fix

Browse source
This commit is contained in:
Simon 2022-12-23 10:39:26 +00:00
parent 3dcc4573a7
commit 865cbc11cc
5 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Projects/Android/jni/Android.mk
View file

@ -17,7 +17,8 @@ LOCAL_LDLIBS := -llog -landroid -lGLESv3 -lEGL -lOpenSLES # include default l
LOCAL_C_INCLUDES := ../QuakeQuestSrc/ \ LOCAL_C_INCLUDES := ../QuakeQuestSrc/ \
../darkplaces/ \ ../darkplaces/ \
$(SUPPORT_LIBS)/liboggvorbis/include \ $(SUPPORT_LIBS)/liboggvorbis/include \
$(TOP_DIR)/../../../../../3rdParty/khronos/openxr/OpenXR-SDK/include $(TOP_DIR)/../../../../../3rdParty/khronos/openxr/OpenXR-SDK/include \
$(TOP_DIR)/../../../../../OpenXR/Include
LOCAL_SHARED_LIBRARIES := openxr_loader libvorbis libogg libvorbis-jni LOCAL_SHARED_LIBRARIES := openxr_loader libvorbis libogg libvorbis-jni

3
Projects/Android/jni/QuakeQuestSrc/OpenXrInput_MetaQuest.c
View file

@ -1,7 +1,8 @@
#include "VrCommon.h"
#ifdef META_QUEST #ifdef META_QUEST
#include "VrCommon.h"
extern ovrApp gAppState; extern ovrApp gAppState;
XrSpace CreateActionSpace(XrAction poseAction, XrPath subactionPath) { XrSpace CreateActionSpace(XrAction poseAction, XrPath subactionPath) {

4
Projects/Android/jni/QuakeQuestSrc/OpenXrInput_PicoXR.c
View file

@ -1,7 +1,7 @@
#include "VrCommon.h"
#ifdef PICO_XR #ifdef PICO_XR
#include "VrCommon.h"
extern ovrApp gAppState; extern ovrApp gAppState;
XrResult CheckXrResult(XrResult res, const char* originator) { XrResult CheckXrResult(XrResult res, const char* originator) {

9
Projects/Android/jni/QuakeQuestSrc/QuakeQuest_OpenXR.c
View file

@ -305,7 +305,14 @@ void * AppThreadFunction(void * parm ) {
TBXR_submitFrame(); TBXR_submitFrame();
} }
{
TBXR_LeaveVR();
//Ask Java to shut down
VR_Shutdown();
exit(0); // in case Java doesn't do the job
}
return NULL; return NULL;
} }

1
Projects/Android/jni/QuakeQuestSrc/TBXR_Common.h
View file

@ -320,6 +320,7 @@ void TBXR_InitialiseOpenXR();
void TBXR_WaitForSessionActive(); void TBXR_WaitForSessionActive();
void TBXR_InitRenderer(); void TBXR_InitRenderer();
void TBXR_EnterVR(); void TBXR_EnterVR();
void TBXR_LeaveVR( );
void TBXR_GetScreenRes(int *width, int *height); void TBXR_GetScreenRes(int *width, int *height);
void TBXR_InitActions( void ); void TBXR_InitActions( void );
void TBXR_Vibrate(int duration, int channel, float intensity ); void TBXR_Vibrate(int duration, int channel, float intensity );