From f73fbfa4512bead1792261846e8bfe89184624c6 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Wed, 12 Oct 2022 22:35:27 +0100
Subject: [PATCH] Added placeholder hand model

- made sure other force powers originate from off-hand
- switch 1st/3rd person using right stick when using saber
- if goggles equipped, then you can zoom in and out using right stick, and exit with B button
---
 Projects/Android/jni/JKVR/VrClientInfo.h      |   1 +
 Projects/Android/jni/JKVR/VrInputDefault.cpp  |  44 ++++++++++++++----
 .../OpenJK/codeJK2/cgame/cg_consolecmds.cpp   |   5 ++
 .../jni/OpenJK/codeJK2/cgame/cg_view.cpp      |   2 +-
 .../jni/OpenJK/codeJK2/cgame/cg_weapons.cpp   |   4 ++
 .../jni/OpenJK/codeJK2/game/g_items.cpp       |   2 +-
 .../jni/OpenJK/codeJK2/game/wp_saber.cpp      |  30 ++++++++++--
 assets/z_npc_vr.pk3                           | Bin 5082 -> 0 bytes
 assets/z_vr_assets.pk3                        | Bin 0 -> 10575 bytes
 java/com/drbeef/jkquest/GLES3JNIActivity.java |   4 +-
 10 files changed, 73 insertions(+), 19 deletions(-)
 delete mode 100644 assets/z_npc_vr.pk3
 create mode 100644 assets/z_vr_assets.pk3

diff --git a/Projects/Android/jni/JKVR/VrClientInfo.h b/Projects/Android/jni/JKVR/VrClientInfo.h
index b76e76b..d2acf9c 100644
--- a/Projects/Android/jni/JKVR/VrClientInfo.h
+++ b/Projects/Android/jni/JKVR/VrClientInfo.h
@@ -14,6 +14,7 @@ typedef struct {
     int weaponid;
     int lastweaponid;
     bool mountedgun;
+    int cgzoommode;
 
     vec3_t hmdposition;
     vec3_t hmdposition_last; // Don't use this, it is just for calculating delta!
diff --git a/Projects/Android/jni/JKVR/VrInputDefault.cpp b/Projects/Android/jni/JKVR/VrInputDefault.cpp
index daa32e4..a9409fd 100644
--- a/Projects/Android/jni/JKVR/VrInputDefault.cpp
+++ b/Projects/Android/jni/JKVR/VrInputDefault.cpp
@@ -224,6 +224,31 @@ void HandleInput_Default( ovrInputStateGamepad *pFootTrackingNew, ovrInputStateG
             }
         }
 
+        if (vr.cgzoommode > 1)
+        {
+            if (between(-0.2f, primaryJoystickX, 0.2f)) {
+                sendButtonAction("+attack", between(0.8f, pPrimaryJoystick->y, 1.0f));
+                sendButtonAction("+altattack", between(-1.0f, pPrimaryJoystick->y, -0.8f));
+            }
+        } else if (vr.weaponid == WP_SABER)
+        {
+            static bool switched = false;
+            if (between(-0.2f, primaryJoystickX, 0.2f) &&
+                (between(0.8f, pPrimaryJoystick->y, 1.0f) ||
+                 between(-1.0f, pPrimaryJoystick->y, -0.8f))) {
+                if (!switched) {
+                    if (between(0.8f, pPrimaryJoystick->y, 1.0f)) {
+                        sendButtonActionSimple("cg_thirdPerson 1");
+                    } else {
+                        sendButtonActionSimple("cg_thirdPerson 0");
+                    }
+                    switched = true;
+                }
+            } else {
+                switched = false;
+            }
+        }
+
         vr.weapon_stabilised = stabilised;
 
         //if (!vr.item_selector)
@@ -244,13 +269,6 @@ void HandleInput_Default( ovrInputStateGamepad *pFootTrackingNew, ovrInputStateG
                 }
             }
 
-            //ALOGV("**GB WEAPON ACTIVE** %i",vr.weaponid);
-            if (!scopeready && vr.weaponid >= 15 && vr.weaponid <= 17) {
-                lastScopeReady = false;
-                ALOGV("**WEAPON EVENT**  disable scope mode forced");
-                sendButtonActionSimple("weapalt");
-            }
-
             //Engage scope / virtual stock (iron sight lock) if conditions are right
             static bool scopeEngaged = qfalse;
             if (scopeEngaged != vr.scopeengaged) {
@@ -468,14 +486,14 @@ void HandleInput_Default( ovrInputStateGamepad *pFootTrackingNew, ovrInputStateG
 
                 // Uncomment to debug offhand reaching
 
-                ALOGV("Quick Save> Dist: %f | OffHandToDownAngle: %f | HandOffs: %f %f %f\nHmdHandDot: %f | HmdFwdXY: %f %f | WpnFwdXY: %f %f\nTrackOk: %i, DistOk: %i, HeightOk: %i, HnadAngleOk: %i, HmdHandDotOk: %i",
+/*                ALOGV("Quick Save> Dist: %f | OffHandToDownAngle: %f | HandOffs: %f %f %f\nHmdHandDot: %f | HmdFwdXY: %f %f | WpnFwdXY: %f %f\nTrackOk: %i, DistOk: %i, HeightOk: %i, HnadAngleOk: %i, HmdHandDotOk: %i",
                       distanceToHMDOff, offhandToDownAngle, vr.offhandoffset[0],
                       vr.offhandoffset[1], vr.offhandoffset[2],
                       hmdToOffhandDotProduct, hmdForwardXY[0], hmdForwardXY[1], offhandForwardXY[0],
                       offhandForwardXY[1],
                       bpTrackOk, bpOffhandDistToHMDOk, bpOffhandHeightOk, bpOffhandAngleOk,
                       bpHmdToOffhandAngleOk);
-
+*/
 
                 // Check quicksave
                 if (canUseQuickSave) {
@@ -529,7 +547,13 @@ void HandleInput_Default( ovrInputStateGamepad *pFootTrackingNew, ovrInputStateG
 
                 //Alt Fire (B Button)
                 if ((primaryButtonsNew & primaryButton2) != (primaryButtonsOld & primaryButton2)) {
-                    sendButtonAction("+altattack", (primaryButtonsNew & primaryButton2));
+                    if (vr.cgzoommode > 0)
+                    {
+                        sendButtonActionSimple("invuse");
+                    }
+                    else {
+                        sendButtonAction("+altattack", (primaryButtonsNew & primaryButton2));
+                    }
                 }
 
 
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
index e1daca6..8f50936 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
@@ -26,6 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "cg_local.h"
 #include "cg_media.h"	//just for cgs....
+#include <JKVR/VrClientInfo.h>
 
 void CG_TargetCommand_f( void );
 extern qboolean	player_locked;
@@ -140,6 +141,8 @@ void CG_ToggleBinoculars( void )
 		cg.zoomTime = cg.time;
 		cgi_S_StartSound( NULL, cg.snap->ps.clientNum, CHAN_AUTO, cgs.media.zoomEnd );
 	}
+
+	vr->cgzoommode = cg.zoomMode;
 }
 
 void CG_ToggleLAGoggles( void )
@@ -182,6 +185,8 @@ void CG_ToggleLAGoggles( void )
 		cg.zoomTime = cg.time;
 		cgi_S_StartSound( NULL, cg.snap->ps.clientNum, CHAN_AUTO, cgs.media.zoomEnd );
 	}
+
+	vr->cgzoommode = cg.zoomMode;
 }
 
 void CG_LoadHud_f( void) 
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
index 560fce5..4aa9c44 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
@@ -2032,7 +2032,7 @@ wasForceSpeed=isForceSpeed;
 			}
 
 			handEnt.renderfx = RF_DEPTHHACK;
-			handEnt.hModel = cgi_R_RegisterModel( "models/weapons2/thermal/thermal_hand.md3" );
+			handEnt.hModel = cgi_R_RegisterModel( "models/hands/left_hand_relaxed.md3" );
 			VectorCopy(handEnt.origin, handEnt.oldorigin);
 			AnglesToAxis(handEnt.angles, handEnt.axis);
 			cgi_R_AddRefEntityToScene(&handEnt);
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
index 5d7852a..cb2be7a 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
@@ -2804,6 +2804,7 @@ void CG_DrawItemSelector( void )
 				break;
 			}
 
+#ifdef _DEMO
 			if (itemId == WP_SABER ||
 				itemId == WP_BRYAR_PISTOL ||
 				itemId == WP_BLASTER ||
@@ -2814,6 +2815,9 @@ void CG_DrawItemSelector( void )
 			} else {
 				continue;
 			}
+#else
+            CG_RegisterWeapon(itemId);
+#endif
 		}
 
 		{
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_items.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_items.cpp
index 07877b3..5c424d5 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/g_items.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_items.cpp
@@ -890,7 +890,7 @@ void FinishSpawningItem( gentity_t *ent ) {
 			{
 				gi.Printf (S_COLOR_RED"FinishSpawningItem: removing %s startsolid at %s (in a %s)\n", ent->classname, vtos(ent->s.origin) );
 			}
-			assert( 0 && "item starting in solid");
+			//assert( 0 && "item starting in solid");
 #ifndef FINAL_BUILD
 			if (!g_entities[ENTITYNUM_WORLD].s.radius){	//not a region
 				delayedShutDown = level.time + 100;
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
index 74046de..aa97253 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
@@ -6741,7 +6741,17 @@ void ForceTelepathy( gentity_t *self )
 		return;
 	}
 
-	AngleVectors( self->client->ps.viewangles, forward, NULL, NULL );
+	vec3_t origin, angles;
+	if (self->client->ps.clientNum == 0)
+	{
+		BG_CalculateVROffHandPosition(origin, angles);
+		AngleVectors(angles, forward, NULL, NULL);
+	}
+	else
+	{
+		AngleVectors(self->client->ps.viewangles, forward, NULL, NULL);
+		VectorCopy(self->client->ps.viewangles, angles);
+	}
 	VectorNormalize( forward );
 	VectorMA( self->client->renderInfo.eyePoint, 2048, forward, end );
 
@@ -6954,20 +6964,21 @@ void ForceGrip( gentity_t *self )
 		self->client->ps.weaponTime = floor( self->client->ps.weaponTime * g_timescale->value );
 	}
 
+	vec3_t origin, angles;
 	if (self->client->ps.clientNum == 0)
 	{
-		vec3_t origin, angles;
 		BG_CalculateVROffHandPosition(origin, angles);
 		AngleVectors(angles, forward, NULL, NULL);
 	}
 	else
 	{
 		AngleVectors(self->client->ps.viewangles, forward, NULL, NULL);
+		VectorCopy(self->client->ps.viewangles, angles);
 	}
 	VectorNormalize( forward );
 	VectorMA( self->client->renderInfo.handLPoint, FORCE_GRIP_DIST, forward, end );
 
-	if ( self->enemy && (self->s.number || InFront( self->enemy->currentOrigin, self->client->renderInfo.eyePoint, self->client->ps.viewangles, 0.2f ) ) )
+	if ( self->enemy && (self->s.number || InFront( self->enemy->currentOrigin, self->client->renderInfo.eyePoint, angles, 0.2f ) ) )
 	{//NPCs can always lift enemy since we assume they're looking at them, players need to be facing the enemy
 		if ( gi.inPVS( self->enemy->currentOrigin, self->client->renderInfo.eyePoint ) )
 		{//must be in PVS
@@ -8131,7 +8142,16 @@ static void WP_ForcePowerRun( gentity_t *self, forcePowers_t forcePower, usercmd
 					NPC_SetAnim( self, SETANIM_TORSO, BOTH_FORCEGRIP_HOLD, SETANIM_FLAG_OVERRIDE|SETANIM_FLAG_HOLD );
 				}
 				//get their org
-				VectorCopy( self->client->ps.viewangles, angles );
+				if (self->client->ps.clientNum == 0)
+				{
+					vec3_t origin;
+					BG_CalculateVROffHandPosition(origin, angles);
+				}
+				else
+				{
+					VectorCopy( self->client->ps.viewangles, angles );
+				}
+
 				angles[0] -= 10;
 				AngleVectors( angles, dir, NULL, NULL );
 				if ( gripEnt->client )
@@ -8146,7 +8166,7 @@ static void WP_ForcePowerRun( gentity_t *self, forcePowers_t forcePower, usercmd
 				//how far are they
 				dist = Distance( self->client->renderInfo.handLPoint, gripEntOrg );
 				if ( self->client->ps.forcePowerLevel[FP_GRIP] == FORCE_LEVEL_2 &&
-					(!InFront( gripEntOrg, self->client->renderInfo.handLPoint, self->client->ps.viewangles, 0.3f ) ||
+					(!InFront( gripEntOrg, self->client->renderInfo.handLPoint, angles, 0.3f ) ||
 						DistanceSquared( gripEntOrg, self->client->renderInfo.handLPoint ) > FORCE_GRIP_DIST_SQUARED))
 				{//must face them
 					WP_ForcePowerStop( self, FP_GRIP );
diff --git a/assets/z_npc_vr.pk3 b/assets/z_npc_vr.pk3
deleted file mode 100644
index d90091b285427de6230a38bab6688114e685129f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5082
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
b7t#Jz$J&2OU}68&2l}7U^QU4{{B`;tS*>wQ

diff --git a/assets/z_vr_assets.pk3 b/assets/z_vr_assets.pk3
new file mode 100644
index 0000000000000000000000000000000000000000..2320481f95af34cdbd44100d92e36a69d7784004
GIT binary patch
literal 10575
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
W6CUA@Ar$<d<>=2$0{@zIsQ&{Qck2xR

literal 0
HcmV?d00001

diff --git a/java/com/drbeef/jkquest/GLES3JNIActivity.java b/java/com/drbeef/jkquest/GLES3JNIActivity.java
index b41ccaa..4e66611 100644
--- a/java/com/drbeef/jkquest/GLES3JNIActivity.java
+++ b/java/com/drbeef/jkquest/GLES3JNIActivity.java
@@ -189,8 +189,8 @@ import static android.system.Os.setenv;
 		copy_asset("/sdcard/JKQuest/Demo/base", "UltimateSounds_JK2.pk3", false);
 		copy_asset("/sdcard/JKQuest/Demo/base", "z_bryar_ashura.pk3", false);
 
-		//Bummser's NPC tweaks
-		copy_asset("/sdcard/JKQuest/Demo/base", "z_npc_vr.pk3", false);
+		//Our assets
+		copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true);
 
 		commandLineParams = "jo";