Added option for disabling haptics

hh79 · Jul 24, 2020 · cc9b9ca · cc9b9ca
1 parent 983fa3f
commit cc9b9ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/common/rendering/hwrenderer/data/hw_vrmodes.cpp b/src/common/rendering/hwrenderer/data/hw_vrmodes.cpp
@@ -53,6 +53,7 @@ CVAR(Bool, openvr_drawControllers, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, openvr_weaponRotate, -40, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, openvr_weaponScale, 0.3f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
+CVAR(Bool, vr_enable_haptics, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, vr_pickup_haptic_level, 0.25f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, vr_quake_haptic_level, 0.8f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, vr_missile_haptic_level, 0.6f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)

diff --git a/src/rendering/gl/stereo3d/gl_openvr.cpp b/src/rendering/gl/stereo3d/gl_openvr.cpp
@@ -140,6 +140,7 @@ EXTERN_CVAR(Bool, openvr_drawControllers)
 EXTERN_CVAR(Float, openvr_weaponRotate);
 EXTERN_CVAR(Float, openvr_weaponScale);
 
+EXTERN_CVAR(Bool, vr_enable_haptics);
 EXTERN_CVAR(Float, vr_kill_momentum)
 
 //HUD control
@@ -410,6 +411,10 @@ namespace s3d
 	using namespace std::chrono;
 	void  OpenVRHaptics::ProcessHaptics() 
 	{
+		if (!vr_enable_haptics) {
+			return;
+		}
+
 		static double lastFrameTime = 0.0f;
 		double timestamp = (duration_cast<milliseconds>(
 			system_clock::now().time_since_epoch())).count();

diff --git a/wadsrc/static/language.csv b/wadsrc/static/language.csv
@@ -3818,6 +3818,7 @@ Head,VRPREFMNU_HEAD,,,,,,,,,,,,,,,,,,,,,,
 Off Hand,VRPREFMNU_OFF_HAND,,,,,,,,,,,,,,,,,,,,,,
 Weapon Scale,VRPREFMNU_WEAPONSCALE,,,,,,,,,,,,,,,,,,,,,,
 Disable slidey movement (kill momentum),VRPREFMNU_MOMENTUM,,,,,,,,,,,,,,,,,,,,,,,
+Enable Haptics,VRPREFMNU_ENABLEHAPTICS,,,,,,,,,,,,,,,,,,,,,,,
 Haptics,VRPREFMNU_HAPTICS,,,,,,,,,,,,,,,,,,,,,,,
 HUD,VRHUDMNU_HUD,,,,,,,,,,,,,,,,,,,,,,,
 VR HUD/Automap Options,VRHUDMNU_TITLE,,,,,,,,,,,,,,,,,,,,,,

diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
@@ -2685,10 +2685,11 @@ OptionMenu "OpenVROptions" protected
 	Slider "$VRPREFMNU_FATITEMWIDTH",			gl_fatItemWidth,						0, 1, 0.05, 2
 	Slider "$VRPREFMNU_WEAPONSCALE",			openvr_weaponScale,						0, 1, 0.05, 2
 	StaticText " "
-	Option "$VRPREFMNU_MOMENTUM",	    		"vr_kill_momentum", "OnOff"
+	Option "$VRPREFMNU_MOMENTUM",	    		vr_kill_momentum, "OnOff"
 	Option "$VRPREFMNU_DRAWCONTROLLERS",		openvr_drawControllers,					"OnOff"
 	StaticText " "
 	StaticText "$VRPREFMNU_HAPTICS"
+	Option "$VRPREFMNU_ENABLEHAPTICS",	    	vr_enable_haptics, "OnOff"
 	Slider "$VRPREFMNU_PICKUPHAPTIC",			vr_pickup_haptic_level,					0, 1, 0.1, 2
 	Slider "$VRPREFMNU_MISSILEHAPTIC",			vr_missile_haptic_level,				0, 1, 0.1, 2
 	Slider "$VRPREFMNU_QUAKEHAPTIC",			vr_quake_haptic_level,					0, 1, 0.1, 2