teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into contributions

Browse source
This commit is contained in:
Petr Bartos 2023-04-01 11:15:25 +02:00
commit baec8832ab
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
View file

@ -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_VRNOCULLFACE;
handEnt.renderfx = RF_DEPTHHACK | RF_VRVIEWMODEL;
if (cg.snap->ps.powerups[PW_FORCE_PUSH] > cg.time ||
(cg.snap->ps.forcePowersActive & (1<<FP_GRIP)) ||

2
Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
View file

@ -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;
gun.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON | RF_VRVIEWMODEL;
//---------
// OK, we are making an assumption here that if we have the phaser that it is always on....

2
Projects/Android/jni/OpenJK/code/rd-common/tr_types.h
View file

@ -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_VRNOCULLFACE 0x1000000 // specifically drawing a VR hand so back face culling is disabled
#define RF_VRVIEWMODEL 0x1000000 // specifically drawing a VR hand/weapon model
// refdef flags
#define RDF_NOWORLDMODEL 1 // used for player configuration screen

2
Projects/Android/jni/OpenJK/code/rd-gles/tr_backend.cpp
View file

@ -810,7 +810,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
depthRange = qtrue;
}
if (backEnd.currentEntity->e.renderfx & RF_VRNOCULLFACE) {
if (backEnd.currentEntity->e.renderfx & RF_VRVIEWMODEL) {
isVRViewModel = qtrue;
}
} else {

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
View file

@ -2052,7 +2052,7 @@ wasForceSpeed=isForceSpeed;
VectorMA( handEnt.origin, -3.0f, forward, handEnt.origin );
handEnt.renderfx = RF_DEPTHHACK | RF_VRNOCULLFACE;
handEnt.renderfx = RF_DEPTHHACK | RF_VRVIEWMODEL;
if (cg.snap->ps.powerups[PW_FORCE_PUSH] > cg.time ||
(cg.snap->ps.forcePowersActive & (1<<FP_GRIP)) ||

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
View file

@ -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 ;
gun.renderfx = RF_DEPTHHACK | RF_FIRST_PERSON | RF_VRVIEWMODEL;
//---------