teambeef
/
jkxr
mirror of https://github.com/DrBeef/JKXR.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added haptics for ATST

This commit is contained in:
Simon 2023-01-29 08:36:46 +00:00
parent 3b139bb537
commit a83dfc7989
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.jkquest"
android:versionCode="35"
android:versionName="0.5.4" android:installLocation="auto" >
android:versionCode="36"
android:versionName="0.5.5" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030002" android:required="true"/>

11
Projects/Android/jni/OpenJK/Android.mk
View File

@ -5,15 +5,10 @@ LOCAL_PATH := $(call my-dir)
OPENXR_HMD := META_QUEST
#OPENXR_HMD := PICO_XR
JK3_BASE_CFLAGS = -D$(OPENXR_HMD) -DHAVE_GLES -DFINAL_BUILD -fexceptions -Wall -Wno-write-strings -Wno-comment -fno-caller-saves -fno-tree-vectorize -Wno-unused-but-set-variable -fvisibility=hidden
JK3_BASE_CPPFLAGS = -fvisibility-inlines-hidden -Wno-invalid-offsetof -fvisibility=hidden
JK3_BASE_CFLAGS = -O1 -D$(OPENXR_HMD) -DHAVE_GLES -DFINAL_BUILD -fexceptions -Wall -Wno-write-strings -Wno-comment -fno-caller-saves -fno-tree-vectorize -Wno-unused-but-set-variable -fvisibility=hidden
JK3_BASE_CPPFLAGS = -O1 -fvisibility-inlines-hidden -Wno-invalid-offsetof -fvisibility=hidden
ifeq ($(NDK_DEBUG), 0)
JK3_BASE_CFLAGS += -O3
JK3_BASE_CPPFLAGS += -O3
endif
JK3_BASE_LDLIBS =
JK3_BASE_LDLIBS =
#Armv7
# JK3_BASE_CFLAGS += -mfloat-abi=softfp

4
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
View File

@ -3302,7 +3302,8 @@ void CG_FireWeapon( centity_t *cent, qboolean alt_fire )
case WP_BRYAR_PISTOL:
case WP_BOWCASTER:
case WP_BLASTER:
cgi_HapticEvent("machinegun_fire", position, 0, 100, 0, 0);
case WP_ATST_MAIN:
cgi_HapticEvent("machinegun_fire", position, 0, (ent->weapon == WP_BRYAR_PISTOL) ? 60 : 100, 0, 0);
break;
case WP_BLASTER_PISTOL:
cgi_HapticEvent("shotgun_fire", position, 0, 100, 0, 0);
@ -3313,6 +3314,7 @@ void CG_FireWeapon( centity_t *cent, qboolean alt_fire )
cgi_HapticEvent("handgrenade_fire", position, 0, 80, 0, 0);
break;
case WP_ROCKET_LAUNCHER:
case WP_ATST_SIDE:
cgi_HapticEvent("rocket_fire", position, 0, 100, 0, 0);
break;
case WP_DISRUPTOR: