Additional formatting and refactoring

Author: keveleigh

Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs

@@ -245,7 +245,7 @@ public override void Disable()
         public override void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventFunction<T> eventHandler)
         {
             Debug.Assert(eventData != null);
-            Debug.Assert(!(eventData is  MixedRealityPointerEventData), "HandleEvent called with a pointer event. All events raised by pointer should call HandlePointerEvent");
+            Debug.Assert(!(eventData is MixedRealityPointerEventData), "HandleEvent called with a pointer event. All events raised by pointer should call HandlePointerEvent");
 
             if (disabledRefCount > 0)
             {
@@ -254,7 +254,7 @@ public override void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.Event
 
             var baseInputEventData = ExecuteEvents.ValidateEventData<BaseInputEventData>(eventData);
             DispatchEventToGlobalListeners(baseInputEventData, eventHandler);
-            
+
             if (baseInputEventData.used)
             {
                 // All global listeners get a chance to see the event,
@@ -277,7 +277,7 @@ public override void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.Event
                 DispatchEventToFallbackHandlers(baseInputEventData, eventHandler);
             }
         }
-        
+
         /// <summary>
         /// Handles a pointer event
         /// Assumption: We only send pointer events to the objects that pointers are focusing, except for global event listeners (which listen to everything)
@@ -304,7 +304,7 @@ private void HandlePointerEvent<T>(BaseEventData eventData, ExecuteEvents.EventF
 
             Debug.Assert(pointerEventData.Pointer != null, "Trying to dispatch event on pointer but pointerEventData is null");
 
-            DispatchEventToObjectFocusedByPointer(pointerEventData.Pointer, baseInputEventData, false, eventHandler);                
+            DispatchEventToObjectFocusedByPointer(pointerEventData.Pointer, baseInputEventData, false, eventHandler);
 
             if (!baseInputEventData.used)
             {
@@ -323,7 +323,7 @@ private void DispatchEventToGlobalListeners<T>(BaseInputEventData baseInputEvent
             Debug.Assert(baseInputEventData.InputSource != null, $"Failed to find an input source for {baseInputEventData}");
 
             // Send the event to global listeners
-            base.HandleEvent(baseInputEventData, eventHandler);            
+            base.HandleEvent(baseInputEventData, eventHandler);
         }
 
         private void DispatchEventToFallbackHandlers<T>(BaseInputEventData baseInputEventData, ExecuteEvents.EventFunction<T> eventHandler) where T : IEventSystemHandler
@@ -336,12 +336,11 @@ private void DispatchEventToFallbackHandlers<T>(BaseInputEventData baseInputEven
             }
         }
 
-        
         /// <summary>
         /// Dispatch an input event to the object focused by the given IMixedRealityPointer.
         /// If a modal dialog is active, dispatch the pointer event to that modal dialog
         /// Returns true if the event was handled by a modal handler
-        private bool DispatchEventToObjectFocusedByPointer<T>(IMixedRealityPointer mixedRealityPointer, BaseInputEventData baseInputEventData, 
+        private bool DispatchEventToObjectFocusedByPointer<T>(IMixedRealityPointer mixedRealityPointer, BaseInputEventData baseInputEventData,
             bool modalEventHandled, ExecuteEvents.EventFunction<T> eventHandler) where T : IEventSystemHandler
         {
             GameObject focusedObject = FocusProvider?.GetFocusedObject(mixedRealityPointer);
@@ -849,10 +848,7 @@ public void RaiseFocusExit(IMixedRealityPointer pointer, GameObject unfocusedObj
         /// <inheritdoc />
         public void RaisePointerDown(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)
         {
-            // Create input event
-            pointerEventData.Initialize(pointer, handedness, inputAction);
-
-            ExecutePointerDown(HandlePointerDown(pointer));
+            RaisePointerDown(pointer, inputAction, handedness);
         }
 
         /// <inheritdoc />
@@ -933,10 +929,7 @@ private void HandleClick()
         /// <inheritdoc />
         public void RaisePointerUp(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)
         {
-            // Create input event
-            pointerEventData.Initialize(pointer, handedness, inputAction);
-
-            ExecutePointerUp(HandlePointerUp(pointer));
+            RaisePointerUp(pointer, inputAction, handedness);
         }
 
         /// <inheritdoc />