From 4b75af0e31ffba47bd739b53b4455294faaa1563 Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Tue, 17 Jan 2023 14:02:09 +0100 Subject: [PATCH 1/2] Include library for OpenXR v47 --- Projects/Android/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Projects/Android/jni/Android.mk b/Projects/Android/jni/Android.mk index 9eeacef..b8812ac 100644 --- a/Projects/Android/jni/Android.mk +++ b/Projects/Android/jni/Android.mk @@ -18,6 +18,7 @@ LOCAL_C_INCLUDES := ../QuakeQuestSrc/ \ ../darkplaces/ \ $(SUPPORT_LIBS)/liboggvorbis/include \ $(TOP_DIR)/../../../../../3rdParty/khronos/openxr/OpenXR-SDK/include \ + $(TOP_DIR)/../../../../../3rdParty/khronos/openxr/OpenXR-SDK/src/common \ $(TOP_DIR)/../../../../../OpenXR/Include From 7bdba7ac1d05aa7471367b5f583f60fbf96cd4ad Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Tue, 17 Jan 2023 14:33:12 +0100 Subject: [PATCH 2/2] Defaults for SS and Brightness SS 1.3 r_hdr_scenebrightness 1.4 on both devices --- Projects/Android/jni/QuakeQuestSrc/TBXR_Common.c | 2 +- Projects/Android/jni/darkplaces/gl_rmain.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Projects/Android/jni/QuakeQuestSrc/TBXR_Common.c b/Projects/Android/jni/QuakeQuestSrc/TBXR_Common.c index b68c196..17a7918 100644 --- a/Projects/Android/jni/QuakeQuestSrc/TBXR_Common.c +++ b/Projects/Android/jni/QuakeQuestSrc/TBXR_Common.c @@ -50,7 +50,7 @@ PFNEGLGETSYNCATTRIBKHRPROC eglGetSyncAttribKHR; //Let's go to the maximum! int NUM_MULTI_SAMPLES = 1; int REFRESH = 0; -float SS_MULTIPLIER = 1.5f; +float SS_MULTIPLIER = 1.3f; GLboolean stageSupported = GL_FALSE; diff --git a/Projects/Android/jni/darkplaces/gl_rmain.c b/Projects/Android/jni/darkplaces/gl_rmain.c index 47607ca..d981bb5 100644 --- a/Projects/Android/jni/darkplaces/gl_rmain.c +++ b/Projects/Android/jni/darkplaces/gl_rmain.c @@ -226,12 +226,9 @@ cvar_t r_bloom_colorexponent = {CVAR_SAVE, "r_bloom_colorexponent", "1", "how ex cvar_t r_bloom_colorsubtract = {CVAR_SAVE, "r_bloom_colorsubtract", "0.125", "reduces bloom colors by a certain amount"}; cvar_t r_bloom_scenebrightness = {CVAR_SAVE, "r_bloom_scenebrightness", "1", "global rendering brightness when bloom is enabled"}; -#ifdef META_QUEST -cvar_t r_hdr_scenebrightness = {CVAR_SAVE, "r_hdr_scenebrightness", "1", "global rendering brightness"}; -#endif -#ifdef PICO_XR +//1.4 on both devices as per Bummsers suggestion (17/01/2023) cvar_t r_hdr_scenebrightness = {CVAR_SAVE, "r_hdr_scenebrightness", "1.4", "global rendering brightness"}; -#endif + cvar_t r_hdr_glowintensity = {CVAR_SAVE, "r_hdr_glowintensity", "1", "how bright light emitting textures should appear"}; cvar_t r_hdr_irisadaptation = {CVAR_SAVE, "r_hdr_irisadaptation", "0", "adjust scene brightness according to light intensity at player location"}; cvar_t r_hdr_irisadaptation_multiplier = {CVAR_SAVE, "r_hdr_irisadaptation_multiplier", "2", "brightness at which value will be 1.0"};