steam-frame/astromaddie--lambda1-vr
1
0 Fork 0
mirror of https://github.com/astromaddie/lambda1-vr.git synced 2026-10-19 12:00:14 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Move reload to grip and got it working correctly

Browse Source 
also fixes a bug where firing and reloading at the same time caused
primary fire to get stuck "on"
This commit is contained in:
Simon committed 2019-07-21 10:26:57 +01:00
1 parent aac9f2283f
commit cd9ecaec67
3 files changed
+34 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+30 -15
View File
@@ -1284,6 +1284,13 @@ static void ovrApp_HandleInput( ovrApp * app )
sendButtonAction("+use", (dominantTrackedRemoteState->Buttons & ovrButton_Joystick));
}
static bool finishReloadNextFrame = false;
if (finishReloadNextFrame)
{
sendButtonActionSimple("-reload");
finishReloadNextFrame = false;
}
if ((dominantTrackedRemoteState->Buttons & ovrButton_GripTrigger) !=
(dominantTrackedRemoteStateOld->Buttons & ovrButton_GripTrigger)) {
@@ -1298,7 +1305,7 @@ static void ovrApp_HandleInput( ovrApp * app )
if ((GetTimeInMilliSeconds() - dominantGripPushTime) < vr_reloadtimeoutms->integer)
{
sendButtonActionSimple("+reload");
sendButtonActionSimple("-reload");
finishReloadNextFrame = true;
}
}
}
@@ -1349,8 +1356,11 @@ static void ovrApp_HandleInput( ovrApp * app )
handleTrackedControllerButton(&rightTrackedRemoteState_new,
&rightTrackedRemoteState_old, ovrButton_B, K_SPACE);
//We need to record if we have started firing primary so that releasing trigger will stop firing, if user has pushed grip
//in meantime, then it wouldn't stop the gun firing and it would get stuck
static bool firingPrimary = false;
if (!r_lefthand->integer) {
if (dominantGripPushed && (GetTimeInMilliSeconds() - dominantGripPushTime) > vr_reloadtimeoutms->integer)
if (!firingPrimary && dominantGripPushed && (GetTimeInMilliSeconds() - dominantGripPushTime) > vr_reloadtimeoutms->integer)
{
//Fire Secondary
if ((rightTrackedRemoteState_new.Buttons & ovrButton_Trigger) !=
@@ -1358,12 +1368,15 @@ static void ovrApp_HandleInput( ovrApp * app )
sendButtonAction("+attack2", (rightTrackedRemoteState_new.Buttons & ovrButton_Trigger));
}
} else {
}
else
{
//Fire Primary
if ((rightTrackedRemoteState_new.Buttons & ovrButton_Trigger) !=
(rightTrackedRemoteState_old.Buttons & ovrButton_Trigger)) {
sendButtonAction("+attack", (rightTrackedRemoteState_new.Buttons & ovrButton_Trigger));
firingPrimary = (rightTrackedRemoteState_new.Buttons & ovrButton_Trigger);
sendButtonAction("+attack", firingPrimary);
}
}
} else {
@@ -1430,6 +1443,9 @@ static void ovrApp_HandleInput( ovrApp * app )
remote_movementSideways,
remote_movementForward);
//We need to record if we have started firing primary so that releasing trigger will stop definitely firing, if user has pushed grip
//in meantime, then it wouldn't stop the gun firing and it would get stuck
static bool firingPrimary = false;
if (!r_lefthand->integer) {
//flashlight on/off
if ((leftTrackedRemoteState_new.Buttons & ovrButton_Trigger) &&
@@ -1438,8 +1454,10 @@ static void ovrApp_HandleInput( ovrApp * app )
sendButtonActionSimple("impulse 100");
}
} else {
if (dominantGripPushed && (GetTimeInMilliSeconds() - dominantGripPushTime) > vr_reloadtimeoutms->integer)
}
else
{
if (!firingPrimary && dominantGripPushed && (GetTimeInMilliSeconds() - dominantGripPushTime) > vr_reloadtimeoutms->integer)
{
//Fire Secondary
if ((leftTrackedRemoteState_new.Buttons & ovrButton_Trigger) !=
@@ -1447,22 +1465,19 @@ static void ovrApp_HandleInput( ovrApp * app )
sendButtonAction("+attack2", (leftTrackedRemoteState_new.Buttons & ovrButton_Trigger));
}
} else {
}
else
{
//Fire Primary
if ((leftTrackedRemoteState_new.Buttons & ovrButton_Trigger) !=
(leftTrackedRemoteState_old.Buttons & ovrButton_Trigger)) {
sendButtonAction("+attack", (leftTrackedRemoteState_new.Buttons & ovrButton_Trigger));
firingPrimary = (leftTrackedRemoteState_new.Buttons & ovrButton_Trigger);
sendButtonAction("+attack", firingPrimary);
}
}
}
//Reload
if ((leftTrackedRemoteState_new.Buttons & ovrButton_X) !=
(leftTrackedRemoteState_old.Buttons & ovrButton_X)){
sendButtonAction("+reload", (leftTrackedRemoteState_new.Buttons & ovrButton_X));
}
static increaseSnap = true;
if (rightTrackedRemoteState_new.Joystick.x > 0.6f)
{
@@ -1747,7 +1762,7 @@ void initialize_gl4es();
static void initializeVRCvars()
{
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", "150", CVAR_ARCHIVE, "How quickly the grip trigger needs to be release to initiate a reload" );
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" );
}
Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_main.c
+1 -1
View File
@@ -2128,7 +2128,7 @@ void CL_InitLocal( void )
bottomcolor = Cvar_Get( "bottomcolor", "0", CVAR_USERINFO|CVAR_ARCHIVE, "player bottom color" );
rate = Cvar_Get( "rate", "25000", CVAR_USERINFO|CVAR_ARCHIVE, "player network rate" );
hltv = Cvar_Get( "hltv", "0", CVAR_USERINFO|CVAR_LATCH, "HLTV mode" );
cl_showfps = Cvar_Get( "cl_showfps", "1", CVAR_ARCHIVE, "show client fps" );
cl_showfps = Cvar_Get( "cl_showfps", "0", CVAR_ARCHIVE, "show client fps" );
cl_showpos = Cvar_Get( "cl_showpos", "0", CVAR_ARCHIVE, "show local player position and velocity" );
cl_cmdbackup = Cvar_Get( "cl_cmdbackup", "10", CVAR_ARCHIVE, "how many additional history commands are sent" );
cl_cmdrate = Cvar_Get( "cl_cmdrate", "30", CVAR_ARCHIVE, "max number of command packets sent to server per second" );
Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_scrn.c
+3 -3
View File
@@ -97,7 +97,7 @@ void SCR_DrawFPS( void )
}
else
{
int curfps = (int)( calc + 0.5f );
int curfps = (int)( ( calc / 2.0f ) + 0.5f ); // Divide by 2 as this gets calculated once per eye
if ( curfps < minfps )
minfps = curfps;
@@ -125,7 +125,7 @@ void SCR_DrawFPS( void )
}
Con_DrawStringLen( fpsstring, &offset, NULL );
Con_DrawString( scr_width->integer - offset - 2, 4, fpsstring, color );
Con_DrawString( (scr_width->integer / 2) - offset - 2, (int)(scr_height->integer * 0.6f), fpsstring, color );
}
/*
@@ -157,7 +157,7 @@ void SCR_DrawPos( void )
MakeRGBA( color, 255, 255, 255, 255 );
Con_DrawString( scr_width->integer / 2, 4, msg, color );
Con_DrawString( scr_width->integer / 2, (int)(scr_height->integer * 0.65f) , msg, color );
}