From f9da415286bfe849fd528e67565f30b341a77e61 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 31 Jul 2019 23:01:20 +0100 Subject: [PATCH] Gun angle adjustment --- Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c | 2 +- .../jni/src/hlsdk-xash3d/cl_dll/hl/hl_weapons.cpp | 2 +- .../Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp | 2 +- .../Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp | 8 ++++---- Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.cpp | 2 +- Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.h | 9 +++++++++ 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c index ddb6a3c..2b2bddf 100644 --- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c +++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c @@ -1831,7 +1831,7 @@ static void initializeVRCvars() vr_reloadtimeoutms = Cvar_Get( "vr_reloadtimeoutms", "200", CVAR_ARCHIVE, "How quickly the grip trigger needs to be release to initiate a reload" ); vr_positionalMultiplier = Cvar_Get( "vr_positionalMultiplier", "2600", CVAR_ARCHIVE, "Arbitrary number that makes positional tracking work well" ); vr_walkdirection = Cvar_Get( "vr_walkdirection", "0", CVAR_ARCHIVE, "1 - Use HMD for direction, 0 - Use off-hand controller for direction" ); - vr_gunangleadjust = Cvar_Get( "vr_gunangleadjust", "0.0", CVAR_ARCHIVE, "gun pitch angle adjust" ); + vr_gunangleadjust = Cvar_Get( "vr_gunangleadjust", "20.0", CVAR_ARCHIVE, "gun pitch angle adjust" ); vr_weaponrecoil = Cvar_Get( "vr_weaponrecoil", "0", CVAR_ARCHIVE, "Enables weapon recoil in VR, default is disabled, warning could make you sick" ); vr_lasersight = Cvar_Get( "vr_lasersight", "0", CVAR_ARCHIVE, "Enables laser-sight" ); } diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/hl/hl_weapons.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/hl/hl_weapons.cpp index 94b5653..895ee62 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/hl/hl_weapons.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/hl/hl_weapons.cpp @@ -353,7 +353,7 @@ void CBasePlayerWeapon::MakeLaser( void ) // set to follow laser spot Vector vecTmpEnd = vecSrc + vecAiming * 2048 * flBeamLength; if (!m_pLaser) { - m_pLaser = CBeam::BeamCreate(g_pModelNameLaser, 4); + m_pLaser = CBeam::BeamCreate(g_pModelNameLaser, 3); } m_pLaser->PointsInit( vecSrc, vecEnd ); m_pLaser->SetColor( 214, 34, 34 ); diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp index 3df8eed..36c5a25 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp @@ -102,7 +102,7 @@ void VRHelper::UpdateGunPosition(struct ref_params_s* pparams) viewent->angles = pparams->weapon.angles; if (positions.currentWeapon == WEAPON_CROWBAR) { - viewent->angles[0] -= (vr_gunangleadjust->value - 15.0f); + viewent->angles[0] += (vr_gunangleadjust->value + 20.0f); } VectorCopy(viewent->angles, viewent->curstate.angles); diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp index 5268eec..b1b3c9a 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp @@ -57,10 +57,10 @@ void VRRenderer::Frame(double time) gEngfuncs.pfnClientCmd("default_fov 108"); //Force set these for now - gEngfuncs.pfnClientCmd("cl_upspeed 120"); - gEngfuncs.pfnClientCmd("cl_forwardspeed 120"); - gEngfuncs.pfnClientCmd("cl_backspeed 120"); - gEngfuncs.pfnClientCmd("cl_sidespeed 120"); + gEngfuncs.pfnClientCmd("cl_upspeed 150"); + gEngfuncs.pfnClientCmd("cl_forwardspeed 150"); + gEngfuncs.pfnClientCmd("cl_backspeed 150"); + gEngfuncs.pfnClientCmd("cl_sidespeed 150"); gEngfuncs.pfnClientCmd("cl_movespeedkey 3.0"); } diff --git a/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.cpp b/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.cpp index 29cc3b4..af2364c 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.cpp @@ -722,7 +722,7 @@ void CBasePlayerWeapon::MakeLaser( void ) // set to follow laser spot Vector vecTmpEnd = vecSrc + vecAiming * 2048 * flBeamLength; if (!m_pLaser) { - m_pLaser = CBeam::BeamCreate(g_pModelNameLaser, 4); + m_pLaser = CBeam::BeamCreate(g_pModelNameLaser, 3); } m_pLaser->PointsInit( vecSrc, vecEnd ); m_pLaser->SetColor( 214, 34, 34 ); diff --git a/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.h b/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.h index ec98913..e30dd06 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.h +++ b/Projects/Android/jni/src/hlsdk-xash3d/dlls/weapons.h @@ -919,6 +919,9 @@ public: void Holster( int skiplocal = 0 ); void WeaponIdle( void ); + void KillLaser( ) {} + void MakeLaser( ) {} + virtual BOOL UseDecrement( void ) { #if defined( CLIENT_WEAPONS ) @@ -949,6 +952,9 @@ public: BOOL Deploy( void ); BOOL IsUseable( void ); + void KillLaser( ) {} + void MakeLaser( ) {} + void Holster( int skiplocal = 0 ); void WeaponIdle( void ); void Throw( void ); @@ -982,6 +988,9 @@ public: void Holster( int skiplocal = 0 ); void WeaponIdle( void ); + void KillLaser( ) {} + void MakeLaser( ) {} + virtual BOOL UseDecrement( void ) { #if defined( CLIENT_WEAPONS )