teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-23 12:32:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renaming JKQuest to JKXR

Browse source 
Rename JKQuest -> JKXR

Renaming JKQuest to JKXR

Renaming JKQuest to JKXR

Renaming JKQuest to JKXR
This commit is contained in:
Simon 2023-03-01 21:43:15 +00:00
parent 614d0ec605
commit 72ba9972d8
71 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Projects/Android/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.jkquest" package="com.drbeef.jkxr"
android:versionCode="39" android:versionCode="39"
android:versionName="0.6.2" android:installLocation="auto" > android:versionName="0.6.2" android:installLocation="auto" >
@ -18,8 +18,8 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application android:allowBackup="false" <application android:allowBackup="false"
android:icon="@drawable/ic_jkquest" android:icon="@drawable/ic_jkxr"
android:label="@string/jkquest" android:label="@string/jkxr"
android:extractNativeLibs="true" android:extractNativeLibs="true"
> >
@ -33,7 +33,7 @@
<meta-data android:name="pvr.app.type" android:value="vr" /> <meta-data android:name="pvr.app.type" android:value="vr" />
<activity <activity
android:name="com.drbeef.jkquest.GLES3JNIActivity" android:name="com.drbeef.jkxr.GLES3JNIActivity"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="landscape" android:screenOrientation="landscape"

2
Projects/Android/build.gradle
View file

@ -6,7 +6,7 @@ android {
// -debug.apk or -release.apk appended to it. // -debug.apk or -release.apk appended to it.
// The filename doesn't effect the Android installation process. // The filename doesn't effect the Android installation process.
// Use only letters to remain compatible with the package name. // Use only letters to remain compatible with the package name.
project.archivesBaseName = "jkquest" project.archivesBaseName = "jkxr"
defaultConfig { defaultConfig {
// Gradle replaces the manifest package with this value, which must // Gradle replaces the manifest package with this value, which must

24
Projects/Android/jni/JKVR/JKVR_SurfaceView.cpp → Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
View file

@ -43,7 +43,7 @@ int argc=0;
/* /*
================================================================================ ================================================================================
JKVR Stuff JKXR Stuff
================================================================================ ================================================================================
*/ */
@ -346,9 +346,9 @@ void * AppThreadFunction(void * parm ) {
TBXR_InitActions(); TBXR_InitActions();
#ifdef JK2_MODE #ifdef JK2_MODE
chdir("/sdcard/JKQuest/JK2"); chdir("/sdcard/JKXR/JK2");
#else #else
chdir("/sdcard/JKQuest/JK3"); chdir("/sdcard/JKXR/JK3");
#endif #endif
TBXR_WaitForSessionActive(); TBXR_WaitForSessionActive();
@ -675,7 +675,7 @@ int JNI_OnLoad(JavaVM* vm, void* reserved)
return JNI_VERSION_1_4; return JNI_VERSION_1_4;
} }
JNIEXPORT jlong JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onCreate( JNIEnv * env, jclass activityClass, jobject activity, JNIEXPORT jlong JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onCreate( JNIEnv * env, jclass activityClass, jobject activity,
jstring commandLineParams) jstring commandLineParams)
{ {
ALOGV( " GLES3JNILib::onCreate()" ); ALOGV( " GLES3JNILib::onCreate()" );
@ -740,7 +740,7 @@ JNIEXPORT jlong JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onCreate( JNIEnv * e
} }
JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStart( JNIEnv * env, jobject obj, jlong handle, jobject obj1) JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onStart( JNIEnv * env, jobject obj, jlong handle, jobject obj1)
{ {
ALOGV( " GLES3JNILib::onStart()" ); ALOGV( " GLES3JNILib::onStart()" );
@ -762,7 +762,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStart( JNIEnv * env
surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message); surfaceMessageQueue_PostMessage(&appThread->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()" ); ALOGV( " GLES3JNILib::onResume()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); 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); 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()" ); ALOGV( " GLES3JNILib::onPause()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); 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); 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()" ); ALOGV( " GLES3JNILib::onStop()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); 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); 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()" ); ALOGV( " GLES3JNILib::onDestroy()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); 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()" ); ALOGV( " GLES3JNILib::onSurfaceCreated()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); 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); 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()" ); ALOGV( " GLES3JNILib::onSurfaceChanged()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); 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()" ); ALOGV( " GLES3JNILib::onSurfaceDestroyed()" );
ovrAppThread * appThread = (ovrAppThread *)((size_t)handle); ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);

0
Projects/Android/jni/JKVR/OpenXrInput.cpp → Projects/Android/jni/JKXR/OpenXrInput.cpp
View file

0
Projects/Android/jni/JKVR/TBXR_Common.cpp → Projects/Android/jni/JKXR/TBXR_Common.cpp
View file

0
Projects/Android/jni/JKVR/TBXR_Common.h → Projects/Android/jni/JKXR/TBXR_Common.h
View file

0
Projects/Android/jni/JKVR/VrClientInfo.h → Projects/Android/jni/JKXR/VrClientInfo.h
View file

0
Projects/Android/jni/JKVR/VrCommon.h → Projects/Android/jni/JKXR/VrCommon.h
View file

0
Projects/Android/jni/JKVR/VrCvars.h → Projects/Android/jni/JKXR/VrCvars.h
View file

0
Projects/Android/jni/JKVR/VrInput.h → Projects/Android/jni/JKXR/VrInput.h
View file

0
Projects/Android/jni/JKVR/VrInputCommon.cpp → Projects/Android/jni/JKXR/VrInputCommon.cpp
View file

0
Projects/Android/jni/JKVR/VrInputDefault.cpp → Projects/Android/jni/JKXR/VrInputDefault.cpp
View file

0
Projects/Android/jni/JKVR/VrInputWeaponAlign.cpp → Projects/Android/jni/JKXR/VrInputWeaponAlign.cpp
View file

0
Projects/Android/jni/JKVR/argtable3.c → Projects/Android/jni/JKXR/argtable3.c
View file

0
Projects/Android/jni/JKVR/argtable3.h → Projects/Android/jni/JKXR/argtable3.h
View file

0
Projects/Android/jni/JKVR/mathlib.c → Projects/Android/jni/JKXR/mathlib.c
View file

0
Projects/Android/jni/JKVR/mathlib.h → Projects/Android/jni/JKXR/mathlib.h
View file

0
Projects/Android/jni/JKVR/matrixlib.c → Projects/Android/jni/JKXR/matrixlib.c
View file

16
Projects/Android/jni/OpenJK/Android_client_ja.mk
View file

@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := sigc libzip libpng libminizip
LOCAL_SHARED_LIBRARIES := openxr_loader gl4es 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 \ ${SHARED_PATH}/qcommon/safe/string.cpp \
JKVR_SRC_FILES := ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \ JKVR_SRC_FILES := ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \
${TOP_DIR}/JKVR/TBXR_Common.cpp \ ${TOP_DIR}/JKXR/TBXR_Common.cpp \
${TOP_DIR}/JKVR/VrInputCommon.cpp \ ${TOP_DIR}/JKXR/VrInputCommon.cpp \
${TOP_DIR}/JKVR/VrInputDefault.cpp \ ${TOP_DIR}/JKXR/VrInputDefault.cpp \
${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \ ${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \
${TOP_DIR}/JKVR/argtable3.c \ ${TOP_DIR}/JKXR/argtable3.c \
${TOP_DIR}/JKVR/OpenXrInput.cpp ${TOP_DIR}/JKXR/OpenXrInput.cpp
LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES) LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES)

16
Projects/Android/jni/OpenJK/Android_client_jo.mk
View file

@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := sigc libzip libpng libminizip
LOCAL_SHARED_LIBRARIES := openxr_loader gl4es 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 \ ${SHARED_PATH}/qcommon/safe/string.cpp \
JKVR_SRC_FILES := ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \ JKVR_SRC_FILES := ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \
${TOP_DIR}/JKVR/TBXR_Common.cpp \ ${TOP_DIR}/JKXR/TBXR_Common.cpp \
${TOP_DIR}/JKVR/VrInputCommon.cpp \ ${TOP_DIR}/JKXR/VrInputCommon.cpp \
${TOP_DIR}/JKVR/VrInputDefault.cpp \ ${TOP_DIR}/JKXR/VrInputDefault.cpp \
${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \ ${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \
${TOP_DIR}/JKVR/argtable3.c \ ${TOP_DIR}/JKXR/argtable3.c \
${TOP_DIR}/JKVR/OpenXrInput.cpp ${TOP_DIR}/JKXR/OpenXrInput.cpp
LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES) LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES)

2
Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_media.h" #include "cg_media.h"
#include "../game/g_roff.h" #include "../game/g_roff.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
bool in_camera = false; bool in_camera = false;
bool in_misccamera = false; // if we are viewing a misc_camera bool in_misccamera = false; // if we are viewing a misc_camera

2
Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_headers.h" #include "cg_headers.h"
#include "cg_media.h" //just for cgs.... #include "cg_media.h" //just for cgs....
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
void CG_TargetCommand_f( void ); void CG_TargetCommand_f( void );
extern qboolean player_locked; extern qboolean player_locked;

2
Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp
View file

@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_media.h" #include "cg_media.h"
#include "../game/objectives.h" #include "../game/objectives.h"
#include "../game/g_vehicles.h" #include "../game/g_vehicles.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#include "bg_local.h" #include "bg_local.h"
extern vmCvar_t cg_debugHealthBars; extern vmCvar_t cg_debugHealthBars;

2
Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp
View file

@ -24,7 +24,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_headers.h" #include "cg_headers.h"
#include "cg_media.h" #include "cg_media.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) { void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) {

2
Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp
View file

@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../qcommon/sstring.h" #include "../qcommon/sstring.h"
#include "qcommon/ojk_saved_game_helper.h" #include "qcommon/ojk_saved_game_helper.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
//NOTENOTE: Be sure to change the mirrored code in g_shared.h //NOTENOTE: Be sure to change the mirrored code in g_shared.h
typedef std::map< sstring_t, unsigned char > namePrecache_m; typedef std::map< sstring_t, unsigned char > namePrecache_m;

2
Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
View file

@ -32,7 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../game/g_vehicles.h" #include "../game/g_vehicles.h"
#include "../Rufl/hstring.h" #include "../Rufl/hstring.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define LOOK_SWING_SCALE 0.5f #define LOOK_SWING_SCALE 0.5f
#define CG_SWINGSPEED 0.3f #define CG_SWINGSPEED 0.3f

2
Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
View file

@ -32,7 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../game/wp_saber.h" #include "../game/wp_saber.h"
#include "../game/g_vehicles.h" #include "../game/g_vehicles.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define MASK_CAMERACLIP (MASK_SOLID) #define MASK_CAMERACLIP (MASK_SOLID)
#define CAMERA_SIZE 4 #define CAMERA_SIZE 4

2
Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
View file

@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../game/anims.h" #include "../game/anims.h"
#include <bg_local.h> #include <bg_local.h>
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
extern void CG_LightningBolt( centity_t *cent, vec3_t origin ); extern void CG_LightningBolt( centity_t *cent, vec3_t origin );

2
Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp
View file

@ -33,7 +33,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "qcommon/stringed_ingame.h" #include "qcommon/stringed_ingame.h"
#include "sys/sys_loadlib.h" #include "sys/sys_loadlib.h"
#include <JKVR/VrCommon.h> #include <JKXR/VrCommon.h>
vm_t cgvm; vm_t cgvm;
/* /*

2
Projects/Android/jni/OpenJK/code/client/cl_input.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "client.h" #include "client.h"
#include "client_ui.h" #include "client_ui.h"
#include <JKVR/VrCommon.h> #include <JKXR/VrCommon.h>
#ifndef _WIN32 #ifndef _WIN32
#include <cmath> #include <cmath>

2
Projects/Android/jni/OpenJK/code/client/cl_main.cpp
View file

@ -34,7 +34,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "sys/sys_loadlib.h" #include "sys/sys_loadlib.h"
#include "qcommon/ojk_saved_game.h" #include "qcommon/ojk_saved_game.h"
#include <JKVR/VrCommon.h> #include <JKXR/VrCommon.h>
#define RETRANSMIT_TIMEOUT 3000 // time between connection packet retransmits #define RETRANSMIT_TIMEOUT 3000 // time between connection packet retransmits

2
Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp
View file

@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "client.h" #include "client.h"
#include "client_ui.h" #include "client_ui.h"
#include <JKVR/VrCommon.h> #include <JKXR/VrCommon.h>
extern console_t con; extern console_t con;

2
Projects/Android/jni/OpenJK/code/game/bg_misc.cpp
View file

@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "bg_public.h" #include "bg_public.h"
#include "g_items.h" #include "g_items.h"
#include "g_vehicles.h" #include "g_vehicles.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
extern weaponData_t weaponData[WP_NUM_WEAPONS]; extern weaponData_t weaponData[WP_NUM_WEAPONS];

2
Projects/Android/jni/OpenJK/code/game/g_trigger.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "anims.h" #include "anims.h"
#include "../cgame/cg_local.h" #include "../cgame/cg_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define ENTDIST_PLAYER 1 #define ENTDIST_PLAYER 1
#define ENTDIST_NPC 2 #define ENTDIST_NPC 2

2
Projects/Android/jni/OpenJK/code/game/g_utils.cpp
View file

@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "b_local.h" #include "b_local.h"
#include "g_nav.h" #include "g_nav.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define ACT_ACTIVE qtrue #define ACT_ACTIVE qtrue
#define ACT_INACTIVE qfalse #define ACT_INACTIVE qfalse

2
Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
View file

@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_vehicles.h" #include "g_vehicles.h"
#include "../qcommon/tri_coll_test.h" #include "../qcommon/tri_coll_test.h"
#include "../cgame/cg_local.h" #include "../cgame/cg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define JK2_RAGDOLL_GRIPNOHEALTH #define JK2_RAGDOLL_GRIPNOHEALTH

2
Projects/Android/jni/OpenJK/code/rd-common/tr_public.h
View file

@ -127,7 +127,7 @@ typedef struct {
qboolean *(*gbAlreadyDoingLoad) ( void ); qboolean *(*gbAlreadyDoingLoad) ( void );
int (*com_frameTime) ( void ); int (*com_frameTime) ( void );
//JKVR Functions //JKXR Functions
bool (*TBXR_useScreenLayer) ( void ); bool (*TBXR_useScreenLayer) ( void );
bool (*TBXR_GetVRProjection) (int eye, float zNear, float zFar, float* projection); bool (*TBXR_GetVRProjection) (int eye, float zNear, float zFar, float* projection);

2
Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../server/exe_headers.h" #include "../server/exe_headers.h"
#include "tr_local.h" #include "tr_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#if !defined(G2_H_INC) #if !defined(G2_H_INC)
#include "../ghoul2/G2.h" #include "../ghoul2/G2.h"

2
Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp
View file

@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "tr_local.h" #include "tr_local.h"
#include "qcommon/matcomp.h" #include "qcommon/matcomp.h"
#include "../qcommon/sstring.h" #include "../qcommon/sstring.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define LL(x) x=LittleLong(x) #define LL(x) x=LittleLong(x)
#define LS(x) x=LittleShort(x) #define LS(x) x=LittleShort(x)

2
Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp
View file

@ -25,7 +25,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../server/exe_headers.h" #include "../server/exe_headers.h"
#include "tr_local.h" #include "tr_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
int r_firstSceneDrawSurf; int r_firstSceneDrawSurf;

2
Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp
View file

@ -41,7 +41,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "qcommon/stringed_ingame.h" #include "qcommon/stringed_ingame.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
extern vr_client_info_t vr; extern vr_client_info_t vr;

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_media.h" #include "cg_media.h"
#include "../game/g_roff.h" #include "../game/g_roff.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
bool in_camera = false; bool in_camera = false;
bool in_misccamera = false; // if we are viewing a misc_camera bool in_misccamera = false; // if we are viewing a misc_camera

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
View file

@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_local.h" #include "cg_local.h"
#include "cg_media.h" //just for cgs.... #include "cg_media.h" //just for cgs....
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
void CG_TargetCommand_f( void ); void CG_TargetCommand_f( void );
extern qboolean player_locked; extern qboolean player_locked;

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
View file

@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_media.h" #include "cg_media.h"
#include "../game/objectives.h" #include "../game/objectives.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#include "FxUtil.h" #include "FxUtil.h"

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp
View file

@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_local.h" #include "cg_local.h"
#include "cg_media.h" #include "cg_media.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) { void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) {

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp
View file

@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../../code/qcommon/sstring.h" #include "../../code/qcommon/sstring.h"
#include "../code/qcommon/ojk_saved_game_helper.h" #include "../code/qcommon/ojk_saved_game_helper.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
//NOTENOTE: Be sure to change the mirrored code in g_shared.h //NOTENOTE: Be sure to change the mirrored code in g_shared.h
typedef std::map< sstring_t, unsigned char, std::less<sstring_t> > namePrecache_m; typedef std::map< sstring_t, unsigned char, std::less<sstring_t> > namePrecache_m;

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp
View file

@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../game/anims.h" #include "../game/anims.h"
#include "../game/wp_saber.h" #include "../game/wp_saber.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define LOOK_SWING_SCALE 0.5 #define LOOK_SWING_SCALE 0.5

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
View file

@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../game/anims.h" #include "../game/anims.h"
#include "../game/g_functions.h" #include "../game/g_functions.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define MASK_CAMERACLIP (MASK_SOLID) #define MASK_CAMERACLIP (MASK_SOLID)
#define CAMERA_SIZE 4 #define CAMERA_SIZE 4

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
View file

@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../game/g_local.h" #include "../game/g_local.h"
#include "../game/anims.h" #include "../game/anims.h"
#include <bg_local.h> #include <bg_local.h>
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
extern void CG_LightningBolt( centity_t *cent, vec3_t origin ); extern void CG_LightningBolt( centity_t *cent, vec3_t origin );

2
Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_local.h" #include "g_local.h"
#include "bg_public.h" #include "bg_public.h"
#include "g_items.h" #include "g_items.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
extern weaponData_t weaponData[WP_NUM_WEAPONS]; extern weaponData_t weaponData[WP_NUM_WEAPONS];

2
Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp
View file

@ -38,7 +38,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../cgame/cg_local.h" // yeah I know this is naughty, but we're shipping soon... #include "../cgame/cg_local.h" // yeah I know this is naughty, but we're shipping soon...
#include "wp_saber.h" #include "wp_saber.h"
#include <float.h> #include <float.h>
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
extern qboolean G_DoDismemberment( gentity_t *self, vec3_t point, int mod, int damage, int hitLoc, qboolean force = qfalse ); 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 ); extern qboolean G_EntIsUnlockedDoor( int entityNum );

2
Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp
View file

@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "Q3_Interface.h" #include "Q3_Interface.h"
#include "wp_saber.h" #include "wp_saber.h"
#include "g_icarus.h" #include "g_icarus.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#ifdef _DEBUG #ifdef _DEBUG
#include <float.h> #include <float.h>

2
Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp
View file

@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "b_local.h" #include "b_local.h"
#include "anims.h" #include "anims.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define ENTDIST_PLAYER 1 #define ENTDIST_PLAYER 1
#define ENTDIST_NPC 2 #define ENTDIST_NPC 2

2
Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp
View file

@ -32,7 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "b_local.h" #include "b_local.h"
#include "anims.h" #include "anims.h"
#include "../../code/rd-common/mdx_format.h" #include "../../code/rd-common/mdx_format.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define ACT_ACTIVE qtrue #define ACT_ACTIVE qtrue
#define ACT_INACTIVE qfalse #define ACT_INACTIVE qfalse

2
Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp
View file

@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "g_functions.h" #include "g_functions.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
// ATST Main // ATST Main
//--------------------------------------------------------- //---------------------------------------------------------

2
Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp
View file

@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "g_functions.h" #include "g_functions.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
//--------------- //---------------
// Blaster // Blaster

2
Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp
View file

@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_functions.h" #include "g_functions.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
//------------------- //-------------------
// Wookiee Bowcaster // Wookiee Bowcaster

2
Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
View file

@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "wp_saber.h" #include "wp_saber.h"
#include "../../code/qcommon/tri_coll_test.h" #include "../../code/qcommon/tri_coll_test.h"
#include "../cgame/FxScheduler.h" #include "../cgame/FxScheduler.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#define MAX_SABER_VICTIMS 16 #define MAX_SABER_VICTIMS 16
static int victimEntityNum[MAX_SABER_VICTIMS]; static int victimEntityNum[MAX_SABER_VICTIMS];

4
Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp
View file

@ -28,8 +28,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "g_functions.h" #include "g_functions.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKVR/VrClientInfo.h> #include <JKXR/VrClientInfo.h>
#include <JKVR/mathlib.h> #include <JKXR/mathlib.h>
//--------------------- //---------------------
// Thermal Detonator // Thermal Detonator

2
Projects/Android/settings.gradle
View file

@ -1,4 +1,4 @@
rootProject.projectDir = new File(settingsDir, '../..') rootProject.projectDir = new File(settingsDir, '../..')
rootProject.name = "JKQuest" rootProject.name = "JKXR"
include ':', 'Projects:Android' include ':', 'Projects:Android'

BIN
assets/z_vr_assets.pk3
View file

Binary file not shown.

BIN
assets/z_vr_assets_jka.pk3
View file

Binary file not shown.

30
java/com/drbeef/jkquest/GLES3JNIActivity.java → java/com/drbeef/jkxr/GLES3JNIActivity.java
View file

@ -1,5 +1,5 @@
package com.drbeef.jkquest; package com.drbeef.jkxr;
import static android.system.Os.setenv; import static android.system.Os.setenv;
@ -49,7 +49,7 @@ import java.util.Vector;
BufferedReader br; BufferedReader br;
try { try {
br = new BufferedReader(new FileReader("/sdcard/JKQuest/commandline.txt")); br = new BufferedReader(new FileReader("/sdcard/JKXR/commandline.txt"));
String s; String s;
StringBuilder sb = new StringBuilder(0); StringBuilder sb = new StringBuilder(0);
while ((s = br.readLine()) != null) while ((s = br.readLine()) != null)
@ -85,8 +85,8 @@ import java.util.Vector;
System.loadLibrary( "openjk_" + game ); System.loadLibrary( "openjk_" + game );
} }
private static final String TAG = "JKQuest"; private static final String TAG = "JKXR";
private static final String APPLICATION = "JKQuest"; private static final String APPLICATION = "JKXR";
private int permissionCount = 0; private int permissionCount = 0;
@ -213,38 +213,38 @@ import java.util.Vector;
public void create() { public void create() {
//Make the directories //Make the directories
new File("/sdcard/JKQuest/JK2/base").mkdirs(); new File("/sdcard/JKXR/JK2/base").mkdirs();
new File("/sdcard/JKQuest/JK3/base").mkdirs(); new File("/sdcard/JKXR/JK3/base").mkdirs();
//Copy the command line params file //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 the weapon adjustment config - should we force overwrite?
copy_asset("/sdcard/JKQuest/JK2/base", "weapons_vr_jo.cfg", true); copy_asset("/sdcard/JKXR/JK2/base", "weapons_vr_jo.cfg", true);
copy_asset("/sdcard/JKQuest/JK3/base", "weapons_vr_ja.cfg", true); copy_asset("/sdcard/JKXR/JK3/base", "weapons_vr_ja.cfg", true);
//Our assets //Our assets
copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true); copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets.pk3", true);
copy_asset("/sdcard/JKQuest/JK3/base", "z_vr_assets_jka.pk3", true); copy_asset("/sdcard/JKXR/JK3/base", "z_vr_assets_jka.pk3", true);
//Bummser's default configuration //Bummser's default configuration
if (manufacturer.contains("meta")) { if (manufacturer.contains("meta")) {
//Meta Quest //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 { } else {
//Pico XR //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 //Read these from a file and pass through
commandLineParams = new String("jo"); commandLineParams = new String("jo");
//See if user is trying to use command line params //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; BufferedReader br;
try { try {
br = new BufferedReader(new FileReader("/sdcard/JKQuest/commandline.txt")); br = new BufferedReader(new FileReader("/sdcard/JKXR/commandline.txt"));
String s; String s;
StringBuilder sb = new StringBuilder(0); StringBuilder sb = new StringBuilder(0);
while ((s = br.readLine()) != null) while ((s = br.readLine()) != null)

2
java/com/drbeef/jkquest/GLES3JNILib.java → java/com/drbeef/jkxr/GLES3JNILib.java
View file

@ -1,5 +1,5 @@
package com.drbeef.jkquest; package com.drbeef.jkxr;
import android.app.Activity; import android.app.Activity;
import android.view.Surface; import android.view.Surface;

0
res/drawable-hdpi/ic_jkquest.png → res/drawable-hdpi/ic_jkxr.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
res/drawable-mdpi/ic_jkquest.png → res/drawable-mdpi/ic_jkxr.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
res/drawable-xhdpi/ic_jkquest.png → res/drawable-xhdpi/ic_jkxr.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
res/drawable-xxhdpi/ic_jkquest.png → res/drawable-xxhdpi/ic_jkxr.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

2
res/values/strings.xml
View file

@ -5,6 +5,6 @@
<resources> <resources>
<!-- Simple strings. --> <!-- Simple strings. -->
<string name="jkquest">JKQuest</string> <string name="jkxr">JKXR</string>
</resources> </resources>

4
z_vr_assets/ui/credits.menu
View file

@ -36,7 +36,7 @@
name none name none
type ITEM_TYPE_TEXT type ITEM_TYPE_TEXT
rect 0 10 640 40 rect 0 10 640 40
text "JKQuest by Team Beef" text "JKXR by Team Beef"
font 2 font 2
forecolor 1 0 0 1 forecolor 1 0 0 1
textscale 1.2 textscale 1.2
@ -171,7 +171,7 @@
name none name none
type ITEM_TYPE_TEXT type ITEM_TYPE_TEXT
rect 0 400 640 40 rect 0 400 640 40
text "JKQuest: https://www.jkquest.com/" text "JKXR: https://www.quakevr.com/jkxr"
font 2 font 2
forecolor 1 0 0 1 forecolor 1 0 0 1
textscale 1.2 textscale 1.2

4
z_vr_assets_jka/ui/credits.menu
View file

@ -36,7 +36,7 @@
name none name none
type ITEM_TYPE_TEXT type ITEM_TYPE_TEXT
rect 0 10 640 40 rect 0 10 640 40
text "JKQuest by Team Beef" text "JKXR by Team Beef"
font 2 font 2
forecolor 1 0 0 1 forecolor 1 0 0 1
textscale 1.2 textscale 1.2
@ -171,7 +171,7 @@
name none name none
type ITEM_TYPE_TEXT type ITEM_TYPE_TEXT
rect 0 400 640 40 rect 0 400 640 40
text "JKQuest: https://www.jkquest.com/" text "JKXR: https://www.quakevr.com/jkxr"
font 2 font 2
forecolor 1 0 0 1 forecolor 1 0 0 1
textscale 1.2 textscale 1.2