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

Author: osinoleg

cocos2d/CCConfiguration.h

@@ -28,6 +28,7 @@
 
 #import "Platforms/CCGL.h"
 
+#define CC_MINIMUM_TABLET_SCREEN_DIAGONAL 6.0
 extern Class CCGraphicsBufferClass;
 extern Class CCGraphicsBufferBindingsClass;
 extern Class CCRenderCommandDrawClass;

cocos2d/CCConfiguration.m

@@ -171,15 +171,14 @@ -(NSInteger) runningDevice
 	NSInteger ret=-1;
 
 #if __CC_PLATFORM_ANDROID
-   
 
     AndroidDisplayMetrics *metrics = [[AndroidDisplayMetrics alloc] init];
     [[CCActivity currentActivity].windowManager.defaultDisplay getMetrics:metrics];
     double yInches= metrics.heightPixels/metrics.ydpi;
     double xInches= metrics.widthPixels/metrics.xdpi;
     double diagonalInches = sqrt(xInches*xInches + yInches*yInches);
-    if (diagonalInches<=6){
-        
+    if (diagonalInches<=CC_MINIMUM_TABLET_SCREEN_DIAGONAL){
+
 
         if([CCDirector sharedDirector].contentScaleFactor > 1.0)
         {
@@ -198,7 +197,7 @@ -(NSInteger) runningDevice
         {
             ret = CCDeviceiPad;
         }
-        
+
     }
 #elif __CC_PLATFORM_IOS
 

cocos2d/CCDirector.m

@@ -349,6 +349,11 @@ -(void) calculateDeltaTime
 
 -(void) purgeCachedData
 {
+    if([_delegate respondsToSelector:@selector(purgeCachedData)])
+    {
+        [_delegate purgeCachedData];
+    }
+    
 	[CCRENDERSTATE_CACHE flush];
 	[CCLabelBMFont purgeCachedData];
 	if ([_sharedDirector view])
@@ -689,6 +694,11 @@ - (void)startTransition:(CCTransition *)transition
 
 -(void) end
 {
+    if([_delegate respondsToSelector:@selector(end)])
+    {
+        [_delegate end];
+    }
+    
 	[_runningScene onExitTransitionDidStart];
 	[_runningScene onExit];
 	[_runningScene cleanup];
@@ -784,6 +794,11 @@ -(void) pause
 	if( _isPaused )
 		return;
 
+    if([_delegate respondsToSelector:@selector(pause)])
+    {
+        [_delegate pause];
+    }
+    
 	_oldAnimationInterval = _animationInterval;
 
 	// when paused, don't consume CPU
@@ -799,6 +814,11 @@ -(void) resume
 	if( ! _isPaused )
 		return;
 
+    if([_delegate respondsToSelector:@selector(resume)])
+    {
+        [_delegate resume];
+    }
+    
 	[self setAnimationInterval: _oldAnimationInterval];
 
 	if( gettimeofday( &_lastUpdate, NULL) != 0 ) {
@@ -814,6 +834,11 @@ -(void) resume
 
 - (void)startAnimation
 {
+    if([_delegate respondsToSelector:@selector(startAnimation)])
+    {
+        [_delegate startAnimation];
+    }
+    
 	_nextDeltaTimeZero = YES;
 }
 

cocos2d/CCProtocols.h

@@ -134,6 +134,43 @@
 @protocol CCDirectorDelegate <NSObject>
 
 @optional
+
+/** Ends the execution, releases the running scene.
+ It doesn't remove the OpenGL view from its parent. You have to do it manually.
+ */
+-(void) end;
+
+/** Pauses the running scene.
+ The running scene will be _drawed_ but all scheduled timers will be paused
+ While paused, the draw rate will be 4 FPS to reduce CPU consumption
+ */
+-(void) pause;
+
+/** Resumes the paused scene
+ The scheduled timers will be activated again.
+ The "delta time" will be 0 (as if the game wasn't paused)
+ */
+-(void) resume;
+
+/** Stops the animation. Nothing will be drawn. The main loop won't be triggered anymore.
+ If you want to pause your animation call [pause] instead.
+ */
+-(void) stopAnimation;
+
+/** The main loop is triggered again.
+ Call this function only if [stopAnimation] was called earlier
+ @warning Don't call this function to start the main loop. To run the main loop call runWithScene
+ */
+-(void) startAnimation;
+
+#pragma mark Director - Memory Helper
+
+/** Removes all the cocos2d data that was cached automatically.
+ It will purge the CCTextureCache, CCLabelBMFont cache.
+ IMPORTANT: The CCSpriteFrameCache won't be purged. If you want to purge it, you have to purge it manually.
+ */
+-(void) purgeCachedData;
+
 /** Called by CCDirector when the projection is updated, and "custom" projection is used */
 -(GLKMatrix4) updateProjection;
 

cocos2d/Platforms/Android/CCActivity.m

@@ -137,21 +137,21 @@ - (void)onDestroy
 - (void)onResume
 {
 #if USE_MAIN_THREAD
-    [self resume];
+    [self handleResume];
 #else
     if(_thread == nil)
     {
         [super onResume];
         return;
     }
 
-    [self performSelector:@selector(resume) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
+    [self performSelector:@selector(handleResume) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
 #endif
 
     [super onResume];
 }
 
-- (void)resume
+- (void)handleResume
 {
     [[CCDirector sharedDirector] setNextDeltaTimeZero:YES];
     [[CCDirector sharedDirector] resume];
@@ -160,21 +160,21 @@ - (void)resume
 - (void)onPause
 {
 #if USE_MAIN_THREAD
-    [self pause];
+    [self handlePause];
 #else
     if(_thread == nil)
     {
         [super onPause];
         return;
     }
 
-    [self performSelector:@selector(pause) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
+    [self performSelector:@selector(handlePause) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
 #endif
 
     [super onPause];
 }
 
-- (void)pause
+- (void)handlePause
 {
     [[CCDirector sharedDirector] pause];
 }
@@ -183,21 +183,21 @@ - (void)pause
 - (void)onLowMemory
 {
 #if USE_MAIN_THREAD
-    [self purgeChaceData];
+    [self handleLowMemory];
 #else
     if(_thread == nil)
     {
         [super onLowMemory];
         return;
     }
 
-    [self performSelector:@selector(purgeChaceData) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
+    [self performSelector:@selector(handleLowMemory) onThread:_thread withObject:nil waitUntilDone:YES modes:@[NSDefaultRunLoopMode]];
 #endif
 
     [super onLowMemory];
 }
 
-- (void)purgeChaceData
+- (void)handleLowMemory
 {
     [[CCDirector sharedDirector] purgeCachedData];
 }

cocos2d/Platforms/Android/CCDirectorAndroid.m

@@ -151,7 +151,6 @@ -(void) mainLoop:(id)sender
 
 - (void)setAnimationInterval:(NSTimeInterval)interval
 {
-    
 	_animationInterval = interval;
 	if(_displayLink)
     {
@@ -187,6 +186,11 @@ - (void) stopAnimation
     if(!_animating)
         return;
 
+    if([_delegate respondsToSelector:@selector(stopAnimation)])
+    {
+        [_delegate stopAnimation];
+    }
+    
 	CCLOG(@"cocos2d: animation stopped");
 
 	[_displayLink invalidate];

cocos2d/Platforms/iOS/CCDirectorIOS.m

@@ -173,7 +173,6 @@ -(CGPoint)convertTouchToGL:(CCTouch*)touch
 
 -(void) end
 {
-
 	[super end];
 }
 
@@ -362,6 +361,11 @@ - (void) stopAnimation
     if(!_animating)
         return;
 
+    if([_delegate respondsToSelector:@selector(stopAnimation)])
+    {
+        [_delegate stopAnimation];
+    }
+    
 	CCLOG(@"cocos2d: animation stopped");
 
 #if CC_DIRECTOR_IOS_USE_BACKGROUND_THREAD

cocos2d/Support/NSAttributedString+CCAdditions.m

@@ -30,6 +30,9 @@
 #import "cocos2d.h"
 #import <CoreText/CoreText.h>
 
+BOOL NSMutableAttributedStringSetDefaultAttribute(NSMutableAttributedString *attrString, NSString*attr, id defaultValue);
+CGColorRef CGColorCreateWithPlatformSpecificColor(id platformColor);
+CTFontRef CTFontCreateWithPlatformSpecificFont(id font);
 
 BOOL NSMutableAttributedStringSetDefaultAttribute(NSMutableAttributedString *attrString, NSString*attr, id defaultValue){
     NSRange fullRange = NSMakeRange(0, attrString.length);

external/ObjectAL/AudioTrack/OALAudioTrack.h

@@ -67,6 +67,9 @@ BRIDGE_CLASS("com.spritebuilder.OALAudioTrack")
 	bool autoPreload;
 	bool paused;
 	bool muted;
+#if __CC_PLATFORM_ANDROID
+    bool suspended;
+#endif
 	float gain;
 	float pan;
 	NSInteger numberOfLoops;

external/ObjectAL/AudioTrack/OALAudioTrack.m

@@ -242,6 +242,10 @@ - (id) init
 		numberOfLoops = 0;
 		currentTime = 0.0;
 
+#if __CC_PLATFORM_ANDROID
+        // We have to manually pause tracks
+        suspended = NO;
+#endif
 		[[OALAudioTracks sharedInstance] notifyTrackInitializing:self];
 		[[OALAudioTracks sharedInstance] addSuspendListener:self];
 	}
@@ -593,7 +597,6 @@ - (void) setSuspended:(bool) value
 	 * TODO: Need to find a way to avoid this situation.
 	 */
 #if __CC_PLATFORM_IOS || __CC_PLATFORM_MAC
-#warning FIXME
 	OPTIONALLY_SYNCHRONIZED(self)
 	{
         if(value)
@@ -676,6 +679,21 @@ - (void) setSuspended:(bool) value
          }
          */
     }
+#elif __CC_PLATFORM_ANDROID
+	OPTIONALLY_SYNCHRONIZED(self)
+    {
+        if (value) {
+            if ([player isPlaying]) {
+                [player pause];
+                suspended = YES;
+            }
+        } else {
+            if (suspended) {
+                [player start];
+                suspended = NO;
+            }
+        }
+    }
 #endif
 }