fix(Interaction): ensure haptic pulse duration is a float

Previously, the haptic pulse duration on the interact touch/grab/use scripts was being cast to an int, which is incorrect, the type taken byt the `TriggerHapticPulse` method is of type float so no cast is needed.
ExtendRealityLtd · Jun 29, 2016 · a219347 · a219347
1 parent 980e8bf
commit a219347
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Assets/SteamVR_Unity_Toolkit/Scripts/VRTK_InteractGrab.cs b/Assets/SteamVR_Unity_Toolkit/Scripts/VRTK_InteractGrab.cs
@@ -401,7 +401,7 @@ private void AttemptGrabObject()
                     var rumbleAmount = grabbedObject.GetComponent<VRTK_InteractableObject>().rumbleOnGrab;
                     if (!rumbleAmount.Equals(Vector2.zero))
                     {
-                        controllerActions.TriggerHapticPulse((ushort)rumbleAmount.y, (int)rumbleAmount.x, 0.05f);
+                        controllerActions.TriggerHapticPulse((ushort)rumbleAmount.y, rumbleAmount.x, 0.05f);
                     }
                 }
             }

diff --git a/Assets/SteamVR_Unity_Toolkit/Scripts/VRTK_InteractTouch.cs b/Assets/SteamVR_Unity_Toolkit/Scripts/VRTK_InteractTouch.cs
@@ -139,7 +139,7 @@ private void OnTriggerStay(Collider collider)
                 var rumbleAmount = touchedObjectScript.rumbleOnTouch;
                 if (!rumbleAmount.Equals(Vector2.zero))
                 {
-                    controllerActions.TriggerHapticPulse((ushort)rumbleAmount.y, (int)rumbleAmount.x, 0.05f);
+                    controllerActions.TriggerHapticPulse((ushort)rumbleAmount.y, rumbleAmount.x, 0.05f);
                 }
             }
         }

diff --git a/Assets/SteamVR_Unity_Toolkit/Scripts/VRTK_InteractUse.cs b/Assets/SteamVR_Unity_Toolkit/Scripts/VRTK_InteractUse.cs
@@ -122,7 +122,7 @@ private void UseInteractedObject(GameObject touchedObject)
                 var rumbleAmount = usingObjectScript.rumbleOnUse;
                 if (!rumbleAmount.Equals(Vector2.zero))
                 {
-                    controllerActions.TriggerHapticPulse((ushort)rumbleAmount.y, (int)rumbleAmount.x, 0.05f);
+                    controllerActions.TriggerHapticPulse((ushort)rumbleAmount.y, rumbleAmount.x, 0.05f);
                 }
             }
         }