From 72ba9972d86e3435d447c5d536c91adaee76583b Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 1 Mar 2023 21:43:15 +0000 Subject: [PATCH] Renaming JKQuest to JKXR Rename JKQuest -> JKXR Renaming JKQuest to JKXR Renaming JKQuest to JKXR Renaming JKQuest to JKXR --- Projects/Android/AndroidManifest.xml | 8 ++--- Projects/Android/build.gradle | 2 +- .../JKXR_SurfaceView.cpp} | 24 +++++++------- .../jni/{JKVR => JKXR}/OpenXrInput.cpp | 0 .../jni/{JKVR => JKXR}/TBXR_Common.cpp | 0 .../Android/jni/{JKVR => JKXR}/TBXR_Common.h | 0 .../Android/jni/{JKVR => JKXR}/VrClientInfo.h | 0 .../Android/jni/{JKVR => JKXR}/VrCommon.h | 0 Projects/Android/jni/{JKVR => JKXR}/VrCvars.h | 0 Projects/Android/jni/{JKVR => JKXR}/VrInput.h | 0 .../jni/{JKVR => JKXR}/VrInputCommon.cpp | 0 .../jni/{JKVR => JKXR}/VrInputDefault.cpp | 0 .../jni/{JKVR => JKXR}/VrInputWeaponAlign.cpp | 0 .../Android/jni/{JKVR => JKXR}/argtable3.c | 0 .../Android/jni/{JKVR => JKXR}/argtable3.h | 0 Projects/Android/jni/{JKVR => JKXR}/mathlib.c | 0 Projects/Android/jni/{JKVR => JKXR}/mathlib.h | 0 .../Android/jni/{JKVR => JKXR}/matrixlib.c | 0 .../Android/jni/OpenJK/Android_client_ja.mk | 16 +++++----- .../Android/jni/OpenJK/Android_client_jo.mk | 16 +++++----- .../jni/OpenJK/code/cgame/cg_camera.cpp | 2 +- .../jni/OpenJK/code/cgame/cg_consolecmds.cpp | 2 +- .../Android/jni/OpenJK/code/cgame/cg_draw.cpp | 2 +- .../jni/OpenJK/code/cgame/cg_drawtools.cpp | 2 +- .../Android/jni/OpenJK/code/cgame/cg_main.cpp | 2 +- .../jni/OpenJK/code/cgame/cg_players.cpp | 2 +- .../Android/jni/OpenJK/code/cgame/cg_view.cpp | 2 +- .../jni/OpenJK/code/cgame/cg_weapons.cpp | 2 +- .../jni/OpenJK/code/client/cl_cgame.cpp | 2 +- .../jni/OpenJK/code/client/cl_input.cpp | 2 +- .../jni/OpenJK/code/client/cl_main.cpp | 2 +- .../jni/OpenJK/code/client/cl_scrn.cpp | 2 +- .../Android/jni/OpenJK/code/game/bg_misc.cpp | 2 +- .../jni/OpenJK/code/game/g_trigger.cpp | 2 +- .../Android/jni/OpenJK/code/game/g_utils.cpp | 2 +- .../Android/jni/OpenJK/code/game/wp_saber.cpp | 2 +- .../jni/OpenJK/code/rd-common/tr_public.h | 2 +- .../jni/OpenJK/code/rd-gles/tr_main.cpp | 2 +- .../jni/OpenJK/code/rd-gles/tr_model.cpp | 2 +- .../jni/OpenJK/code/rd-gles/tr_scene.cpp | 2 +- .../Android/jni/OpenJK/code/ui/ui_shared.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_camera.cpp | 2 +- .../OpenJK/codeJK2/cgame/cg_consolecmds.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_draw.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_main.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_players.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_view.cpp | 2 +- .../jni/OpenJK/codeJK2/cgame/cg_weapons.cpp | 2 +- .../jni/OpenJK/codeJK2/game/bg_misc.cpp | 2 +- .../jni/OpenJK/codeJK2/game/bg_pmove.cpp | 2 +- .../jni/OpenJK/codeJK2/game/g_active.cpp | 2 +- .../jni/OpenJK/codeJK2/game/g_trigger.cpp | 2 +- .../jni/OpenJK/codeJK2/game/g_utils.cpp | 2 +- .../jni/OpenJK/codeJK2/game/wp_atst.cpp | 2 +- .../OpenJK/codeJK2/game/wp_blaster_rifle.cpp | 2 +- .../jni/OpenJK/codeJK2/game/wp_bowcaster.cpp | 2 +- .../jni/OpenJK/codeJK2/game/wp_saber.cpp | 2 +- .../jni/OpenJK/codeJK2/game/wp_thermal.cpp | 4 +-- Projects/Android/settings.gradle | 2 +- assets/z_vr_assets.pk3 | Bin 1410301 -> 1410210 bytes assets/z_vr_assets_jka.pk3 | Bin 1143841 -> 1143660 bytes .../{jkquest => jkxr}/GLES3JNIActivity.java | 30 +++++++++--------- .../drbeef/{jkquest => jkxr}/GLES3JNILib.java | 2 +- .../{ic_jkquest.png => ic_jkxr.png} | Bin .../{ic_jkquest.png => ic_jkxr.png} | Bin .../{ic_jkquest.png => ic_jkxr.png} | Bin .../{ic_jkquest.png => ic_jkxr.png} | Bin res/values/strings.xml | 2 +- z_vr_assets/ui/credits.menu | 4 +-- z_vr_assets_jka/ui/credits.menu | 4 +-- 71 files changed, 95 insertions(+), 95 deletions(-) rename Projects/Android/jni/{JKVR/JKVR_SurfaceView.cpp => JKXR/JKXR_SurfaceView.cpp} (95%) rename Projects/Android/jni/{JKVR => JKXR}/OpenXrInput.cpp (100%) rename Projects/Android/jni/{JKVR => JKXR}/TBXR_Common.cpp (100%) rename Projects/Android/jni/{JKVR => JKXR}/TBXR_Common.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrClientInfo.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrCommon.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrCvars.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrInput.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrInputCommon.cpp (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrInputDefault.cpp (100%) rename Projects/Android/jni/{JKVR => JKXR}/VrInputWeaponAlign.cpp (100%) rename Projects/Android/jni/{JKVR => JKXR}/argtable3.c (100%) rename Projects/Android/jni/{JKVR => JKXR}/argtable3.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/mathlib.c (100%) rename Projects/Android/jni/{JKVR => JKXR}/mathlib.h (100%) rename Projects/Android/jni/{JKVR => JKXR}/matrixlib.c (100%) rename java/com/drbeef/{jkquest => jkxr}/GLES3JNIActivity.java (93%) rename java/com/drbeef/{jkquest => jkxr}/GLES3JNILib.java (96%) rename res/drawable-hdpi/{ic_jkquest.png => ic_jkxr.png} (100%) rename res/drawable-mdpi/{ic_jkquest.png => ic_jkxr.png} (100%) rename res/drawable-xhdpi/{ic_jkquest.png => ic_jkxr.png} (100%) rename res/drawable-xxhdpi/{ic_jkquest.png => ic_jkxr.png} (100%) diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml index ebf0092..990a5ca 100644 --- a/Projects/Android/AndroidManifest.xml +++ b/Projects/Android/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -18,8 +18,8 @@ @@ -33,7 +33,7 @@ MessageQueue, &message); } -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onResume( JNIEnv * env, jobject obj, jlong handle ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onResume( JNIEnv * env, jobject obj, jlong handle ) { ALOGV( " GLES3JNILib::onResume()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); @@ -771,7 +771,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onResume( JNIEnv * en surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message); } -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onPause( JNIEnv * env, jobject obj, jlong handle ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onPause( JNIEnv * env, jobject obj, jlong handle ) { ALOGV( " GLES3JNILib::onPause()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); @@ -780,7 +780,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onPause( JNIEnv * env surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message); } -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStop( JNIEnv * env, jobject obj, jlong handle ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onStop( JNIEnv * env, jobject obj, jlong handle ) { ALOGV( " GLES3JNILib::onStop()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); @@ -789,7 +789,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStop( JNIEnv * env, surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message); } -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onDestroy( JNIEnv * env, jobject obj, jlong handle ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onDestroy( JNIEnv * env, jobject obj, jlong handle ) { ALOGV( " GLES3JNILib::onDestroy()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); @@ -810,7 +810,7 @@ Surface lifecycle ================================================================================ */ -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceCreated( JNIEnv * env, jobject obj, jlong handle, jobject surface ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onSurfaceCreated( JNIEnv * env, jobject obj, jlong handle, jobject surface ) { ALOGV( " GLES3JNILib::onSurfaceCreated()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); @@ -833,7 +833,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceCreated( JNI surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message); } -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceChanged( JNIEnv * env, jobject obj, jlong handle, jobject surface ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onSurfaceChanged( JNIEnv * env, jobject obj, jlong handle, jobject surface ) { ALOGV( " GLES3JNILib::onSurfaceChanged()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); @@ -875,7 +875,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceChanged( JNI } } -JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceDestroyed( JNIEnv * env, jobject obj, jlong handle ) +JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onSurfaceDestroyed( JNIEnv * env, jobject obj, jlong handle ) { ALOGV( " GLES3JNILib::onSurfaceDestroyed()" ); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); diff --git a/Projects/Android/jni/JKVR/OpenXrInput.cpp b/Projects/Android/jni/JKXR/OpenXrInput.cpp similarity index 100% rename from Projects/Android/jni/JKVR/OpenXrInput.cpp rename to Projects/Android/jni/JKXR/OpenXrInput.cpp diff --git a/Projects/Android/jni/JKVR/TBXR_Common.cpp b/Projects/Android/jni/JKXR/TBXR_Common.cpp similarity index 100% rename from Projects/Android/jni/JKVR/TBXR_Common.cpp rename to Projects/Android/jni/JKXR/TBXR_Common.cpp diff --git a/Projects/Android/jni/JKVR/TBXR_Common.h b/Projects/Android/jni/JKXR/TBXR_Common.h similarity index 100% rename from Projects/Android/jni/JKVR/TBXR_Common.h rename to Projects/Android/jni/JKXR/TBXR_Common.h diff --git a/Projects/Android/jni/JKVR/VrClientInfo.h b/Projects/Android/jni/JKXR/VrClientInfo.h similarity index 100% rename from Projects/Android/jni/JKVR/VrClientInfo.h rename to Projects/Android/jni/JKXR/VrClientInfo.h diff --git a/Projects/Android/jni/JKVR/VrCommon.h b/Projects/Android/jni/JKXR/VrCommon.h similarity index 100% rename from Projects/Android/jni/JKVR/VrCommon.h rename to Projects/Android/jni/JKXR/VrCommon.h diff --git a/Projects/Android/jni/JKVR/VrCvars.h b/Projects/Android/jni/JKXR/VrCvars.h similarity index 100% rename from Projects/Android/jni/JKVR/VrCvars.h rename to Projects/Android/jni/JKXR/VrCvars.h diff --git a/Projects/Android/jni/JKVR/VrInput.h b/Projects/Android/jni/JKXR/VrInput.h similarity index 100% rename from Projects/Android/jni/JKVR/VrInput.h rename to Projects/Android/jni/JKXR/VrInput.h diff --git a/Projects/Android/jni/JKVR/VrInputCommon.cpp b/Projects/Android/jni/JKXR/VrInputCommon.cpp similarity index 100% rename from Projects/Android/jni/JKVR/VrInputCommon.cpp rename to Projects/Android/jni/JKXR/VrInputCommon.cpp diff --git a/Projects/Android/jni/JKVR/VrInputDefault.cpp b/Projects/Android/jni/JKXR/VrInputDefault.cpp similarity index 100% rename from Projects/Android/jni/JKVR/VrInputDefault.cpp rename to Projects/Android/jni/JKXR/VrInputDefault.cpp diff --git a/Projects/Android/jni/JKVR/VrInputWeaponAlign.cpp b/Projects/Android/jni/JKXR/VrInputWeaponAlign.cpp similarity index 100% rename from Projects/Android/jni/JKVR/VrInputWeaponAlign.cpp rename to Projects/Android/jni/JKXR/VrInputWeaponAlign.cpp diff --git a/Projects/Android/jni/JKVR/argtable3.c b/Projects/Android/jni/JKXR/argtable3.c similarity index 100% rename from Projects/Android/jni/JKVR/argtable3.c rename to Projects/Android/jni/JKXR/argtable3.c diff --git a/Projects/Android/jni/JKVR/argtable3.h b/Projects/Android/jni/JKXR/argtable3.h similarity index 100% rename from Projects/Android/jni/JKVR/argtable3.h rename to Projects/Android/jni/JKXR/argtable3.h diff --git a/Projects/Android/jni/JKVR/mathlib.c b/Projects/Android/jni/JKXR/mathlib.c similarity index 100% rename from Projects/Android/jni/JKVR/mathlib.c rename to Projects/Android/jni/JKXR/mathlib.c diff --git a/Projects/Android/jni/JKVR/mathlib.h b/Projects/Android/jni/JKXR/mathlib.h similarity index 100% rename from Projects/Android/jni/JKVR/mathlib.h rename to Projects/Android/jni/JKXR/mathlib.h diff --git a/Projects/Android/jni/JKVR/matrixlib.c b/Projects/Android/jni/JKXR/matrixlib.c similarity index 100% rename from Projects/Android/jni/JKVR/matrixlib.c rename to Projects/Android/jni/JKXR/matrixlib.c diff --git a/Projects/Android/jni/OpenJK/Android_client_ja.mk b/Projects/Android/jni/OpenJK/Android_client_ja.mk index ff3657e..20e8377 100644 --- a/Projects/Android/jni/OpenJK/Android_client_ja.mk +++ b/Projects/Android/jni/OpenJK/Android_client_ja.mk @@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := sigc libzip libpng libminizip LOCAL_SHARED_LIBRARIES := openxr_loader gl4es -LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKVR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common +LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKXR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common ############################################################################# @@ -123,13 +123,13 @@ JK3_SRC = \ ${SHARED_PATH}/qcommon/safe/string.cpp \ -JKVR_SRC_FILES := ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \ - ${TOP_DIR}/JKVR/TBXR_Common.cpp \ - ${TOP_DIR}/JKVR/VrInputCommon.cpp \ - ${TOP_DIR}/JKVR/VrInputDefault.cpp \ - ${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \ - ${TOP_DIR}/JKVR/argtable3.c \ - ${TOP_DIR}/JKVR/OpenXrInput.cpp +JKVR_SRC_FILES := ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \ + ${TOP_DIR}/JKXR/TBXR_Common.cpp \ + ${TOP_DIR}/JKXR/VrInputCommon.cpp \ + ${TOP_DIR}/JKXR/VrInputDefault.cpp \ + ${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \ + ${TOP_DIR}/JKXR/argtable3.c \ + ${TOP_DIR}/JKXR/OpenXrInput.cpp LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES) diff --git a/Projects/Android/jni/OpenJK/Android_client_jo.mk b/Projects/Android/jni/OpenJK/Android_client_jo.mk index 4a11baa..7ee9375 100644 --- a/Projects/Android/jni/OpenJK/Android_client_jo.mk +++ b/Projects/Android/jni/OpenJK/Android_client_jo.mk @@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := sigc libzip libpng libminizip LOCAL_SHARED_LIBRARIES := openxr_loader gl4es -LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKVR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common +LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKXR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common ############################################################################# @@ -123,13 +123,13 @@ JK3_SRC = \ ${SHARED_PATH}/qcommon/safe/string.cpp \ -JKVR_SRC_FILES := ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \ - ${TOP_DIR}/JKVR/TBXR_Common.cpp \ - ${TOP_DIR}/JKVR/VrInputCommon.cpp \ - ${TOP_DIR}/JKVR/VrInputDefault.cpp \ - ${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \ - ${TOP_DIR}/JKVR/argtable3.c \ - ${TOP_DIR}/JKVR/OpenXrInput.cpp +JKVR_SRC_FILES := ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \ + ${TOP_DIR}/JKXR/TBXR_Common.cpp \ + ${TOP_DIR}/JKXR/VrInputCommon.cpp \ + ${TOP_DIR}/JKXR/VrInputDefault.cpp \ + ${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \ + ${TOP_DIR}/JKXR/argtable3.c \ + ${TOP_DIR}/JKXR/OpenXrInput.cpp LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES) diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp index 91f4717..c1ae7f4 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "cg_media.h" #include "../game/g_roff.h" -#include +#include bool in_camera = false; bool in_misccamera = false; // if we are viewing a misc_camera diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp index 8549ba0..f57c57c 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "cg_headers.h" #include "cg_media.h" //just for cgs.... -#include +#include void CG_TargetCommand_f( void ); extern qboolean player_locked; diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp index 679d052..60839c8 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp @@ -29,7 +29,7 @@ along with this program; if not, see . #include "cg_media.h" #include "../game/objectives.h" #include "../game/g_vehicles.h" -#include +#include #include "bg_local.h" extern vmCvar_t cg_debugHealthBars; diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp index b53a772..05567ad 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp @@ -24,7 +24,7 @@ along with this program; if not, see . #include "cg_headers.h" #include "cg_media.h" -#include +#include void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) { diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp index 9b9f5fa..e0711fe 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp @@ -30,7 +30,7 @@ along with this program; if not, see . #include "../qcommon/sstring.h" #include "qcommon/ojk_saved_game_helper.h" -#include +#include //NOTENOTE: Be sure to change the mirrored code in g_shared.h typedef std::map< sstring_t, unsigned char > namePrecache_m; diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp index 9d9c780..946402a 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp @@ -32,7 +32,7 @@ along with this program; if not, see . #include "../game/g_vehicles.h" #include "../Rufl/hstring.h" #include "bg_local.h" -#include +#include #define LOOK_SWING_SCALE 0.5f #define CG_SWINGSPEED 0.3f diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp index 3b127fd..17af230 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp @@ -32,7 +32,7 @@ along with this program; if not, see . #include "../game/wp_saber.h" #include "../game/g_vehicles.h" #include "bg_local.h" -#include +#include #define MASK_CAMERACLIP (MASK_SOLID) #define CAMERA_SIZE 4 diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp index 003a812..c410c08 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp @@ -30,7 +30,7 @@ along with this program; if not, see . #include "../game/anims.h" #include -#include +#include extern void CG_LightningBolt( centity_t *cent, vec3_t origin ); diff --git a/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp b/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp index 098840c..54ffe5b 100644 --- a/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp +++ b/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp @@ -33,7 +33,7 @@ along with this program; if not, see . #include "qcommon/stringed_ingame.h" #include "sys/sys_loadlib.h" -#include +#include vm_t cgvm; /* diff --git a/Projects/Android/jni/OpenJK/code/client/cl_input.cpp b/Projects/Android/jni/OpenJK/code/client/cl_input.cpp index 5589f30..7c3a176 100644 --- a/Projects/Android/jni/OpenJK/code/client/cl_input.cpp +++ b/Projects/Android/jni/OpenJK/code/client/cl_input.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "client.h" #include "client_ui.h" -#include +#include #ifndef _WIN32 #include diff --git a/Projects/Android/jni/OpenJK/code/client/cl_main.cpp b/Projects/Android/jni/OpenJK/code/client/cl_main.cpp index 4623c71..519efe5 100644 --- a/Projects/Android/jni/OpenJK/code/client/cl_main.cpp +++ b/Projects/Android/jni/OpenJK/code/client/cl_main.cpp @@ -34,7 +34,7 @@ along with this program; if not, see . #include "sys/sys_loadlib.h" #include "qcommon/ojk_saved_game.h" -#include +#include #define RETRANSMIT_TIMEOUT 3000 // time between connection packet retransmits diff --git a/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp b/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp index 414d9b0..51c68d9 100644 --- a/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp +++ b/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp @@ -28,7 +28,7 @@ along with this program; if not, see . #include "client.h" #include "client_ui.h" -#include +#include extern console_t con; diff --git a/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp b/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp index a4489af..8755b44 100644 --- a/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp +++ b/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp @@ -29,7 +29,7 @@ along with this program; if not, see . #include "bg_public.h" #include "g_items.h" #include "g_vehicles.h" -#include +#include extern weaponData_t weaponData[WP_NUM_WEAPONS]; diff --git a/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp b/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp index ea3e8b4..925bf32 100644 --- a/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp +++ b/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "anims.h" #include "../cgame/cg_local.h" #include "bg_local.h" -#include +#include #define ENTDIST_PLAYER 1 #define ENTDIST_NPC 2 diff --git a/Projects/Android/jni/OpenJK/code/game/g_utils.cpp b/Projects/Android/jni/OpenJK/code/game/g_utils.cpp index 4934804..b7f7ddb 100644 --- a/Projects/Android/jni/OpenJK/code/game/g_utils.cpp +++ b/Projects/Android/jni/OpenJK/code/game/g_utils.cpp @@ -31,7 +31,7 @@ along with this program; if not, see . #include "b_local.h" #include "g_nav.h" #include "bg_local.h" -#include +#include #define ACT_ACTIVE qtrue #define ACT_INACTIVE qfalse diff --git a/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp b/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp index 5ab76eb..3b618b2 100644 --- a/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp +++ b/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp @@ -29,7 +29,7 @@ along with this program; if not, see . #include "g_vehicles.h" #include "../qcommon/tri_coll_test.h" #include "../cgame/cg_local.h" -#include +#include #define JK2_RAGDOLL_GRIPNOHEALTH diff --git a/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h b/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h index 236ac60..f7c91e7 100644 --- a/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h +++ b/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h @@ -127,7 +127,7 @@ typedef struct { qboolean *(*gbAlreadyDoingLoad) ( void ); int (*com_frameTime) ( void ); - //JKVR Functions + //JKXR Functions bool (*TBXR_useScreenLayer) ( void ); bool (*TBXR_GetVRProjection) (int eye, float zNear, float zFar, float* projection); diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp index ebacd6f..b740e59 100644 --- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp +++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "../server/exe_headers.h" #include "tr_local.h" -#include +#include #if !defined(G2_H_INC) #include "../ghoul2/G2.h" diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp index 3ec93fe..2cc2a88 100644 --- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp +++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp @@ -30,7 +30,7 @@ along with this program; if not, see . #include "tr_local.h" #include "qcommon/matcomp.h" #include "../qcommon/sstring.h" -#include +#include #define LL(x) x=LittleLong(x) #define LS(x) x=LittleShort(x) diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp index 0badabd..e1030c0 100644 --- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp +++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp @@ -25,7 +25,7 @@ along with this program; if not, see . #include "../server/exe_headers.h" #include "tr_local.h" -#include +#include int r_firstSceneDrawSurf; diff --git a/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp b/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp index 00bc5a2..17ad63e 100644 --- a/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp +++ b/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp @@ -41,7 +41,7 @@ along with this program; if not, see . #include "qcommon/stringed_ingame.h" -#include +#include extern vr_client_info_t vr; diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp index 9f640b5..9df8926 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "cg_media.h" #include "../game/g_roff.h" -#include +#include bool in_camera = false; bool in_misccamera = false; // if we are viewing a misc_camera diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp index a911b33..80c4079 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp @@ -26,7 +26,7 @@ along with this program; if not, see . #include "cg_local.h" #include "cg_media.h" //just for cgs.... -#include +#include void CG_TargetCommand_f( void ); extern qboolean player_locked; diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp index a60747e..5f936d8 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp @@ -29,7 +29,7 @@ along with this program; if not, see . #include "cg_media.h" #include "../game/objectives.h" #include "bg_local.h" -#include +#include #include "FxUtil.h" diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp index a984bc6..798229d 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp @@ -23,7 +23,7 @@ along with this program; if not, see . #include "cg_local.h" #include "cg_media.h" -#include +#include void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) { diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp index 7faa24c..4959784 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp @@ -29,7 +29,7 @@ along with this program; if not, see . #include "../../code/qcommon/sstring.h" #include "../code/qcommon/ojk_saved_game_helper.h" -#include +#include //NOTENOTE: Be sure to change the mirrored code in g_shared.h typedef std::map< sstring_t, unsigned char, std::less > namePrecache_m; diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp index 7312f0b..e4af048 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp @@ -31,7 +31,7 @@ along with this program; if not, see . #include "../game/anims.h" #include "../game/wp_saber.h" #include "bg_local.h" -#include +#include #define LOOK_SWING_SCALE 0.5 diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp index 745e184..9f43997 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp @@ -31,7 +31,7 @@ along with this program; if not, see . #include "../game/anims.h" #include "../game/g_functions.h" #include "bg_local.h" -#include +#include #define MASK_CAMERACLIP (MASK_SOLID) #define CAMERA_SIZE 4 diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp index 3cc3e46..078c4fc 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp @@ -28,7 +28,7 @@ along with this program; if not, see . #include "../game/g_local.h" #include "../game/anims.h" #include -#include +#include extern void CG_LightningBolt( centity_t *cent, vec3_t origin ); diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp index 4de54f0..49245e2 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp @@ -27,7 +27,7 @@ along with this program; if not, see . #include "g_local.h" #include "bg_public.h" #include "g_items.h" -#include +#include extern weaponData_t weaponData[WP_NUM_WEAPONS]; diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp index 7302be9..09f9859 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp @@ -38,7 +38,7 @@ along with this program; if not, see . #include "../cgame/cg_local.h" // yeah I know this is naughty, but we're shipping soon... #include "wp_saber.h" #include -#include +#include extern qboolean G_DoDismemberment( gentity_t *self, vec3_t point, int mod, int damage, int hitLoc, qboolean force = qfalse ); extern qboolean G_EntIsUnlockedDoor( int entityNum ); diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp index a6e4ba7..8479bb6 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp @@ -29,7 +29,7 @@ along with this program; if not, see . #include "Q3_Interface.h" #include "wp_saber.h" #include "g_icarus.h" -#include +#include #ifdef _DEBUG #include diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp index 161d284..e977fff 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp @@ -26,7 +26,7 @@ along with this program; if not, see . #include "b_local.h" #include "anims.h" #include "bg_local.h" -#include +#include #define ENTDIST_PLAYER 1 #define ENTDIST_NPC 2 diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp index 5f00593..5fcf2b6 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp @@ -32,7 +32,7 @@ along with this program; if not, see . #include "b_local.h" #include "anims.h" #include "../../code/rd-common/mdx_format.h" -#include +#include #define ACT_ACTIVE qtrue #define ACT_INACTIVE qfalse diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp index 40f0778..3f88db5 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp @@ -28,7 +28,7 @@ along with this program; if not, see . #include "w_local.h" #include "g_functions.h" #include "bg_local.h" -#include +#include // ATST Main //--------------------------------------------------------- diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp index 030616d..88f0ff7 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp @@ -28,7 +28,7 @@ along with this program; if not, see . #include "w_local.h" #include "g_functions.h" #include "bg_local.h" -#include +#include //--------------- // Blaster diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp index f0b9695..a129422 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp @@ -28,7 +28,7 @@ along with this program; if not, see . #include "g_functions.h" #include "bg_local.h" -#include +#include //------------------- // Wookiee Bowcaster diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp index db1bf9f..bf82029 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp @@ -30,7 +30,7 @@ along with this program; if not, see . #include "wp_saber.h" #include "../../code/qcommon/tri_coll_test.h" #include "../cgame/FxScheduler.h" -#include +#include #define MAX_SABER_VICTIMS 16 static int victimEntityNum[MAX_SABER_VICTIMS]; diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp index 00ef764..cd92297 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp @@ -28,8 +28,8 @@ along with this program; if not, see . #include "w_local.h" #include "g_functions.h" #include "bg_local.h" -#include -#include +#include +#include //--------------------- // Thermal Detonator diff --git a/Projects/Android/settings.gradle b/Projects/Android/settings.gradle index 9f4aedf..0f468eb 100644 --- a/Projects/Android/settings.gradle +++ b/Projects/Android/settings.gradle @@ -1,4 +1,4 @@ rootProject.projectDir = new File(settingsDir, '../..') -rootProject.name = "JKQuest" +rootProject.name = "JKXR" include ':', 'Projects:Android' diff --git a/assets/z_vr_assets.pk3 b/assets/z_vr_assets.pk3 index 0e361eb924972becbccb403e12926b6afedad49b..384b5ef5e1196d68f45c98e6bdd4e66658bf709c 100644 GIT binary patch delta 1686 zcmZXU2~bm46ozkh5=P>6G7TA!-t%#YM6mn4KsZU*!Jyw>f?Ro zAvRjdlHxW4>*a^!Oe3W%e<9Bvk012tAD+Plodzy&!R{JZLd?ko*#+u)79j^hcIFUr zBs7i?m(T}<#uIWP#3STPh>xr51r%~M$=!mf_GRrW>=tlo#f=)Q*eYDpTX%m7217mzDI)Fy|TL{H_8VEF_zbJjmmzR_)4YL z#aC^8Ua0@4>UzZF#1nO?c`)Sgl{S`bzt7H+3T>umcvR^jQKqU^TgPZW7jrh;yfT%h zcv5p~sOIvsV#8wTidx+VqUQU}+i1JjX{3$bzE1qYeE|)FSuBn5i~KEj6b^2ox?@kv z!u0;f73%5}T|vdqmsZHzB$YSaIXbItsNa?{*FhG$cGaHQj_sz0H~Ow|4qRWLU-tLs zF^tE>FMiE`?jvgn6lx81;_{H@@d{;16>mnkMPJk`TC}P9u~p+IVm*5jV(j1Up&h02 zSI4`yM$^5QuRgHd=!q{{4LYsjt5c87sc720a%&&2H>_jr>tq+{wmnsf={c6O5p2JT z9JV!9{;eUh)pGH+zF=GZ)qyGV7Ol}VEioqT#uen-R}YQo77)* z?rb^GetPp@SG-ZsaqF^sPt}(Xw37~wL}`zy_wPzUBw1gid-O{~FQ_3ZO zOmZ9eE-kvQU7l=C>SQdYpE>+YGHTj&@3RdZE%&GaMQTkx<>I>E{+j-M^#kF`y!H9K z+gE$3#g`i7!DalYSWXwG$wKe=q`q_L5$EG2W?%N^jz-ncPG!`O(Y}UEcEiZ{!H1Uu zVf^_yEh~OmxIZD$e_Cbb`MpDJ%2n&UCzhq1Uo$XxCp+Z#JFjf~F>M-$t6m9qFwr%( zJb^PA=u%0UZ~_mJQV0h)h`hvbD@i|l!sR05iNc`@^)&wVQm7_77{8eS11KoWPlPfT zE`=(fy?YigT^961vtfI)U=T@tS#Yks0Fz}yZ_-j_!(fuCv)`um5QNeu^-fRKW$L{$He|#^j=3mt vtw%~5nJxgFVp0Hi%+TyaRH;wR$Xx4XuaAjj5XT3AjQB5M0}z;HKgNFn4W*mO delta 1739 zcmZvc2~bl<7{@o{1qcubkQFpy4h|KNLjougIpq*6Q4Aw35Trl_#i|78a3mz)Ac{B? z@KLmgm5w5ZBG?#31Qc+TI$Dnkj1Jm1tx{B^G-`$Ry$xP%-<$t?zwg^`kJ;Vt`=&Hz zx-^C%ilAaf02msA#A5*!3vF~I_qqOb z9q}E*W@)QO3mru*5H7?zzKRkTg$ql)MPo|23}JwjAfMj&QGLj$PFL$N0n zWItR!ge}tfnuf4s6XdhdV0;AL8f+1@cD=A9NrS19G_+k0F~DUR z1K8lBG6O4otPs*mBrOJn3<;5JM97$s2_Xg{Q$l8hn1sv;SrD>RNm^JG-D*A^V%bu2 z8~u)!4zU>2kh+iYG7XDMg6f2ZwZWW0P|Wc$v#UHk0Di(*FIe_+Bc5CFStp|#{rwxx z1*fY6``vqN+dM|*)~EknFjLs=z`u1M&BjA=ZOro57t2qCFOYN{ODTpyr>>t5oo;lm zs;EuNat@2EZf0k#ZAd#t>m3wb4O1qjP=(LxM<(iTPL|Dlz1k=0-h8iZJ==K(zQ6RY zPL!l_9W4Crp84+S_)d8v^pWMb7F(-_u4I;L(xrJ_UHL~;oUx;Vjk)1or`NLbYo`W| zaL)T!aXp#e&5~a zoBDH=Hv4URL;JQ3w3So6Hd);qp{^RU3Py=zSb+d-s-0OE9VTb?Qkk%YOv_4z>eT8_5s^P5j)PD z3oNf1jnqqWZ^nJ?nbD0m%Ovs2%`-uHJ{=$R#f%6$<1emjjI&GdJ}@?Qb|P!)`(2E| zc8z2(L_VgCdY7ZNL0mG3D}9@##spl!k89B7JCWjwr|qju|0x=fizEy66ly zu#s;;7>qSWlp75tbTo?UUL5qIAm^L}=wRddrXo0&<%j|C5cd;3hQv2>)5heK9ht6F zAc~;qv8Zor2OgdW1*m%9iafXil@Gi-53WS1Ny&$T>NClea?RzP2JyYOrUbU|=b0ayGh zpPwqA8;3lv3ws9sOx6dWQ~&^+-AVG-poqX%Dxn>RJV_3FRh=FU0PbP{=6n$J5LYOn zJ({Ia3E32Dyzh-YPTC$gy$JG9`;sEart&-tFa`tbs1ucN?CEfbY4Ykaqd_?O%8ZAMpLvV@nIt7!t)Hi+<@NKl!}U=K znmziNdN~zDz?= z$uv~Ad{nB=@1oh7lh~`Id61ZINYJ3@PzF$jP)1M;C?*sO${30b#erG`Wuh`9aAzm| z?GRpSoR1(;jeo2M)e$w`VT`QEJ{*Nq*?l;Jy7^%SAqtPneu>pr27HR1M^^|s>?;3sU`e&JGZV8(YZ&$$Wof5Y8+RR;yfc1_ReL)~ zvH8ExqYS2t{#EBbceQWxHWz2t*p>&hn)vxARe_c3TNH;|xe>~|>S?XWoon>;ae#87 zbcOge)l?E^(=MdDY?aiOI;kQgSdZ3rXxSy-il!6WkBkFNNVjZmrzOAmRF$9OzLx8u zO!ta?OzlR&x7lIsEq(VC`Nj1^53ScmWQdv$75vCA)9{U~0ajBBz5CPpo|#9iPc|KNV-|Eb2FA`D^AA5Obj!|SHoP#I zn(X&p9M|jHme9H3Li{$5%F5nzGadeEauCY zv0{T-I-=`1;8PGi1t7%)Q34NCFc7_T1P{1~{t5zW)JvR>0G-H65rR1j4uxt)dvn-{ zPBCyN58Mke@X^NzuT5y zucL`7IY8e`;;O!WOx%+LTa>3LU_D4!!U5Gj5Jcq>0Lv1)q$f+W6waA@GvC`Z#`~A6 tTShD}?9nuaaj>`7nF9$z)Tv0$%#u0l`=i1P4D|sA_?u>8Sc(|H>VM2Hfa3rF delta 1866 zcmZux4K$Ql7`|gB#0=jJ2^B*lAwTPHLz|JGLX3)Cl@-UR!Hh98vfB@(I&Cdlhq?}} zwoMx)MRtdNW<$~0723A8IPGEE9a~aSwmPA`b3Z?u?VfqQdG7PR&%O72-+SN3>cC@v z2XX|VOqL!1y1JmYf?vR~Wi18<3%(s`}!g2=@QTwF545hSJ%WWT-Do<`^TAR}JMmE!fru(!J6N7~@14A1_2SXQQ zCWan{J_Z|ugJFPSsMJQ3lOr>zY#s7yrg((JHB*ZE@C*lmWo`zT|g5A{(LtNotEs|COV6s`q% zp?X}GJr^AGZnm_1axoye!N0||(Wb_&+w7a!pmUa__QwNy0EEv~)asPEO1vn%Jv zsVanfOqSPnUJf3ubS)|<5oI{82s>0|kr9bhT5xvu*w-Q65%=eMN*mL;I=+83g=~yV zva+4E>~8%JPY3o^ns{erI`5g&aPKF1zB*a4O{Lm?Txr>V(mj6bO3&{jjklK!w;sqz6@5 z-M+KmD&yM#{~)?9CSG;C=3RL|O^ zO-aF`Mh^GO9lunEjqT^nF*qZ$Zg}o@x)+&$aH!gTh?|`tKlhvEi9xk{-f5!&-@N7g zql@wmXPO5;)b-1`A}D^6veTkyLHAX~0ms6CBQ}ZmhuUUF%}ELqup4^z`^9W2ySnV0 zd_?c;hnX9$Bn>)Lx%9;37poS$cs`<)+ga_B^Cq(%*wi`XQfk(kBLBL8R31NF5Gt#` z=$~KI6Q-5GcdbIcJZeqlt=zcSoRqQU+q~<-uSIt+y%gKLx^ly(UZwrR7X~wiZ+yXN zJFkvw3(D?)88LMYH5GV>1^4Tas^PNXDHdVv6yz}o`v<~JhJz3&MH= zVKecf?^eM^A|;2zx9007?zw$#W)#2!S0EX>_$l8UpD2{cota?jAng_WXidUIp0*}W zArnbS7DLOJIoUVR77=tOodZ>ippT|?pvNNUOj-f5Oosk66DC6+nw3wo2g%TzzV_S{ z=s`!#l$L;N5!om3b=Cq$$|SDHPOKyy@<3N7hrV=7)l(?k$c z41;L4N(@)htYnh)iD9tjEg@G4bR*uxD@B1)YU`b_HqBU0!>V$SK%g0UBcro#nXO`EW?d-(C^EC4!Y z1Au>%qkI=+L*&YarXhmRsn4LX$Oj!>jp9Tpws9s60F>`iQ4nN^oJEpN@nWHq;xolG zD;m`7u0|XgMNEzgkBnPk3*jft!t`7lV^iI+MDv&|z zrJ9vI^78GD=m4;OF#zm$k~#y)p~UebiIZ3;$(VkoXEJ=I!-y@%UmdT6>@mq+7fwua zp&~>2KiB(eo8FQF1N=l0oUHW!?)AP(pK|4DT%_&=p)<6}yRZlLAO=@|Ee-+jFKj=8 A>;M1& diff --git a/java/com/drbeef/jkquest/GLES3JNIActivity.java b/java/com/drbeef/jkxr/GLES3JNIActivity.java similarity index 93% rename from java/com/drbeef/jkquest/GLES3JNIActivity.java rename to java/com/drbeef/jkxr/GLES3JNIActivity.java index 348022b..82d1356 100644 --- a/java/com/drbeef/jkquest/GLES3JNIActivity.java +++ b/java/com/drbeef/jkxr/GLES3JNIActivity.java @@ -1,5 +1,5 @@ -package com.drbeef.jkquest; +package com.drbeef.jkxr; import static android.system.Os.setenv; @@ -49,7 +49,7 @@ import java.util.Vector; BufferedReader br; try { - br = new BufferedReader(new FileReader("/sdcard/JKQuest/commandline.txt")); + br = new BufferedReader(new FileReader("/sdcard/JKXR/commandline.txt")); String s; StringBuilder sb = new StringBuilder(0); while ((s = br.readLine()) != null) @@ -85,8 +85,8 @@ import java.util.Vector; System.loadLibrary( "openjk_" + game ); } - private static final String TAG = "JKQuest"; - private static final String APPLICATION = "JKQuest"; + private static final String TAG = "JKXR"; + private static final String APPLICATION = "JKXR"; private int permissionCount = 0; @@ -213,38 +213,38 @@ import java.util.Vector; public void create() { //Make the directories - new File("/sdcard/JKQuest/JK2/base").mkdirs(); - new File("/sdcard/JKQuest/JK3/base").mkdirs(); + new File("/sdcard/JKXR/JK2/base").mkdirs(); + new File("/sdcard/JKXR/JK3/base").mkdirs(); //Copy the command line params file - copy_asset("/sdcard/JKQuest", "commandline.txt", false); + copy_asset("/sdcard/JKXR", "commandline.txt", false); //Copy the weapon adjustment config - should we force overwrite? - copy_asset("/sdcard/JKQuest/JK2/base", "weapons_vr_jo.cfg", true); - copy_asset("/sdcard/JKQuest/JK3/base", "weapons_vr_ja.cfg", true); + copy_asset("/sdcard/JKXR/JK2/base", "weapons_vr_jo.cfg", true); + copy_asset("/sdcard/JKXR/JK3/base", "weapons_vr_ja.cfg", true); //Our assets - copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true); - copy_asset("/sdcard/JKQuest/JK3/base", "z_vr_assets_jka.pk3", true); + copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets.pk3", true); + copy_asset("/sdcard/JKXR/JK3/base", "z_vr_assets_jka.pk3", true); //Bummser's default configuration if (manufacturer.contains("meta")) { //Meta Quest - copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false); + copy_asset_with_rename("/sdcard/JKXR/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false); } else { //Pico XR - copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false); + copy_asset_with_rename("/sdcard/JKXR/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false); } //Read these from a file and pass through commandLineParams = new String("jo"); //See if user is trying to use command line params - if (new File("/sdcard/JKQuest/commandline.txt").exists()) // should exist! + if (new File("/sdcard/JKXR/commandline.txt").exists()) // should exist! { BufferedReader br; try { - br = new BufferedReader(new FileReader("/sdcard/JKQuest/commandline.txt")); + br = new BufferedReader(new FileReader("/sdcard/JKXR/commandline.txt")); String s; StringBuilder sb = new StringBuilder(0); while ((s = br.readLine()) != null) diff --git a/java/com/drbeef/jkquest/GLES3JNILib.java b/java/com/drbeef/jkxr/GLES3JNILib.java similarity index 96% rename from java/com/drbeef/jkquest/GLES3JNILib.java rename to java/com/drbeef/jkxr/GLES3JNILib.java index 143b95a..92d624f 100644 --- a/java/com/drbeef/jkquest/GLES3JNILib.java +++ b/java/com/drbeef/jkxr/GLES3JNILib.java @@ -1,5 +1,5 @@ -package com.drbeef.jkquest; +package com.drbeef.jkxr; import android.app.Activity; import android.view.Surface; diff --git a/res/drawable-hdpi/ic_jkquest.png b/res/drawable-hdpi/ic_jkxr.png similarity index 100% rename from res/drawable-hdpi/ic_jkquest.png rename to res/drawable-hdpi/ic_jkxr.png diff --git a/res/drawable-mdpi/ic_jkquest.png b/res/drawable-mdpi/ic_jkxr.png similarity index 100% rename from res/drawable-mdpi/ic_jkquest.png rename to res/drawable-mdpi/ic_jkxr.png diff --git a/res/drawable-xhdpi/ic_jkquest.png b/res/drawable-xhdpi/ic_jkxr.png similarity index 100% rename from res/drawable-xhdpi/ic_jkquest.png rename to res/drawable-xhdpi/ic_jkxr.png diff --git a/res/drawable-xxhdpi/ic_jkquest.png b/res/drawable-xxhdpi/ic_jkxr.png similarity index 100% rename from res/drawable-xxhdpi/ic_jkquest.png rename to res/drawable-xxhdpi/ic_jkxr.png diff --git a/res/values/strings.xml b/res/values/strings.xml index 18a3bc6..9aa6ca8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5,6 +5,6 @@ - JKQuest + JKXR diff --git a/z_vr_assets/ui/credits.menu b/z_vr_assets/ui/credits.menu index 7147890..ca53eec 100644 --- a/z_vr_assets/ui/credits.menu +++ b/z_vr_assets/ui/credits.menu @@ -36,7 +36,7 @@ name none type ITEM_TYPE_TEXT rect 0 10 640 40 - text "JKQuest by Team Beef" + text "JKXR by Team Beef" font 2 forecolor 1 0 0 1 textscale 1.2 @@ -171,7 +171,7 @@ name none type ITEM_TYPE_TEXT rect 0 400 640 40 - text "JKQuest: https://www.jkquest.com/" + text "JKXR: https://www.quakevr.com/jkxr" font 2 forecolor 1 0 0 1 textscale 1.2 diff --git a/z_vr_assets_jka/ui/credits.menu b/z_vr_assets_jka/ui/credits.menu index 7147890..ca53eec 100644 --- a/z_vr_assets_jka/ui/credits.menu +++ b/z_vr_assets_jka/ui/credits.menu @@ -36,7 +36,7 @@ name none type ITEM_TYPE_TEXT rect 0 10 640 40 - text "JKQuest by Team Beef" + text "JKXR by Team Beef" font 2 forecolor 1 0 0 1 textscale 1.2 @@ -171,7 +171,7 @@ name none type ITEM_TYPE_TEXT rect 0 400 640 40 - text "JKQuest: https://www.jkquest.com/" + text "JKXR: https://www.quakevr.com/jkxr" font 2 forecolor 1 0 0 1 textscale 1.2