Added vr_relativeAxis

Codes4Fun · Dec 4, 2016 · ae9aa09 · ae9aa09
1 parent 01d0814
commit ae9aa09
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/neo/framework/UsercmdGen.cpp b/neo/framework/UsercmdGen.cpp
@@ -283,6 +283,8 @@ class idUsercmdGenLocal : public idUsercmdGen
  int impulse;
 
  int vrClickCount;
+ bool vrTouched;
+ idVec2 vrTouchedAxis;
 
  buttonState_t toggled_crouch;
  buttonState_t toggled_run;
@@ -1067,6 +1069,19 @@ void idUsercmdGenLocal::VRControlMove()
  idVec2 axis;
  if( VR_GetLeftControllerAxis(axis) )
  {
+ if( vr_relativeAxis.GetBool() )
+ {
+ if( !vrTouched )
+ {
+ vrTouched = true;
+ vrTouchedAxis = axis;
+ axis.Zero();
+ }
+ else
+ {
+ axis -= vrTouchedAxis;
+ }
+ }
  if( VR_LeftControllerWasPressed() )
  {
  vrClickCount++;
@@ -1223,6 +1238,7 @@ void idUsercmdGenLocal::VRControlMove()
  else
  {
  vrClickCount = 0;
+ vrTouched = false;
  }
  if( vr_turning.GetInteger() && VR_GetRightControllerAxis(axis) && fabs(axis.y) < 0.5 )
  {

diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp
@@ -293,6 +293,7 @@ idCVar vr_forceGamepad( "vr_forceGamepad", "0", CVAR_RENDERER | CVAR_ARCHIVE | C
 idCVar vr_knockbackScale( "vr_knockbackScale", "1", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_FLOAT, "how much knockback affects you" );
 idCVar vr_strafing( "vr_strafing", "1", CVAR_ARCHIVE | CVAR_BOOL, "enable/disable left control strafing" );
 idCVar vr_forwardOnly( "vr_forwardOnly", "0", CVAR_ARCHIVE | CVAR_BOOL, "left touchpad only moves forward" );
+idCVar vr_relativeAxis( "vr_relativeAxis", "0", CVAR_ARCHIVE | CVAR_BOOL, "movement relative to initial touch" );
 idCVar vr_maxRadius( "vr_maxRadius", "0.9", CVAR_ARCHIVE | CVAR_FLOAT, "smaller values make it easier to hit max movement speed" );
 idCVar vr_turning( "vr_turning", "0", CVAR_ARCHIVE | CVAR_BOOL, "0 no turning | 1 touch turning" );
 idCVar vr_responseCurve( "vr_responseCurve", "0", CVAR_ARCHIVE | CVAR_FLOAT, "interpoloate between linear and square curves, -1 for inverse square" );

diff --git a/neo/renderer/tr_local.h b/neo/renderer/tr_local.h
@@ -1143,6 +1143,7 @@ extern idCVar vr_forceGamepad;
 extern idCVar vr_knockbackScale;
 extern idCVar vr_strafing;
 extern idCVar vr_forwardOnly;
+extern idCVar vr_relativeAxis;
 extern idCVar vr_turning;
 extern idCVar vr_responseCurve;
 extern idCVar vr_moveMode;