teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-02-21 19:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Code re-org to sync with PCVR

Browse source
This commit is contained in:
Simon 2023-07-27 22:08:18 +01:00
parent a58e4051b5
commit 1d5be37787
73 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/OpenJK/Android.mk
View file

@ -15,7 +15,7 @@ JK3_BASE_LDLIBS =
# JK3_BASE_CFLAGS += -mfloat-abi=softfp # JK3_BASE_CFLAGS += -mfloat-abi=softfp
JK3_BASE_LDLIBS += -Wl JK3_BASE_LDLIBS += -Wl
JK3_BASE_C_INCLUDES := $(OPENJK_PATH)/lib $(JK3_CODE_PATH)/client $(JK3_CODE_PATH)/server $(JK3_CODE_PATH)/libs/freetype2/include $(JK3_CODE_PATH)/common $(JK3_CODE_PATH)/gl JK3_BASE_C_INCLUDES := $(OPENJK_PATH)/JKXR $(OPENJK_PATH)/lib $(JK3_CODE_PATH)/client $(JK3_CODE_PATH)/server $(JK3_CODE_PATH)/libs/freetype2/include $(JK3_CODE_PATH)/common $(JK3_CODE_PATH)/gl
JK3_BASE_C_INCLUDES += ${TOP_DIR}/OpenXR-SDK/include JK3_BASE_C_INCLUDES += ${TOP_DIR}/OpenXR-SDK/include
JK3_BASE_C_INCLUDES += ${TOP_DIR}/OpenXR-SDK/src/common JK3_BASE_C_INCLUDES += ${TOP_DIR}/OpenXR-SDK/src/common
JK3_BASE_C_INCLUDES += $(JK3_CODE_PATH)/ $(OPENJK_PATH)/code/ $(OPENJK_PATH)/shared/ $(JK3_CODE_PATH)/ui $(OPENJK_PATH)/lib/gsl-lite/include JK3_BASE_C_INCLUDES += $(JK3_CODE_PATH)/ $(OPENJK_PATH)/code/ $(OPENJK_PATH)/shared/ $(JK3_CODE_PATH)/ui $(OPENJK_PATH)/lib/gsl-lite/include

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)/JKXR $(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) $(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 \
JKXR_SRC_FILES := ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \ JKXR_SRC_FILES := ${OPENJK_PATH}/JKXR/JKXR_SurfaceView.cpp \
${TOP_DIR}/JKXR/TBXR_Common.cpp \ ${OPENJK_PATH}/JKXR/TBXR_Common.cpp \
${TOP_DIR}/JKXR/VrInputCommon.cpp \ ${OPENJK_PATH}/JKXR/VrInputCommon.cpp \
${TOP_DIR}/JKXR/VrInputDefault.cpp \ ${OPENJK_PATH}/JKXR/VrInputDefault.cpp \
${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \ ${OPENJK_PATH}/JKXR/VrInputWeaponAlign.cpp \
${TOP_DIR}/JKXR/argtable3.c \ ${OPENJK_PATH}/JKXR/argtable3.c \
${TOP_DIR}/JKXR/OpenXrInput.cpp ${OPENJK_PATH}/JKXR/OpenXrInput.cpp
LOCAL_SRC_FILES += $(JK3_SRC) $(JKXR_SRC_FILES) LOCAL_SRC_FILES += $(JK3_SRC) $(JKXR_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)/JKXR $(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) $(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 \
JKXR_SRC_FILES := ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \ JKXR_SRC_FILES := ${OPENJK_PATH}/JKXR/JKXR_SurfaceView.cpp \
${TOP_DIR}/JKXR/TBXR_Common.cpp \ ${OPENJK_PATH}/JKXR/TBXR_Common.cpp \
${TOP_DIR}/JKXR/VrInputCommon.cpp \ ${OPENJK_PATH}/JKXR/VrInputCommon.cpp \
${TOP_DIR}/JKXR/VrInputDefault.cpp \ ${OPENJK_PATH}/JKXR/VrInputDefault.cpp \
${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \ ${OPENJK_PATH}/JKXR/VrInputWeaponAlign.cpp \
${TOP_DIR}/JKXR/argtable3.c \ ${OPENJK_PATH}/JKXR/argtable3.c \
${TOP_DIR}/JKXR/OpenXrInput.cpp ${OPENJK_PATH}/JKXR/OpenXrInput.cpp
LOCAL_SRC_FILES += $(JK3_SRC) $(JKXR_SRC_FILES) LOCAL_SRC_FILES += $(JK3_SRC) $(JKXR_SRC_FILES)

0
Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp → Projects/Android/jni/OpenJK/JKXR/JKXR_SurfaceView.cpp
View file

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

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

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

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

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

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

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

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

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

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

0
Projects/Android/jni/JKXR/VrTBDC.h → Projects/Android/jni/OpenJK/JKXR/VrTBDC.h
View file

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

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

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

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

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

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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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;

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

@ -32,8 +32,8 @@ 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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrCommon.h> #include <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 <JKXR/VrCommon.h> #include <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 <JKXR/VrCommon.h> #include <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 <JKXR/VrCommon.h> #include <VrCommon.h>
extern console_t con; extern console_t con;

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

@ -31,7 +31,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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
extern weaponData_t weaponData[WP_NUM_WEAPONS]; extern weaponData_t weaponData[WP_NUM_WEAPONS];

4
Projects/Android/jni/OpenJK/code/game/bg_pmove.cpp
View file

@ -44,8 +44,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "wp_saber.h" #include "wp_saber.h"
#include "g_vehicles.h" #include "g_vehicles.h"
#include <float.h> #include <float.h>
#include <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.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/code/game/g_active.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 "b_local.h" #include "b_local.h"
#include "g_navigator.h" #include "g_navigator.h"
#include <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#ifdef _DEBUG #ifdef _DEBUG
#include <float.h> #include <float.h>

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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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_blaster_pistol.cpp
View file

@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;

4
Projects/Android/jni/OpenJK/code/game/wp_blaster_rifle.cpp
View file

@ -27,8 +27,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;

4
Projects/Android/jni/OpenJK/code/game/wp_bowcaster.cpp
View file

@ -27,8 +27,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//------------------- //-------------------

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

@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "wp_saber.h" #include "wp_saber.h"
#include "w_local.h" #include "w_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//------------------- //-------------------

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

@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "wp_saber.h" #include "wp_saber.h"
#include "w_local.h" #include "w_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//------------------- //-------------------

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

@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "wp_saber.h" #include "wp_saber.h"
#include "w_local.h" #include "w_local.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//----------------------- //-----------------------

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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#define JK2_RAGDOLL_GRIPNOHEALTH #define JK2_RAGDOLL_GRIPNOHEALTH

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

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

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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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;

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

@ -31,8 +31,8 @@ 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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <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/NPC_stats.cpp
View file

@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "b_local.h" #include "b_local.h"
#include "b_public.h" #include "b_public.h"
#include "anims.h" #include "anims.h"
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
extern qboolean NPCsPrecached; extern qboolean NPCsPrecached;

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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
extern weaponData_t weaponData[WP_NUM_WEAPONS]; extern weaponData_t weaponData[WP_NUM_WEAPONS];

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

@ -38,8 +38,8 @@ 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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
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 );

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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#ifdef _DEBUG #ifdef _DEBUG
#include <float.h> #include <float.h>

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

@ -35,8 +35,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "wp_saber.h" #include "wp_saber.h"
#include "Q3_Interface.h" #include "Q3_Interface.h"
#include "../../code/qcommon/strippublic.h" #include "../../code/qcommon/strippublic.h"
#include <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
extern cvar_t *g_debugDamage; extern cvar_t *g_debugDamage;

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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#define ACT_ACTIVE qtrue #define ACT_ACTIVE qtrue
#define ACT_INACTIVE qfalse #define ACT_INACTIVE qfalse

4
Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//--------------- //---------------
// Blaster // Blaster

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

@ -28,8 +28,8 @@ 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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//------------------- //-------------------

4
Projects/Android/jni/OpenJK/codeJK2/game/wp_bryar_pistol.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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//--------------- //---------------

4
Projects/Android/jni/OpenJK/codeJK2/game/wp_demp2.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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//------------------- //-------------------

2
Projects/Android/jni/OpenJK/codeJK2/game/wp_flechette.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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
//----------------------- //-----------------------
// Golan Arms Flechette // Golan Arms Flechette

4
Projects/Android/jni/OpenJK/codeJK2/game/wp_repeater.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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//------------------- //-------------------

4
Projects/Android/jni/OpenJK/codeJK2/game/wp_rocket_launcher.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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/VrTBDC.h> #include <VrTBDC.h>
extern cvar_t *g_TeamBeefDirectorsCut; extern cvar_t *g_TeamBeefDirectorsCut;
//----------------------- //-----------------------
// Rocket Launcher // Rocket Launcher

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 <JKXR/VrClientInfo.h> #include <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 <JKXR/VrClientInfo.h> #include <VrClientInfo.h>
#include <JKXR/mathlib.h> #include <mathlib.h>
//--------------------- //---------------------
// Thermal Detonator // Thermal Detonator