From b899b99178603f92531fbb28527b7f1b5e32a375 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Thu, 30 Mar 2023 21:45:10 +0100
Subject: [PATCH] Removed the no-backface-culling for weapons as it is no
 longer needed

used only for hand models now
---
 Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp       | 2 +-
 Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp    | 2 +-
 Projects/Android/jni/OpenJK/code/rd-common/tr_types.h    | 2 +-
 Projects/Android/jni/OpenJK/code/rd-gles/tr_backend.cpp  | 2 +-
 Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp    | 2 +-
 Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
index 4b854de..d1224a2 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
@@ -2364,7 +2364,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) {
 			VectorMA( handEnt.origin, -3.0f, forward, handEnt.origin );
 
 
-			handEnt.renderfx = RF_DEPTHHACK | RF_VRVIEWMODEL;
+			handEnt.renderfx = RF_DEPTHHACK | RF_VRNOCULLFACE;
 
 			if (cg.snap->ps.powerups[PW_FORCE_PUSH] > cg.time ||
 				(cg.snap->ps.forcePowersActive & (1<<FP_GRIP)) ||
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
index ef2ed30..50918c2 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
@@ -1323,7 +1323,7 @@ void CG_AddViewWeapon( playerState_t *ps )
 		AnglesToAxis( angles, gun.axis );
 		CG_PositionEntityOnTag( &gun, &hand, weapon->handsModel, "tag_weapon");
 
-		gun.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON | RF_VRVIEWMODEL;
+		gun.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON;
 
 	//---------
 		// OK, we are making an assumption here that if we have the phaser that it is always on....
diff --git a/Projects/Android/jni/OpenJK/code/rd-common/tr_types.h b/Projects/Android/jni/OpenJK/code/rd-common/tr_types.h
index 630b3a7..9d5b8b8 100644
--- a/Projects/Android/jni/OpenJK/code/rd-common/tr_types.h
+++ b/Projects/Android/jni/OpenJK/code/rd-common/tr_types.h
@@ -76,7 +76,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #define RF_FORCE_ENT_ALPHA	0x800000 // override shader alpha settings
 
-#define RF_VRVIEWMODEL     0x1000000 // specifically drawing a VR hand/weapon model
+#define RF_VRNOCULLFACE     0x1000000 // specifically drawing a VR hand so back face culling is disabled
 
 // refdef flags
 #define RDF_NOWORLDMODEL	1		// used for player configuration screen
diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_backend.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_backend.cpp
index 6cda4cc..f74d31f 100644
--- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_backend.cpp
+++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_backend.cpp
@@ -810,7 +810,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 					depthRange = qtrue;
 				}
 
-				if (backEnd.currentEntity->e.renderfx & RF_VRVIEWMODEL) {
+				if (backEnd.currentEntity->e.renderfx & RF_VRNOCULLFACE) {
 					isVRViewModel = qtrue;
 				}
 			} else {
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
index 9f43997..9eb0ae0 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
@@ -2052,7 +2052,7 @@ wasForceSpeed=isForceSpeed;
 			VectorMA( handEnt.origin, -3.0f, forward, handEnt.origin );
 
 
-			handEnt.renderfx = RF_DEPTHHACK | RF_VRVIEWMODEL;
+			handEnt.renderfx = RF_DEPTHHACK | RF_VRNOCULLFACE;
 
 			if (cg.snap->ps.powerups[PW_FORCE_PUSH] > cg.time ||
 				(cg.snap->ps.forcePowersActive & (1<<FP_GRIP)) ||
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
index bb5e124..21e6f8a 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
@@ -1230,7 +1230,7 @@ void CG_AddViewWeapon( playerState_t *ps )
 	AnglesToAxis( angles, gun.axis );
 	CG_PositionEntityOnTag( &gun, &hand, weapon->handsModel, "tag_weapon");
 
-    gun.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON | RF_VRVIEWMODEL;
+    gun.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON ;
 
 
 //---------