Merge pull request #9 from spritebuilder/headless-develop

Android fixes (sliders, and scrolling, suspend/resume)

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
 }
 
@@ -214,7 +214,6 @@ - (id) initWithContentNode:(CCNode*)contentNode
         _listener = [[CCGestureListener alloc] init];
         _listener.delegate = (id<CCGestureListenerDelegate>)self;
         _detector = [[AndroidGestureDetector alloc] initWithContext:[CCActivity currentActivity] listener:_listener];
-        [[[CCDirector sharedDirector] view] addGestureDetector:_detector];
     });
 #elif __CC_PLATFORM_MAC
 
@@ -355,6 +354,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 +410,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 +501,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;
@@ -740,8 +751,11 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return (otherGestureRecognizer == _panRecognizer || otherGestureRecognizer == _tapRecognizer);
 }
 
+#elif __CC_PLATFORM_ANDROID
+
 - (void) onEnterTransitionDidFinish
 {
+#if __CC_PLATFORM_IOS
     // Add recognizers to view
     UIView* view = [CCDirector sharedDirector].view;
 
@@ -751,12 +765,22 @@ - (void) onEnterTransitionDidFinish
     [recognizers insertObject:_tapRecognizer atIndex:0];
 
     view.gestureRecognizers = recognizers;
-    
+#elif __CC_PLATFORM_ANDROID
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(_detector)
+        {
+            [[[CCDirector sharedDirector] view] addGestureDetector:_detector];
+        }
+    });
+#endif
     [super onEnterTransitionDidFinish];
 }
 
+
+
 - (void) onExitTransitionDidStart
 {
+#if __CC_PLATFORM_IOS
     // Remove recognizers from view
     UIView* view = [CCDirector sharedDirector].view;
 
@@ -765,11 +789,19 @@ - (void) onExitTransitionDidStart
     [recognizers removeObject:_tapRecognizer];
 
     view.gestureRecognizers = recognizers;
+#elif __CC_PLATFORM_ANDROID
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(_detector)
+        {
+            [[[CCDirector sharedDirector] view] removeGestureDetector:_detector];
+        }
+    });
+#endif
 
     [super onExitTransitionDidStart];
 }
 
-#elif __CC_PLATFORM_ANDROID
+
 
 - (CCTouchPhase)handleGestureEvent:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end
 {
@@ -820,24 +852,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 +899,7 @@ - (BOOL)onScroll:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end dista
 
             // Update position
             [self panLayerToTarget:newPos];
+            
         }
         else if (phase == CCTouchPhaseEnded)
         {
@@ -891,7 +923,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);
 
@@ -918,9 +950,6 @@ - (BOOL)onFling:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end veloci
     CCDirector* dir = [CCDirector sharedDirector];
     [[CCActivity currentActivity] runOnGameThread:^{
 
-        CCResponderManager *mgr = [[CCDirector sharedDirector] responderManager];
-        [mgr removeAllResponders];
-
         CGPoint translation = [dir convertToGL:rawTranslationFling];
         translation = [self convertToNodeSpace:translation];
 

cocos2d-ui/CCSlider.m

@@ -71,7 +71,7 @@ - (void) updateSliderPositionFromValue
     _handle.position = ccp(size.width * _sliderValue, size.height/2.0f);
 }
 
-#if __CC_PLATFORM_IOS
+#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
 
 #pragma mark Handle touches
 

cocos2d/CCDirector.m

@@ -740,7 +740,7 @@ -(void) resume
 {
 	if( ! _isPaused )
 		return;
-
+    
 	[self setAnimationInterval: _oldAnimationInterval];
 
 	if( gettimeofday( &_lastUpdate, NULL) != 0 ) {

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/CCActivity.h

@@ -24,6 +24,9 @@ BRIDGE_CLASS("org.cocos2d.CCActivity")
 
 - (void)onDestroy;
 
+- (void)onPause;
+- (void)onResume;
+
 - (void)onLowMemory;
 
 - (void)surfaceChanged:(JavaObject<AndroidSurfaceHolder> *)holder format:(int)format width:(int)width height:(int)height;

cocos2d/Platforms/Android/CCActivity.m

@@ -51,6 +51,8 @@ @implementation CCActivity {
 
 @bridge (callback) run = run;
 @bridge (callback) onDestroy = onDestroy;
+@bridge (callback) onPause = onPause;
+@bridge (callback) onResume = onResume;
 @bridge (callback) onLowMemory = onLowMemory;
 @bridge (callback) surfaceCreated: = surfaceCreated;
 @bridge (callback) surfaceDestroyed: = surfaceDestroyed;
@@ -114,13 +116,77 @@ - (void)run
 
 - (void)onDestroy
 {
+    [[CCDirector sharedDirector] end];
     [super onDestroy];
     exit(0);
 }
 
+- (void)onResume
+{
+#if USE_MAIN_THREAD
+    [self resume];
+#else
+    if(_thread == nil)
+    {
+        [super onResume];
+        return;
+    }
+    
+    [self performSelector:@selector(resume) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
+#endif
+    
+    [super onResume];
+}
+
+- (void)resume
+{
+    [[CCDirector sharedDirector] setNextDeltaTimeZero:YES];
+    [[CCDirector sharedDirector] resume];
+}
+
+- (void)onPause
+{
+#if USE_MAIN_THREAD
+    [self pause];
+#else
+    if(_thread == nil)
+    {
+        [super onPause];
+        return;
+    }
+    
+    [self performSelector:@selector(pause) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
+#endif
+    
+    [super onPause];
+}
+
+- (void)pause
+{
+    [[CCDirector sharedDirector] pause];
+}
+
+
 - (void)onLowMemory
 {
-    // TODO: do something sensible here
+#if USE_MAIN_THREAD
+    [self purgeChaceData];
+#else
+    if(_thread == nil)
+    {
+        [super onLowMemory];
+        return;
+    }
+
+    [self performSelector:@selector(purgeChaceData) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
+#endif
+
+    [super onLowMemory];
+}
+
+- (void)purgeChaceData
+{
+    [[CCDirector sharedDirector] purgeCachedData];
 }
 
 - (void)reshape:(NSValue *)value
@@ -157,6 +223,7 @@ - (void)setupPaths
 - (void)startGL:(JavaObject<AndroidSurfaceHolder> *)holder
 {
     @autoreleasepool {
+        
         _gameLoop = [NSRunLoop currentRunLoop];
 
         [self setupView:holder];
@@ -181,6 +248,7 @@ - (void)startGL:(JavaObject<AndroidSurfaceHolder> *)holder
             [director setProjection:CCDirectorProjectionCustom];
         }
 
+
         [director runWithScene:[self startScene]];
         [director setAnimationInterval:1.0/60.0];
         [director startAnimation];
@@ -241,15 +309,13 @@ - (void)surfaceCreated:(JavaObject<AndroidSurfaceHolder> *)holder
 
 - (void)surfaceDestroyed:(JavaObject<AndroidSurfaceHolder> *)holder
 {
-    CCDirectorAndroid *director = (CCDirectorAndroid*)[CCDirector sharedDirector];
 #if USE_MAIN_THREAD
-    [director stopAnimation];
+    [self finish];
 #else
-    [director performSelector:@selector(stopAnimation) onThread:_thread withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
+    [self performSelector:@selector(finish) onThread:_thread withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
 #endif
 }
 
-
 - (BOOL)onKeyDown:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event
 {
     return NO;

cocos2d/Platforms/Android/CCDirectorAndroid.m

@@ -230,11 +230,7 @@ - (void) stopAnimation
         return;
 
 	CCLOG(@"cocos2d: animation stopped");
-    
-	[_runningThread cancel];
-//	[_runningThread release];
-	_runningThread = nil;
-    
+        
 	[_displayLink invalidate];
 	_displayLink = nil;
     _animating = NO;

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,11 @@ - (BOOL)onTouchEvent:(AndroidMotionEvent *)event
                 return NO;
         }
 
+        if(cancelTouch)
+        {
+            phase = CCTouchPhaseCancelled;
+        }
+        
         NSTimeInterval timestamp = event.eventTime * 1000.0;
         currentEvent.timestamp = timestamp;
         NSMutableSet *eventTouches = [NSMutableSet set];

cocos2d/Platforms/Android/java/org/cocos2d/CCActivity.java

@@ -30,8 +30,10 @@ protected void onCreate(final Bundle savedInstanceState) {
 
     public native void runLoop();
     public native void run();
-    
+
     public native void onDestroy();
+    public native void onResume();
+    public native void onPause();
 
     public native void onLowMemory();