Fixed occasional frozen touches on windows.

valyard · valyard · commit 58ae80a3047b · 2017-07-23T14:50:22.000+03:00
diff --git a/External/WindowsTouch/WindowsTouch.cpp b/External/WindowsTouch/WindowsTouch.cpp
@@ -104,7 +104,7 @@ void decodeWin8Touches(UINT msg, WPARAM wParam, LPARAM lParam)
 	ScreenToClient(_currentWindow, &p);
 
 	Vector2 position = Vector2(((float)p.x - _offsetX) * _scaleX, _screenHeight - ((float)p.y - _offsetY) * _scaleY);
-	PointerData data;
+	PointerData data {};
 	data.pointerFlags = pointerInfo.pointerFlags;
 	data.changedButtons = pointerInfo.ButtonChangeType;
 
@@ -156,7 +156,7 @@ void decodeWin7Touches(UINT msg, WPARAM wParam, LPARAM lParam)
 		ScreenToClient(_currentWindow, &p);
 
 		Vector2 position = Vector2(((float)p.x - _offsetX) * _scaleX, _screenHeight - ((float)p.y - _offsetY) * _scaleY);
-		PointerData data;
+		PointerData data {};
 
 		if ((touch.dwFlags & TOUCHEVENTF_DOWN) != 0)
 		{
@@ -165,7 +165,7 @@ void decodeWin7Touches(UINT msg, WPARAM wParam, LPARAM lParam)
 		}
 		else if ((touch.dwFlags & TOUCHEVENTF_UP) != 0)
 		{
-			msg = WM_POINTERUP;
+			msg = WM_POINTERLEAVE;
 			data.changedButtons = POINTER_CHANGE_FIRSTBUTTON_UP;
 		}
 		else if ((touch.dwFlags & TOUCHEVENTF_MOVE) != 0)
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/WindowsPointerHandlers.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/WindowsPointerHandlers.cs
@@ -262,7 +262,7 @@ public virtual bool UpdateInput()
         public virtual void UpdateResolution()
         {
             setScaling();
-            TouchManager.Instance.CancelPointer(mousePointer.Id);
+            if (mousePointer != null) TouchManager.Instance.CancelPointer(mousePointer.Id);
         }
 
         /// <inheritdoc />
@@ -500,24 +500,27 @@ private void nativePointer(int id, PointerEvent evt, PointerType type, Vector2 p
                     }
                     break;
                 case PointerType.Touch:
+                    TouchPointer touchPointer;
                     switch (evt)
                     {
-                        // Enter/Leave logic is handles in Down/Up
                         case PointerEvent.Enter:
+                            break;
                         case PointerEvent.Leave:
+                            // Sometimes Windows might not send Up, so have to execute touch release logic here.
+                            // Has been working fine on test devices so far.
+                            if (winTouchToInternalId.TryGetValue(id, out touchPointer))
+                            {
+                                winTouchToInternalId.Remove(id);
+                                internalRemoveTouchPointer(touchPointer);
+                            }
                             break;
                         case PointerEvent.Down:
-                            TouchPointer touchPointer = internalAddTouchPointer(position);
+                            touchPointer = internalAddTouchPointer(position);
                             touchPointer.Rotation = getTouchRotation(ref data);
                             touchPointer.Pressure = getTouchPressure(ref data);
                             winTouchToInternalId.Add(id, touchPointer);
                             break;
                         case PointerEvent.Up:
-                            if (winTouchToInternalId.TryGetValue(id, out touchPointer))
-                            {
-                                winTouchToInternalId.Remove(id);
-                                internalRemoveTouchPointer(touchPointer);
-                            }
                             break;
                         case PointerEvent.Update:
                             if (!winTouchToInternalId.TryGetValue(id, out touchPointer)) return;

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void decodeWin8Touches(UINT msg, WPARAM wParam, LPARAM lParam)`
`104`	`104`	`ScreenToClient(_currentWindow, &p);`
`105`	`105`
`106`	`106`	`Vector2 position = Vector2(((float)p.x - _offsetX) * _scaleX, _screenHeight - ((float)p.y - _offsetY) * _scaleY);`
`107`		`- PointerData data;`
	`107`	`+ PointerData data {};`
`108`	`108`	`data.pointerFlags = pointerInfo.pointerFlags;`
`109`	`109`	`data.changedButtons = pointerInfo.ButtonChangeType;`
`110`	`110`
`@@ -156,7 +156,7 @@ void decodeWin7Touches(UINT msg, WPARAM wParam, LPARAM lParam)`
`156`	`156`	`ScreenToClient(_currentWindow, &p);`
`157`	`157`
`158`	`158`	`Vector2 position = Vector2(((float)p.x - _offsetX) * _scaleX, _screenHeight - ((float)p.y - _offsetY) * _scaleY);`
`159`		`- PointerData data;`
	`159`	`+ PointerData data {};`
`160`	`160`
`161`	`161`	`if ((touch.dwFlags & TOUCHEVENTF_DOWN) != 0)`
`162`	`162`	`{`
`@@ -165,7 +165,7 @@ void decodeWin7Touches(UINT msg, WPARAM wParam, LPARAM lParam)`
`165`	`165`	`}`
`166`	`166`	`else if ((touch.dwFlags & TOUCHEVENTF_UP) != 0)`
`167`	`167`	`{`
`168`		`- msg = WM_POINTERUP;`
	`168`	`+ msg = WM_POINTERLEAVE;`
`169`	`169`	`data.changedButtons = POINTER_CHANGE_FIRSTBUTTON_UP;`
`170`	`170`	`}`
`171`	`171`	`else if ((touch.dwFlags & TOUCHEVENTF_MOVE) != 0)`