Improved Android scrolling (touches are cancelled whenever a gesture is recognized).

Author: osinoleg

cocos2d-ui/CCScrollView.m

@@ -61,7 +61,6 @@
 #pragma mark -
 #pragma mark Helper classes
 
-
 #if __CC_PLATFORM_IOS
 @interface CCTapDownGestureRecognizer : UIGestureRecognizer
 @end
@@ -172,6 +171,7 @@ @implementation CCScrollView {
 #elif __CC_PLATFORM_ANDROID
     CCGestureListener *_listener;
     AndroidGestureDetector *_detector;
+    CGPoint _rawScrollTranslation;
 #endif
 }
 
@@ -355,6 +355,8 @@ - (void) setScrollPosition:(CGPoint)newPos animated:(BOOL)animated
 	newPos.x = MAX(MIN(newPos.x, self.maxScrollX), self.minScrollX);
 	newPos.y = MAX(MIN(newPos.y, self.maxScrollY), self.minScrollY);
 
+    [self updateAndroidScrollTranslation:newPos];
+    
     BOOL xMoved = (newPos.x != self.scrollPosition.x);
     BOOL yMoved = (newPos.y != self.scrollPosition.y);
 
@@ -409,6 +411,14 @@ - (void) setScrollPosition:(CGPoint)newPos animated:(BOOL)animated
     }
 }
 
+- (void)updateAndroidScrollTranslation:(CGPoint)worldPosition
+{
+#if __CC_PLATFORM_ANDROID
+    _rawScrollTranslation = [self convertToWindowSpace:worldPosition];
+#endif
+}
+
+
 - (void) xAnimationDone
 {
     _animatingX = NO;
@@ -492,6 +502,8 @@ - (void) update:(CCTime)df
 
             _contentNode.position = ccpAdd(_contentNode.position, delta);
 
+            [self updateAndroidScrollTranslation:CGPointMake(_contentNode.position.x, _contentNode.position.y * -1)];
+
             // Deaccelerate layer
             float deaccelerationX = kCCScrollViewDeacceleration;
             float deaccelerationY = kCCScrollViewDeacceleration;
@@ -820,24 +832,23 @@ - (BOOL)onScroll:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end dista
     _velocity = CGPointZero;
 
     // Note about start and end events: We will get a CCTouchPhaseBegan for the start event, followed by CCTouchPhaseMoved in the end event
-    static CGPoint rawTranslation;
     CCTouchPhase phase = [self handleGestureEvent:start end:end];
 
     if(phase == CCTouchPhaseCancelled || phase == CCTouchPhaseEnded)
-        rawTranslation = CGPointMake(0.0f, 0.0f);
+        _rawScrollTranslation = CGPointMake(0.0f, 0.0f);
 
     float scaleFactor = [[CCDirector sharedDirector] view].contentScaleFactor;
 
     dx /= scaleFactor;
     dy /= scaleFactor;
 
-    rawTranslation.x += dx;
-    rawTranslation.y -= dy;
+    _rawScrollTranslation.x += dx;
+    _rawScrollTranslation.y -= dy;
 
     CCDirector* dir = [CCDirector sharedDirector];
     [[CCActivity currentActivity] runOnGameThread:^{
 
-        CGPoint translation = [dir convertToGL:rawTranslation];
+        CGPoint translation = [dir convertToGL:_rawScrollTranslation];
         translation = [self convertToNodeSpace:translation];
 
         if (phase == CCTouchPhaseBegan)
@@ -868,6 +879,7 @@ - (BOOL)onScroll:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end dista
 
             // Update position
             [self panLayerToTarget:newPos];
+            
         }
         else if (phase == CCTouchPhaseEnded)
         {
@@ -891,7 +903,7 @@ - (BOOL)onFling:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end veloci
     static CGPoint rawTranslationFling;
 
     CCTouchPhase phase = [self handleGestureEvent:start end:end];
-   
+    
     if(phase == CCTouchPhaseCancelled || phase == CCTouchPhaseEnded)
         rawTranslationFling = CGPointMake(0.0f, 0.0f);
 

cocos2d/CCNode.h

@@ -615,6 +615,16 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
  */
 - (CGPoint)convertToWorldSpaceAR:(CGPoint)nodePoint;
 
+/**
+ *  Converts a local Point to Window space coordinates.The result is in Points.
+ *  Treats the returned/received node point as anchor relative.
+ *
+ *  @param nodePoint Local position in points.
+ *
+ *  @return UI position in points.
+ */
+- (CGPoint)convertToWindowSpace:(CGPoint)nodePoint;
+
 
 /// -----------------------------------------------------------------------
 /// @name Rendering (Used by Subclasses)

cocos2d/Platforms/Android/CCGLView.m

@@ -67,10 +67,12 @@ - (BOOL)onTouchEvent:(AndroidMotionEvent *)event
 {
     assert(pthread_main_np());
     @autoreleasepool {
+        BOOL cancelTouch = NO;
         for (AndroidGestureDetector *detector in _gestureDetectors) {
-            [detector onTouchEvent:event];
+            cancelTouch = [detector onTouchEvent:event];
         }
 
+        
         static dispatch_once_t once = 0L;
         dispatch_once(&once, ^{
             touches = [[NSMutableDictionary alloc] init];
@@ -98,6 +100,9 @@ - (BOOL)onTouchEvent:(AndroidMotionEvent *)event
                 return NO;
         }
 
+        if(cancelTouch)
+            phase = CCTouchPhaseCancelled;
+        
         NSTimeInterval timestamp = event.eventTime * 1000.0;
         currentEvent.timestamp = timestamp;
         NSMutableSet *eventTouches = [NSMutableSet set];