Merge pull request #276 from UnityTech/yczhang1.5.4

[1.5.4] Finish upgrade material.

Author: zhuxingwei

Runtime/gestures/converter.cs

@@ -56,7 +56,7 @@ public override string ToString() {
             return $"_PointerState(pointer: {this.pointer}, down: {this.down}, lastPosition: {this.lastPosition})";
         }
 
-        public int _synthesiseDownButtons(int buttons, PointerDeviceKind kind) {
+        internal static int _synthesiseDownButtons(int buttons, PointerDeviceKind kind) {
             switch (kind) {
                 case PointerDeviceKind.touch:
                     return buttons;
@@ -83,10 +83,36 @@ static _PointerState _ensureStateForPointer(PointerData datum, Offset position)
         public static IEnumerable<PointerEvent> expand(IEnumerable<PointerData> data, float devicePixelRatio) {
             foreach (PointerData datum in data) {
                 var position = new Offset(datum.physicalX, datum.physicalY) / devicePixelRatio;
+                var radiusMinor = _toLogicalPixels(datum.radiusMinor, devicePixelRatio);
+                var radiusMajor = _toLogicalPixels(datum.radiusMajor, devicePixelRatio);
+                var radiusMin = _toLogicalPixels(datum.radiusMin, devicePixelRatio);
+                var radiusMax = _toLogicalPixels(datum.radiusMax, devicePixelRatio);
                 var timeStamp = datum.timeStamp;
                 var kind = datum.kind;
 
                 switch (datum.change) {
+                    case PointerChange.add: {
+                        D.assert(!_pointers.ContainsKey(datum.device));
+                        _PointerState state = _ensureStateForPointer(datum, position);
+                        D.assert(state.lastPosition == position);
+                        yield return new PointerAddedEvent(
+                            timeStamp: timeStamp,
+                            kind: kind,
+                            device: datum.device,
+                            position: position,
+                            obscured: datum.obscured,
+                            pressureMin: datum.pressureMin,
+                            pressureMax: datum.pressureMax,
+                            distance: datum.distance,
+                            distanceMax: datum.distanceMax,
+                            radiusMin: radiusMin,
+                            radiusMax: radiusMax,
+                            orientation: datum.orientation,
+                            tilt: datum.tilt
+                        );
+                        break;
+                    }
+
                     case PointerChange.down: {
                         _PointerState state = _ensureStateForPointer(datum, position);
                         if (state.down) {
@@ -156,13 +182,13 @@ public static IEnumerable<PointerEvent> expand(IEnumerable<PointerData> data, fl
                             state.lastPosition = position;
                         }
 
+                        Offset scrollDelta = new Offset(_scrollData.scrollX, _scrollData.scrollY) / devicePixelRatio;
                         yield return new PointerScrollEvent(
                             timeStamp: timeStamp,
-                            pointer: state.pointer,
                             kind: kind,
                             device: _scrollData.device,
                             position: position,
-                            delta: new Offset(_scrollData.scrollX, _scrollData.scrollY) / devicePixelRatio
+                            scrollDelta: scrollDelta
                         );
                         break;
                     }
@@ -240,5 +266,9 @@ public static IEnumerable<PointerEvent> expand(IEnumerable<PointerData> data, fl
                 }
             }
         }
+
+        static float _toLogicalPixels(float physicalPixels, float devicePixelRatio) {
+            return physicalPixels / devicePixelRatio;
+        }
     }
 }