From a3810f128a99936801c5a390ce39b33e4549af0b Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Sep 2019 20:43:05 +0100 Subject: [PATCH 1/5] Improved HUD "stealth" sprite --- Projects/Android/jni/src/hlsdk-xash3d | 2 +- assets/sprites/s_stealth.spr | Bin 4926 -> 1854 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Android/jni/src/hlsdk-xash3d b/Projects/Android/jni/src/hlsdk-xash3d index b9f3370..11fd4d7 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d +++ b/Projects/Android/jni/src/hlsdk-xash3d @@ -1 +1 @@ -Subproject commit b9f337071c2c78662f0227226b0a105fbe7cec6b +Subproject commit 11fd4d7cee53716ab0e627ab327a0684f0b9295f diff --git a/assets/sprites/s_stealth.spr b/assets/sprites/s_stealth.spr index fd87c694339cff4a38ce65017efb4465f5d979f5..d164161ed4ff5c6e683dd35b7154110378362a4e 100644 GIT binary patch delta 1026 zcmZWoJCE8x5MIn+JlN;kW$gol2^R@nN2G|7D&m?*6hY~cB04J4(jZZW5;{uKQAH>% z4J92VB`wWK`2l3cyzFG8-JRWU9^cN+u3y&f==1B>FNP3;M~cQD`2FdbRvx@(iB_Ka z{eG=hTdh{R-EKCUwcG8(;oy1RcDrpho8$3#u~>Aw-Sv8XI-U0W{bsYN*XzsW(zfm6 z@i-g~Tdh_YhV%J+GMO|QjgH;v^m@I)U{I}AfBpDrgm2_2Db@33&=N_?0X_YeE}Io! zDX5TI$~ua~Es|ceJO^n5IobpxO)3V$3QW_w1~9LRC}?0uEuJ3BX6C^(%`i0I1%#K` z#>p~D0_XxDA^=F4)q&%%jYaw60=|o2rwShXk`Rs24VQsZMjkU~=sc%yD5WT(7E;Gy z!Q?N3wy5NkEW~l^3i1k-ltOt;9hns%mY>RiRFt^Cs9f)-B$rGnKLLxU^Ck|Y){q*2hZ0O|S1~c`e*3_V9>Mt@f z^2Li6_3PL7@$or)_^?u`EGa43v}x10apSIEzuu-zo87y24;V0@diCl{mMjSm5BK!+ z{P*u)K|#T(Q>Wx|d9!BC)M|A|NXYQv!}smm_xkng`}gmsr>C!8y}E1HuJ-o!4h|00 zs#ODcjT$v-)~s2pR;}8#YuBk$r*7T4_3G7weH|Sg8#HLpuwlbSjT$v>+_*`TCQX|* z1+~qaH+OP!YSE%a%a$!$wQAM6b!%s5XE;yWwryQpT-vp3=j!U}=H}+^?(X5?(Y}3q zI9P`c9XfXG*r`*e&Ye4Zd3kl|(gn`Yty{P5-Mjbb(W7V2p5ETxy?XWP-Mcqjwojiv zef#$H_4W1h^Yi!j@7J$iKtMqM{{7*y0|yQqG-%M^!Gnhk84?&6ICSXHVZ(;O1xJh+ zF>>U{QKLqU9zA-@m@#9=js+`?A3r`QC}_fj3Bkd^6DLlbG-(o8BQ!L0^5n@=rc9YS zb?UTf)22_K9u^ihW5$e`GiQPgBO)SZ&6+iP_Ut)x=FFWtciy~t^XJb8M=V&dVBx}r zQBhHg7A=a7j*f|miH(h2ym&EKe(BPs%a$!$zI^$L6)RS*T)Ar1DzNaHHEY(cUAu1G zy7lYVZ`iP5(;GtadF$WZQH(m`;HwucJAD{Yu7Gt<(@rz;^X5J z5)$_A-3$IoOiWBlO4`4Fe{yp2fddB)9z2+ml9HO5dg#z02!C&akmoHzra^>pP ztJkhwgAlrLl&d$ln$<57u_39Ob)|)qP^78WDzI~gYpa1UNyZ7(k zLmUCa=g*(Ne*OCW z`}dzee@aVB|Ni|8VN7L0Hq7=gyD>kQgu~Lxf+S5;LZpo!sAI@F{m7hw?;qcNTYa59Wkhw9e;iUiZ2&a@*j%g zX>%Sg2d*ipRO{Q?m}^O^4S5Vl8LLbo^w>dFYg^Km{;K3;G=#Z|E$qk#Lp8~HpHe~) z6-d%n&&Fc`cs zUJ%EX*(kK^Nf_ZIQJ&IVO)V?H&g_wqxiTs$p!MmDtODKyHq~OW!%Bcb7Z#?lssNyh zBx!-gQcNx5vnq^K)F;?oAABhaCq&N=JJWb@kJ4BiZ@}(Xc7`k@nmBj3cd}`f-CQh9bj~w6f&n5W?Dq zUFh>g3ZuiCRAQ5#tA$c=3;OIxBTkgvQ7}t4LX|)kw~)r89SeshNld9n%z($BT*=5I zkdA|b5Lzm6i1G_BDc#4#GoL*Iu2u2|z=b}G)Xb8h3+^v(@O$B?s-kcib2S_a;fXrH zSgBEs$l^$`&Z%OuvLX&7;9-lmF~M|n$>h`M!I%Jy&P2Af`zQt4H=y4;3|`uO6kf}M zCiMG2gO_NU6qX*s^II@GYKpp4*JAN#_g8b_PFDsQD&J11f=;HzLHmy|`JZe6qQPB8uiZ^{* Date: Thu, 12 Sep 2019 21:46:01 +0100 Subject: [PATCH 2/5] Make mirrored weapons a cvar option --- Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c | 1 + Projects/Android/jni/src/Lambda1VR/VrCvars.h | 1 + Projects/Android/jni/src/hlsdk-xash3d | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c index 084dec2..6e11b45 100644 --- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c +++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c @@ -1325,6 +1325,7 @@ void VR_Init() vr_enable_crouching = Cvar_Get( "vr_enable_crouching", "1", CVAR_ARCHIVE, "Crouching irl triggers ducking in game" ); vr_height_adjust = Cvar_Get( "vr_height_adjust", "0.0", CVAR_ARCHIVE, "Additional height adjustment for in-game player (in metres)" ); vr_flashlight_model = Cvar_Get( "vr_flashlight_model", "1", CVAR_ARCHIVE, "Set to 0 to prevent drawing the flashlight model" ); + vr_mirror_weapons = Cvar_Get( "vr_mirror_weapons", "0", CVAR_ARCHIVE, "Set to 1 to mirror the weapon models (for left handed use)" ); //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" ); diff --git a/Projects/Android/jni/src/Lambda1VR/VrCvars.h b/Projects/Android/jni/src/Lambda1VR/VrCvars.h index 6f9783f..a71469f 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrCvars.h +++ b/Projects/Android/jni/src/Lambda1VR/VrCvars.h @@ -15,6 +15,7 @@ convar_t *vr_control_scheme; convar_t *vr_enable_crouching; convar_t *vr_height_adjust; convar_t *vr_flashlight_model; +convar_t *vr_mirror_weapons; //Used and updated continuously during rendering convar_t *vr_stereo_side; \ No newline at end of file diff --git a/Projects/Android/jni/src/hlsdk-xash3d b/Projects/Android/jni/src/hlsdk-xash3d index 11fd4d7..564ce08 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d +++ b/Projects/Android/jni/src/hlsdk-xash3d @@ -1 +1 @@ -Subproject commit 11fd4d7cee53716ab0e627ab327a0684f0b9295f +Subproject commit 564ce08e01fd5a1d10f06a54300cc758d7a0e96a From d4ba6a359171f922b713bb9a63da072f34feb1ac Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Sep 2019 22:14:43 +0100 Subject: [PATCH 3/5] Update hlsdk-xash3d --- Projects/Android/jni/src/hlsdk-xash3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Android/jni/src/hlsdk-xash3d b/Projects/Android/jni/src/hlsdk-xash3d index 564ce08..ded2e78 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d +++ b/Projects/Android/jni/src/hlsdk-xash3d @@ -1 +1 @@ -Subproject commit 564ce08e01fd5a1d10f06a54300cc758d7a0e96a +Subproject commit ded2e78f9064a5b5bc2be3935614505446e2146c From cc952647e686f2a3d97081b84de56806b07242a6 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 12 Sep 2019 23:19:04 +0100 Subject: [PATCH 4/5] Ensure random number gen is seeded --- Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c index 6e11b45..c719408 100644 --- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c +++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c @@ -1311,6 +1311,9 @@ void VR_Init() snapTurn = 0.0f; ducked = DUCK_NOTDUCKED; + //init randomiser + srand(time(NULL)); + //Create Cvars vr_snapturn_angle = Cvar_Get( "vr_snapturn_angle", "45", CVAR_ARCHIVE, "Sets the angle for snap-turn, set to < 10.0 to enable smooth turning" ); vr_reloadtimeoutms = Cvar_Get( "vr_reloadtimeoutms", "200", CVAR_ARCHIVE, "How quickly the grip trigger needs to be release to initiate a reload" ); From 662abf6256f5e61db86b94a642bf03b70bc2aecc Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 13 Sep 2019 08:39:49 +0100 Subject: [PATCH 5/5] vr_mirror_weapons usage also fixed couple of build warnings --- Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c | 6 +++--- .../Android/jni/src/Xash3D/xash3d/engine/client/gl_studio.c | 6 ++++-- Projects/Android/jni/src/gl4es/src/gl/const.h | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c index c719408..95a3cc3 100644 --- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c +++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c @@ -1407,14 +1407,14 @@ void * AppThreadFunction( void * parm ) #ifndef DEMO if (argc != 0) { - Host_Main(argc, argv, "valve", false, NULL); + Host_Main(argc, (const char**)argv, "valve", false, NULL); } else #endif { int argc = 1; char *argv[] = { "xash3d" }; - Host_Main(argc, argv, "valve", false, NULL); + Host_Main(argc, (const char**)argv, "valve", false, NULL); } xash_initialised = true; @@ -1554,7 +1554,7 @@ void * AppThreadFunction( void * parm ) break; } - static usingScreenLayer = true; //Starts off using the screen layer + static bool usingScreenLayer = true; //Starts off using the screen layer if (usingScreenLayer != useScreenLayer()) { usingScreenLayer = useScreenLayer(); diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/gl_studio.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/gl_studio.c index ee8046f..dcc043a 100644 --- a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/gl_studio.c +++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/gl_studio.c @@ -3721,6 +3721,8 @@ void R_RunViewmodelEvents( void ) R_DrawViewModel ================= */ + +extern convar_t *vr_mirror_weapons; void R_DrawViewModel( void ) { if( RI.refdef.onlyClientDraw || r_drawviewmodel->integer == 0 ) @@ -3750,8 +3752,8 @@ void R_DrawViewModel( void ) // hack the depth range to prevent view model from poking into walls pglDepthRange( gldepthmin, gldepthmin + 0.3f * ( gldepthmax - gldepthmin )); - // backface culling for left-handed weapons - g_iBackFaceCull = r_lefthand->integer == 1;//R_LeftHand(); // GL_FrontFace is called in SetupStudioRenderer + // backface culling for mirrored weapons + g_iBackFaceCull = vr_mirror_weapons->integer == 1;//R_LeftHand(); // GL_FrontFace is called in SetupStudioRenderer RI.currententity->curstate.scale = 1.0f; RI.currententity->curstate.frame = 0; RI.currententity->curstate.framerate = 1.0f; diff --git a/Projects/Android/jni/src/gl4es/src/gl/const.h b/Projects/Android/jni/src/gl4es/src/gl/const.h index 5b21f0c..c096f2d 100644 --- a/Projects/Android/jni/src/gl4es/src/gl/const.h +++ b/Projects/Android/jni/src/gl4es/src/gl/const.h @@ -581,7 +581,9 @@ #define GL_TEXTURE_DEPTH_TYPE 0x8C16 #define GL_UNSIGNED_NORMALIZED 0x8C17 #define GL_FRAMEBUFFER_BINDING 0x8CA6 +#ifndef GL_DRAW_FRAMEBUFFER_BINDING #define GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING +#endif #define GL_RENDERBUFFER_BINDING 0x8CA7 #define GL_READ_FRAMEBUFFER 0x8CA8 #define GL_DRAW_FRAMEBUFFER 0x8CA9