Ensure haptics on correct controller via GetComponentInParent(), close …

…#11
campfireunion · Aug 29, 2017 · 478e5c6 · 478e5c6
1 parent b1911e4
commit 478e5c6
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Assets/VRKeys/Scripts/Platforms/OpenVRHaptics.cs b/Assets/VRKeys/Scripts/Platforms/OpenVRHaptics.cs
@@ -16,14 +16,20 @@ namespace VRKeys {
 
 	public class OpenVRHaptics : Haptics {
 
+		private int deviceIndex = -1;
+
+		private SteamVR_Controller.Device controller;
+
 		public override void TriggerPulse () {
-			int deviceIndex = (mallet.hand == Mallet.MalletHand.Left)
-				? SteamVR_Controller.GetDeviceIndex (SteamVR_Controller.DeviceRelation.Leftmost)
-				: SteamVR_Controller.GetDeviceIndex (SteamVR_Controller.DeviceRelation.Rightmost);
+			if (deviceIndex == -1) {
+				var trackedObject = GetComponentInParent<SteamVR_TrackedObject> ();
+				if (trackedObject == null) return;
 
-			if (deviceIndex == -1) return;
+				deviceIndex = (int) trackedObject.index;
+				if (deviceIndex == -1) return;
 
-			var controller = SteamVR_Controller.Input (deviceIndex);
+				controller = SteamVR_Controller.Input (deviceIndex);
+			}
 
 			controller.TriggerHapticPulse (800);
 		}