Merge branch 'headless-develop' of github.com:spritebuilder/cocos2d-swift into headless-develop

Author: darvin

cocos2d-osx.xcodeproj/project.pbxproj

@@ -169,6 +169,9 @@
 		D216F92D1970A35A000DEF7C /* ALWeakDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = D216F9271970A35A000DEF7C /* ALWeakDictionary.m */; };
 		D216F92E1970A35A000DEF7C /* ALWeakElement.h in Headers */ = {isa = PBXBuildFile; fileRef = D216F9281970A35A000DEF7C /* ALWeakElement.h */; };
 		D216F92F1970A35A000DEF7C /* ALWeakElement.m in Sources */ = {isa = PBXBuildFile; fileRef = D216F9291970A35A000DEF7C /* ALWeakElement.m */; };
+		D2342007199AD36D00DF8FCD /* CCNoARC.m in Sources */ = {isa = PBXBuildFile; fileRef = D2342004199AD36D00DF8FCD /* CCNoARC.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		D2342008199AD36D00DF8FCD /* CCRenderDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */; };
+		D2342009199AD36D00DF8FCD /* CCRenderDispatch.m in Sources */ = {isa = PBXBuildFile; fileRef = D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */; };
 		D2D598641987132700BDAF25 /* CCEffect_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598421987132700BDAF25 /* CCEffect_Private.h */; };
 		D2D598651987132700BDAF25 /* CCEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598431987132700BDAF25 /* CCEffect.h */; };
 		D2D598661987132700BDAF25 /* CCEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D598441987132700BDAF25 /* CCEffect.m */; };
@@ -540,6 +543,9 @@
 		D216F9271970A35A000DEF7C /* ALWeakDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ALWeakDictionary.m; sourceTree = "<group>"; };
 		D216F9281970A35A000DEF7C /* ALWeakElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ALWeakElement.h; sourceTree = "<group>"; };
 		D216F9291970A35A000DEF7C /* ALWeakElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ALWeakElement.m; sourceTree = "<group>"; };
+		D2342004199AD36D00DF8FCD /* CCNoARC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNoARC.m; sourceTree = "<group>"; };
+		D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderDispatch.h; sourceTree = "<group>"; };
+		D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRenderDispatch.m; sourceTree = "<group>"; };
 		D2D598421987132700BDAF25 /* CCEffect_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffect_Private.h; sourceTree = "<group>"; };
 		D2D598431987132700BDAF25 /* CCEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffect.h; sourceTree = "<group>"; };
 		D2D598441987132700BDAF25 /* CCEffect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffect.m; sourceTree = "<group>"; };
@@ -1342,6 +1348,9 @@
 				D3AD531F18C84FC9005B6CF3 /* CCRenderer_private.h */,
 				D3AD532018C84FC9005B6CF3 /* CCRenderer.h */,
 				D3AD532118C84FC9005B6CF3 /* CCRenderer.m */,
+				D2342004199AD36D00DF8FCD /* CCNoARC.m */,
+				D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */,
+				D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */,
 			);
 			path = cocos2d;
 			sourceTree = "<group>";
@@ -1748,6 +1757,7 @@
 				B7E2603517E7C774007067F0 /* NSEvent+CC.h in Headers */,
 				B77060961831B0C40043CC67 /* OALAudioFile.h in Headers */,
 				B7E2603917E7C786007067F0 /* UITouch+CC.h in Headers */,
+				D2342008199AD36D00DF8FCD /* CCRenderDispatch.h in Headers */,
 				D2D5987E1987132700BDAF25 /* CCEffectSaturation.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1870,6 +1880,7 @@
 				E076E6DA1225EC7400DE0DA2 /* CCActionInstant.m in Sources */,
 				E076E6DC1225EC7400DE0DA2 /* CCActionInterval.m in Sources */,
 				B77060901831B0C40043CC67 /* mach_timing.c in Sources */,
+				D2342009199AD36D00DF8FCD /* CCRenderDispatch.m in Sources */,
 				E076E6DE1225EC7400DE0DA2 /* CCActionManager.m in Sources */,
 				B791E851182065BD00DAE1D7 /* CCTiledMapLayer.m in Sources */,
 				E076E6E21225EC7400DE0DA2 /* CCActionProgressTimer.m in Sources */,
@@ -1897,6 +1908,7 @@
 				B770606C1831B0C40043CC67 /* OALAudioTrackNotifications.m in Sources */,
 				E076E7161225EC7400DE0DA2 /* CCProgressNode.m in Sources */,
 				D2D598851987132700BDAF25 /* CCEffectUtils.m in Sources */,
+				D2342007199AD36D00DF8FCD /* CCNoARC.m in Sources */,
 				B77060831831B0C40043CC67 /* ALSource.m in Sources */,
 				E076E7191225EC7400DE0DA2 /* CCRenderTexture.m in Sources */,
 				E076E71D1225EC7400DE0DA2 /* CCScene.m in Sources */,

cocos2d-tests-android/Headless.xcodeproj/project.pbxproj

@@ -1044,8 +1044,8 @@
 				OTHER_LDFLAGS = (
 					"-landroid",
 					"-lgles_apportable",
-					"-ObjC",
 					"-all_load",
+					"-ObjC",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;

cocos2d-ui/CCScrollView.m

@@ -775,6 +775,7 @@ - (void) onExitTransitionDidStart
     [recognizers removeObject:_tapRecognizer];
 
     view.gestureRecognizers = recognizers;
+    
     [super onExitTransitionDidStart];
 }
 

cocos2d/Platforms/Android/CCActivity.m

@@ -226,6 +226,8 @@ - (void)startGL:(JavaObject<AndroidSurfaceHolder> *)holder
 
         _gameLoop = [NSRunLoop currentRunLoop];
 
+        [_gameLoop addPort:[NSPort port] forMode:NSDefaultRunLoopMode]; // Ensure that _gameLoop always has a source.
+        
         [self setupView:holder];
 
         [self setupPaths];
@@ -310,12 +312,17 @@ - (void)surfaceCreated:(JavaObject<AndroidSurfaceHolder> *)holder
 - (void)surfaceDestroyed:(JavaObject<AndroidSurfaceHolder> *)holder
 {
 #if USE_MAIN_THREAD
-    [self finish];
+    [self handleDestroy];
 #else
-    [self performSelector:@selector(finish) onThread:_thread withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
+    [self performSelector:@selector(handleDestroy) onThread:_thread withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
 #endif
 }
 
+- (void)handleDestroy
+{
+    [[CCDirector sharedDirector] stopAnimation];
+}
+
 - (BOOL)onKeyDown:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event
 {
     return NO;

cocos2d/Platforms/Android/CCGLView.m

@@ -491,10 +491,14 @@ - (BOOL)setupView:(ANativeWindow*)window
 
     if(eglGetError() != EGL_SUCCESS) { NSLog(@"EGL ERROR: %i", eglGetError()); };
 
-    if(!(_eglContext = eglCreateContext(_eglDisplay, _eglConfiguration, 0, contextAttribs)))
+    if(_eglContext == nil)
     {
-        NSLog(@"eglCreateContext() returned error %d", eglGetError());
-        return NO;
+        if(!(_eglContext = eglCreateContext(_eglDisplay, _eglConfiguration, 0, contextAttribs)))
+        {
+            NSLog(@"eglCreateContext() returned error %d", eglGetError());
+            return NO;
+        
+        }
     }
 
     if(eglGetError() != EGL_SUCCESS) { NSLog(@"EGL ERROR: %i", eglGetError()); };

cocos2d/Platforms/CCDirectorView.h

@@ -35,4 +35,10 @@
 /// The block may not be invoked from the main thread.
 -(void)addFrameCompletionHandler:(dispatch_block_t)handler;
 
+/** uses and locks the OpenGL context */
+-(void) lockOpenGLContext;
+
+/** unlocks the openGL context */
+-(void) unlockOpenGLContext;
+
 @end

external/ObjectAL/OALSimpleAudio.m

@@ -659,31 +659,11 @@ - (void) unloadAllEffects
 		return nil;
 	}
 
-#if 0 // __CC_PLATFORM_ANDROID
-    // TODO: we are creating a player and throwing it away each time, and not taking into account if it was preloaded.
-    // think about checking for preload and implement the player's asyncPrepare finish listener
-    AndroidAssetFileDescriptor *assetFd = [[[CCActivity currentActivity] assets] openFdWithFileName:filePath];
-    
-    if (assetFd.fileDescriptor && [assetFd.fileDescriptor valid]) {
-        AndroidMediaPlayer *player = [[AndroidMediaPlayer alloc] init];
-        [player reset];
-        [player setDataSource:assetFd.fileDescriptor offset:assetFd.startOffset length:assetFd.length];
-#warning TODO: note sure how to set on finished listener for player and call the player's release() (not objc release) in the callback to close fd
-        [player prepare];
-        [player start];
-    }
-    
-    if (assetFd) {
-        [assetFd close];
-    }
-    // TODO: convert to ALSoundSource and return
-#else
 	ALBuffer* buffer = [self internalPreloadEffect:filePath reduceToMono:NO];
 	if(nil != buffer)
 	{
 		return [channel play:buffer gain:volume pitch:pitch pan:pan loop:loop];
 	}
-#endif
 	return nil;
 }