From c21086e692b7f94a495418e2bb848d60cd7b67d4 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 17 Jan 2020 18:41:52 +0000 Subject: [PATCH] penguin noises + more --- .../Android/jni/src/Lambda1VR/L1VR_SurfaceView.c | 7 +++++++ Projects/Android/jni/src/Lambda1VR/VrInput.h | 4 ++++ Projects/Android/jni/src/Lambda1VR/VrInputAlt.c | 6 +++--- .../Android/jni/src/Lambda1VR/VrInputDefault.c | 6 +++--- .../Android/jni/src/Lambda1VR/VrInputLeftAlt2.c | 6 +++--- Projects/Android/jni/src/hlsdk-xash3d-opfor | 2 +- java/com/drbeef/lambda1vr/GLES3JNIActivity.java | 15 ++++++++++++++- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c index 6a05624..397e7a0 100644 --- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c +++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c @@ -1451,6 +1451,13 @@ void VR_Init() //Not to be changed by users, as it will be overwritten anyway vr_stereo_side = Cvar_Get( "vr_stereo_side", "0", CVAR_READ_ONLY, "Eye being drawn" ); + + //Set up backpack weapon string (this depends on the game) + g_pszBackpackWeapon = getenv("VR_BACKPACK_WEAPON"); + if (g_pszBackpackWeapon == NULL) + { + g_pszBackpackWeapon = "weapon_crowbar"; + } } void * AppThreadFunction( void * parm ) diff --git a/Projects/Android/jni/src/Lambda1VR/VrInput.h b/Projects/Android/jni/src/Lambda1VR/VrInput.h index 2bbe5f2..493674b 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInput.h +++ b/Projects/Android/jni/src/Lambda1VR/VrInput.h @@ -8,6 +8,8 @@ enum control_scheme; #define YAWDRIFTPERFRAME 0.0026F; +#define SCOPE_ENGAGE_DISTANCE 0.28 + ovrInputStateTrackedRemote leftTrackedRemoteState_old; ovrInputStateTrackedRemote leftTrackedRemoteState_new; ovrTracking leftRemoteTracking_new; @@ -42,5 +44,7 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr //A specific custom for left alt 2 void HandleInput_LeftAlt2( ); +char * g_pszBackpackWeapon; + #endif //VRINPUT_H diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c b/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c index c55c08b..0e03561 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c @@ -118,11 +118,11 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr } //Engage scope if conditions are right - if (vr_weapon_stabilised->value == 1 && !isScopeEngaged() && distanceToHMD < 0.25) + if (vr_weapon_stabilised->value == 1 && !isScopeEngaged() && distanceToHMD < SCOPE_ENGAGE_DISTANCE) { sendButtonActionSimple("+alt1"); } - else if (isScopeEngaged() && (distanceToHMD > 0.25 || vr_weapon_stabilised->value != 1)) + else if (isScopeEngaged() && (distanceToHMD > SCOPE_ENGAGE_DISTANCE || vr_weapon_stabilised->value != 1)) { sendButtonActionSimple("-alt1"); } @@ -245,7 +245,7 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr } else{ if (dominantGripPushed) { //Initiate crowbar from backpack mode - sendButtonActionSimple("weapon_crowbar"); + sendButtonActionSimple(g_pszBackpackWeapon); int channel = (vr_control_scheme->integer >= 10) ? 0 : 1; Android_Vibrate(80, channel, 0.8); // vibrate to let user know they switched grabMeleeWeapon = 1; diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c b/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c index 504ad64..12865dc 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c @@ -130,11 +130,11 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, } //Engage scope if conditions are right - if (vr_weapon_stabilised->value == 1 && !isScopeEngaged() && distanceToHMD < 0.25) + if (vr_weapon_stabilised->value == 1 && !isScopeEngaged() && distanceToHMD < SCOPE_ENGAGE_DISTANCE) { sendButtonActionSimple("+alt1"); } - else if (isScopeEngaged() && (distanceToHMD > 0.25 || vr_weapon_stabilised->value != 1)) + else if (isScopeEngaged() && (distanceToHMD > SCOPE_ENGAGE_DISTANCE || vr_weapon_stabilised->value != 1)) { sendButtonActionSimple("-alt1"); } @@ -257,7 +257,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, } else{ if (dominantGripPushed) { //Initiate crowbar from backpack mode - sendButtonActionSimple("weapon_crowbar"); + sendButtonActionSimple(g_pszBackpackWeapon); int channel = (vr_control_scheme->integer >= 10) ? 0 : 1; Android_Vibrate(80, channel, 0.8); // vibrate to let user know they switched grabMeleeWeapon = 1; diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c b/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c index 5e9a01e..0669add 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c @@ -123,11 +123,11 @@ void HandleInput_LeftAlt2() } //Engage scope if conditions are right - if (vr_weapon_stabilised->value == 1 && !isScopeEngaged() && distanceToHMD < 0.25) + if (vr_weapon_stabilised->value == 1 && !isScopeEngaged() && distanceToHMD < SCOPE_ENGAGE_DISTANCE) { sendButtonActionSimple("+alt1"); } - else if (isScopeEngaged() && (distanceToHMD > 0.25 || vr_weapon_stabilised->value != 1)) + else if (isScopeEngaged() && (distanceToHMD > SCOPE_ENGAGE_DISTANCE || vr_weapon_stabilised->value != 1)) { sendButtonActionSimple("-alt1"); } @@ -250,7 +250,7 @@ void HandleInput_LeftAlt2() } else{ if (dominantGripPushed) { //Initiate crowbar from backpack mode - sendButtonActionSimple("weapon_crowbar"); + sendButtonActionSimple(g_pszBackpackWeapon); Android_Vibrate(80, 0, 0.8); // vibrate to let user know they switched grabMeleeWeapon = 1; } diff --git a/Projects/Android/jni/src/hlsdk-xash3d-opfor b/Projects/Android/jni/src/hlsdk-xash3d-opfor index f8f77ea..24d7f32 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d-opfor +++ b/Projects/Android/jni/src/hlsdk-xash3d-opfor @@ -1 +1 @@ -Subproject commit f8f77ea31a648cfae4478f0cc6ed4fb9f63565e3 +Subproject commit 24d7f32b2a81bf74709601732d4582a90eefcc5f diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java index 6c7dc0e..918555a 100644 --- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java +++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java @@ -316,16 +316,26 @@ import static android.system.Os.setenv; //Scope vignette texture copy_asset("/sdcard/xash/" + game + "/", "sprites/scope.tga", true); copy_asset("/sdcard/xash/valve/", "sprites/scope.tga", true); + //Sniper Rifle copy_asset("/sdcard/xash/", "gearbox/models/v_m40a1.mdl", true); copy_asset("/sdcard/xash/", "gearbox/models/w_m40a1.mdl", true); copy_asset("/sdcard/xash/", "gearbox/sound/weapons/scout_clipin.wav", true); copy_asset("/sdcard/xash/", "gearbox/sound/weapons/scout_clipout.wav", true); copy_asset("/sdcard/xash/", "gearbox/sound/weapons/sniper_fire.wav", true); + //Pipe Wrench copy_asset("/sdcard/xash/", "gearbox/models/v_pipe_wrench.mdl", true); copy_asset("/sdcard/xash/", "gearbox/models/w_pipe_wrench.mdl", true); copy_asset("/sdcard/xash/", "gearbox/models/p_pipe_wrench.mdl", true); + + //Penguins + new File("/sdcard/xash/gearbox/sound/penguin/").mkdirs(); // Make the penguin directory as it won't exist + copy_asset("/sdcard/xash/", "gearbox/sound/penguin/penguin_die1.wav", true); + copy_asset("/sdcard/xash/", "gearbox/sound/penguin/penguin_deploy1.wav", true); + copy_asset("/sdcard/xash/", "gearbox/sound/penguin/penguin_hunt1.wav", true); + copy_asset("/sdcard/xash/", "gearbox/sound/penguin/penguin_hunt2.wav", true); + copy_asset("/sdcard/xash/", "gearbox/sound/penguin/penguin_hunt3.wav", true); } //Set default environment @@ -336,10 +346,13 @@ import static android.system.Os.setenv; setenv("XASH3D_GAMEDIR", "valve", true); setenv( "XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true ); - //If game is gearbox (Opposing Force) set the library file suffix to op4 + //If game is gearbox (Opposing Force) set the library file suffix to opfor if (game.equalsIgnoreCase("gearbox")) { setenv("XASH3D_LIBSUFFIX", "_opfor", true); + + //Use pipewrench as backpack weapon in opposing force + setenv("VR_BACKPACK_WEAPON", "weapon_pipewrench", true); } else {