update touches array before firing touch events, handle

ACTION_POINTER_DOWN

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -222,6 +222,12 @@ public class PApplet extends Object implements PConstants {
   protected int mousePointerId;
 
 
+  /**
+   * ID of the most recently touch pointer gone up or down.
+   */
+  protected int touchPointerId;
+
+
   /**
    * Last key pressed.
    * <P>
@@ -2039,6 +2045,8 @@ protected void handleMouseEvent(MouseEvent event) {
 
 
   protected void handleTouchEvent(TouchEvent event) {
+    touches = event.getTouches(touches);
+
     switch (event.getAction()) {
     case TouchEvent.START:
       touchPressed = true;
@@ -2064,8 +2072,6 @@ protected void handleTouchEvent(TouchEvent event) {
       touchCancelled(event);
       break;
     }
-
-    touches = event.getTouches(touches);
   }
 
 
@@ -2121,6 +2127,9 @@ protected void enqueueTouchEvents(MotionEvent event, int button, int modifiers)
     case MotionEvent.ACTION_DOWN:
       paction = TouchEvent.START;
       break;
+    case MotionEvent.ACTION_POINTER_DOWN:
+      paction = TouchEvent.START;
+      break;
     case MotionEvent.ACTION_MOVE:
       paction = TouchEvent.MOVE;
       break;
@@ -2136,6 +2145,10 @@ protected void enqueueTouchEvents(MotionEvent event, int button, int modifiers)
       break;
     }
 
+    if (paction == TouchEvent.START || paction == TouchEvent.END) {
+      touchPointerId = event.getPointerId(0);
+    }
+
     int pointerCount = event.getPointerCount();
 
     if (actionMasked == MotionEvent.ACTION_MOVE) {