Merge pull request #2886 from keveleigh/PointerEventData

David Kline · web-flow · commit 76d6041832ce · 2018-10-05T17:03:01.000-07:00
Properly initialize pointerEventData in the input manager
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs b/Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs
@@ -772,7 +772,7 @@ public void RaiseFocusExit(IMixedRealityPointer pointer, GameObject unfocusedObj
         public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputAction inputAction)
         {
             // Create input event
-            pointerEventData.Initialize(pointer.InputSourceParent, inputAction);
+            pointerEventData.Initialize(pointer, inputAction);
 
             ExecutePointerDown(HandlePointerDown(pointer));
         }
@@ -781,7 +781,7 @@ public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputActi
         public void RaisePointerDown(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)
         {
             // Create input event
-            pointerEventData.Initialize(pointer.InputSourceParent, handedness, inputAction);
+            pointerEventData.Initialize(pointer, handedness, inputAction);
 
             ExecutePointerDown(HandlePointerDown(pointer));
         }
@@ -855,7 +855,7 @@ private void HandleClick()
         public void RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction inputAction)
         {
             // Create input event
-            pointerEventData.Initialize(pointer.InputSourceParent, inputAction);
+            pointerEventData.Initialize(pointer, inputAction);
 
             ExecutePointerUp(HandlePointerUp(pointer));
         }
@@ -864,7 +864,7 @@ public void RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction
         public void RaisePointerUp(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)
         {
             // Create input event
-            pointerEventData.Initialize(pointer.InputSourceParent, handedness, inputAction);
+            pointerEventData.Initialize(pointer, handedness, inputAction);
 
             ExecutePointerUp(HandlePointerUp(pointer));
         }
diff --git a/Assets/MixedRealityToolkit/_Core/EventDatum/Input/MixedRealityPointerEventData.cs b/Assets/MixedRealityToolkit/_Core/EventDatum/Input/MixedRealityPointerEventData.cs
@@ -32,7 +32,7 @@ public MixedRealityPointerEventData(EventSystem eventSystem) : base(eventSystem)
         /// <param name="pointer"></param>
         /// <param name="inputAction"></param>
         /// <param name="count"></param>
-        public void Initialize(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, int count)
+        public void Initialize(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, int count = 0)
         {
             Initialize(pointer.InputSourceParent, inputAction);
             Pointer = pointer;
@@ -46,7 +46,7 @@ public void Initialize(IMixedRealityPointer pointer, MixedRealityInputAction inp
         /// <param name="count"></param>
         /// <param name="inputAction"></param>
         /// <param name="handedness"></param>
-        public void Initialize(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction, int count)
+        public void Initialize(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction, int count = 0)
         {
             Initialize(pointer.InputSourceParent, handedness, inputAction);
             Pointer = pointer;

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ public void RaiseFocusExit(IMixedRealityPointer pointer, GameObject unfocusedObj`
`772`	`772`	`public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputAction inputAction)`
`773`	`773`	`{`
`774`	`774`	`// Create input event`
`775`		`- pointerEventData.Initialize(pointer.InputSourceParent, inputAction);`
	`775`	`+ pointerEventData.Initialize(pointer, inputAction);`
`776`	`776`
`777`	`777`	`ExecutePointerDown(HandlePointerDown(pointer));`
`778`	`778`	`}`
`@@ -781,7 +781,7 @@ public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputActi`
`781`	`781`	`public void RaisePointerDown(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)`
`782`	`782`	`{`
`783`	`783`	`// Create input event`
`784`		`- pointerEventData.Initialize(pointer.InputSourceParent, handedness, inputAction);`
	`784`	`+ pointerEventData.Initialize(pointer, handedness, inputAction);`
`785`	`785`
`786`	`786`	`ExecutePointerDown(HandlePointerDown(pointer));`
`787`	`787`	`}`
`@@ -855,7 +855,7 @@ private void HandleClick()`
`855`	`855`	`public void RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction inputAction)`
`856`	`856`	`{`
`857`	`857`	`// Create input event`
`858`		`- pointerEventData.Initialize(pointer.InputSourceParent, inputAction);`
	`858`	`+ pointerEventData.Initialize(pointer, inputAction);`
`859`	`859`
`860`	`860`	`ExecutePointerUp(HandlePointerUp(pointer));`
`861`	`861`	`}`
`@@ -864,7 +864,7 @@ public void RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction`
`864`	`864`	`public void RaisePointerUp(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)`
`865`	`865`	`{`
`866`	`866`	`// Create input event`
`867`		`- pointerEventData.Initialize(pointer.InputSourceParent, handedness, inputAction);`
	`867`	`+ pointerEventData.Initialize(pointer, handedness, inputAction);`
`868`	`868`
`869`	`869`	`ExecutePointerUp(HandlePointerUp(pointer));`
`870`	`870`	`}`