Changed lambdas to functions in touch handlers.

valyard · valyard · commit 74f5cb78dc30 · 2017-12-12T18:17:54.000+03:00
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/MouseHandler.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/MouseHandler.cs
@@ -103,7 +103,7 @@ public MouseHandler(IInputSource input, PointerDelegate addPointer, PointerDeleg
             this.removePointer = removePointer;
             this.cancelPointer = cancelPointer;
 
-            mousePool = new ObjectPool<MousePointer>(4, () => new MousePointer(input), null, resetPointer);
+            mousePool = new ObjectPool<MousePointer>(4, newPointer, null, resetPointer);
 
             mousePointPos = Input.mousePosition;
             mousePointer = internalAddPointer(remapCoordinates(mousePointPos));
@@ -424,6 +424,11 @@ private void resetPointer(Pointer p)
             p.INTERNAL_Reset();
         }
 
+        private MousePointer newPointer()
+        {
+            return new MousePointer(input);
+        }
+
         #endregion
 
         #region State logic
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/TouchHandler.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/TouchHandler.cs
@@ -74,7 +74,7 @@ public TouchHandler(IInputSource input, PointerDelegate addPointer, PointerDeleg
             this.removePointer = removePointer;
             this.cancelPointer = cancelPointer;
 
-            touchPool = new ObjectPool<TouchPointer>(10, () => new TouchPointer(input), null, resetPointer, "TouchHandler/Touch");
+            touchPool = new ObjectPool<TouchPointer>(10, newPointer, null, resetPointer, "TouchHandler/Touch");
             touchPool.Name = "Touch";
 
 #if UNITY_5_6_OR_NEWER
@@ -274,6 +274,11 @@ private void resetPointer(Pointer p)
             p.INTERNAL_Reset();
         }
 
+        private TouchPointer newPointer()
+        {
+            return new TouchPointer(input);
+        }
+
         #endregion
 
         private struct TouchState
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/WindowsPointerHandlers.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/WindowsPointerHandlers.cs
@@ -65,8 +65,8 @@ public bool MouseInPointer
         /// <inheritdoc />
         public Windows8PointerHandler(IInputSource input, PointerDelegate addPointer, PointerDelegate updatePointer, PointerDelegate pressPointer, PointerDelegate releasePointer, PointerDelegate removePointer, PointerDelegate cancelPointer) : base(input, addPointer, updatePointer, pressPointer, releasePointer, removePointer, cancelPointer)
         {
-            mousePool = new ObjectPool<MousePointer>(4, () => new MousePointer(input), null, resetPointer);
-            penPool = new ObjectPool<PenPointer>(2, () => new PenPointer(input), null, resetPointer);
+            mousePool = new ObjectPool<MousePointer>(4, newMousePointer, null, resetPointer);
+            penPool = new ObjectPool<PenPointer>(2, newPenPointer, null, resetPointer);
 
             mousePointer = internalAddMousePointer(Vector3.zero);
 
@@ -133,6 +133,20 @@ public override void Dispose()
         }
 
         #endregion
+
+        #region Private functions
+
+        private MousePointer newMousePointer()
+        {
+            return new MousePointer(input);
+        }
+
+        private PenPointer newPenPointer()
+        {
+            return new PenPointer(input);
+        }
+
+        #endregion
     }
 
     public class Windows7PointerHandler : WindowsPointerHandler
@@ -242,7 +256,7 @@ public WindowsPointerHandler(IInputSource input, PointerDelegate addPointer, Poi
             nativeLogDelegate = nativeLog;
             nativePointerDelegate = nativePointer;
 
-            touchPool = new ObjectPool<TouchPointer>(10, () => new TouchPointer(input), null, resetPointer);
+            touchPool = new ObjectPool<TouchPointer>(10, newTouchPointer, null, resetPointer);
 
             hMainWindow = WindowsUtils.GetActiveWindow();
             disablePressAndHold();
@@ -453,6 +467,11 @@ private void setScaling(int screenWidth, int screenHeight)
             SetScreenParams(screenWidth, screenHeight, (width - screenWidth / scale) * .5f, (height - screenHeight / scale) * .5f, scale, scale);
         }
 
+        private TouchPointer newTouchPointer()
+        {
+            return new TouchPointer(input);
+        }
+
         #endregion
 
         #region Pointer callbacks
