Merge pull request #7 from spritebuilder/headless-develop

Added Android support for CCFxiedScreenMode and CCFlexibleScreenMode

Author: osinoleg

cocos2d-tests-ios.xcodeproj/project.pbxproj

@@ -28,6 +28,35 @@
 
 #import "Platforms/CCGL.h"
 
+extern NSString* const CCSetupPixelFormat;
+extern NSString* const CCSetupScreenMode;
+extern NSString* const CCSetupScreenOrientation;
+extern NSString* const CCSetupAnimationInterval;
+extern NSString* const CCSetupFixedUpdateInterval;
+extern NSString* const CCSetupShowDebugStats;
+extern NSString* const CCSetupTabletScale2X;
+
+extern NSString* const CCSetupDepthFormat;
+extern NSString* const CCSetupPreserveBackbuffer;
+extern NSString* const CCSetupMultiSampling;
+extern NSString* const CCSetupNumberOfSamples;
+
+// Landscape screen orientation. Used with CCSetupScreenOrientation.
+extern NSString* const CCScreenOrientationLandscape;
+
+// Portrait screen orientation.  Used with CCSetupScreenOrientation.
+extern NSString* const CCScreenOrientationPortrait;
+
+// Support all screen orientations.  Used with CCSetupScreenOrientation.
+extern NSString* const CCScreenOrientationAll;
+
+
+// The flexible screen mode is Cocos2d's default. It will give you an area that can vary slightly in size. In landscape mode the height will be 320 points for mobiles and 384 points for tablets. The width of the area can vary from 480 to 568 points.
+extern NSString* const CCScreenModeFlexible;
+
+// The fixed screen mode will setup the working area to be 568 x 384 points. Depending on the device, the outer edges may be cropped. The safe area, that will be displayed on all sorts of devices, is 480 x 320 points and placed in the center of the working area.
+extern NSString* const CCScreenModeFixed;
+
 /** OS version definitions. Includes both iOS and Mac OS versions
  */
 typedef NS_ENUM(NSUInteger, CCSystemVersion){

cocos2d/CCConfiguration.h

@@ -38,6 +38,27 @@
 #import "ccConfig.h"
 #import "cocos2d.h"
 
+NSString* const CCSetupPixelFormat = @"CCSetupPixelFormat";
+NSString* const CCSetupScreenMode = @"CCSetupScreenMode";
+NSString* const CCSetupScreenOrientation = @"CCSetupScreenOrientation";
+NSString* const CCSetupAnimationInterval = @"CCSetupAnimationInterval";
+NSString* const CCSetupFixedUpdateInterval = @"CCSetupFixedUpdateInterval";
+NSString* const CCSetupShowDebugStats = @"CCSetupShowDebugStats";
+NSString* const CCSetupTabletScale2X = @"CCSetupTabletScale2X";
+
+NSString* const CCSetupDepthFormat = @"CCSetupDepthFormat";
+NSString* const CCSetupPreserveBackbuffer = @"CCSetupPreserveBackbuffer";
+NSString* const CCSetupMultiSampling = @"CCSetupMultiSampling";
+NSString* const CCSetupNumberOfSamples = @"CCSetupNumberOfSamples";
+
+NSString* const CCScreenOrientationLandscape = @"CCScreenOrientationLandscape";
+NSString* const CCScreenOrientationPortrait = @"CCScreenOrientationPortrait";
+NSString* const CCScreenOrientationAll = @"CCScreenOrientationAll";
+
+NSString* const CCScreenModeFlexible = @"CCScreenModeFlexible";
+NSString* const CCScreenModeFixed = @"CCScreenModeFixed";
+
+
 @interface CCConfiguration ()
 -(void) getOpenGLvariables;
 @end
@@ -123,20 +144,16 @@ -(NSInteger) runningDevice
 {
 	NSInteger ret=-1;
 
-	/*
-#if defined(APPORTABLE)
-    if( UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-	{
-		ret = ([UIScreen mainScreen].scale > 1) ? CCDeviceiPadRetinaDisplay : CCDeviceiPad;
-	}
-	else if( UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone )
-	{
-		if( [UIScreen mainScreen].scale > 1 ) {
-			ret = CCDeviceiPhoneRetinaDisplay;
-		} else
-			ret = CCDeviceiPhone;
-	}
-#el*/#if __CC_PLATFORM_IOS
+#if __CC_PLATFORM_ANDROID
+    if([CCDirector sharedDirector].contentScaleFactor > 1.0)
+    {
+        ret = CCDeviceiPhoneRetinaDisplay;
+    }
+    else
+    {
+        ret = CCDeviceiPhone;
+    }
+#elif __CC_PLATFORM_IOS
 
 	if( UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
 	{

cocos2d/CCConfiguration.m

@@ -11,11 +11,12 @@
 
 #import <BridgeKitV3/BridgeKit.h>
 #import "../../Platforms/CCGL.h"
+#import "CCProtocols.h"
 
 @class CCScene;
 @class AndroidRelativeLayout;
 BRIDGE_CLASS("org.cocos2d.CCActivity")
-@interface CCActivity : AndroidActivity <AndroidSurfaceHolderCallback>
+@interface CCActivity : AndroidActivity <AndroidSurfaceHolderCallback, CCDirectorDelegate>
 @property (readonly, nonatomic) AndroidRelativeLayout *layout;
 + (instancetype)currentActivity;
 

cocos2d/Platforms/Android/CCActivity.h

@@ -45,6 +45,7 @@ @implementation CCActivity {
     NSThread *_thread;
     BOOL _running;
     NSRunLoop *_gameLoop;
+    NSMutableDictionary *_cocos2dSetupConfig;
 }
 @synthesize layout=_layout;
 
@@ -87,7 +88,24 @@ - (void)run
     _layout = [[AndroidRelativeLayout alloc] initWithContext:self];
     AndroidDisplayMetrics *metrics = [[AndroidDisplayMetrics alloc] init];
     [self.windowManager.defaultDisplay getMetrics:metrics];
-    _glView = [[CCGLView alloc] initWithContext:self scaleFactor:metrics.density];
+    
+    // Configure Cocos2d with the options set in SpriteBuilder
+    // TODO: repalce Published-iOS with Published-Android
+    NSString* configPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Published-iOS"];
+    
+    configPath = [configPath stringByAppendingPathComponent:@"configCocos2d.plist"];
+    
+    _cocos2dSetupConfig = [NSMutableDictionary dictionaryWithContentsOfFile:configPath];
+    
+    enum CCAndroidScreenMode screenMode = CCNativeScreenMode;
+    
+    if([_cocos2dSetupConfig[CCSetupScreenMode] isEqual:CCScreenModeFlexible] ||
+       [_cocos2dSetupConfig[CCSetupScreenMode] isEqual:CCScreenModeFixed])
+    {
+        screenMode = CCScreenScaledAspectFitEmulationMode;
+    }
+    
+    _glView = [[CCGLView alloc] initWithContext:self screenMode:screenMode scaleFactor:metrics.density];
     [metrics release];
     [_glView.holder addCallback:self];
     [self.layout addView:_glView];
@@ -117,7 +135,7 @@ - (void)surfaceChanged:(JavaObject<AndroidSurfaceHolder> *)holder format:(int)fo
     if(_glView == nil)
         return;
 
-    _glView.bounds = CGRectMake(0, 0, width/_glView.contentScaleFactor, height/_glView.contentScaleFactor); 
+    _glView.bounds = CGRectMake(0, 0, width/_glView.contentScaleFactor, height/_glView.contentScaleFactor);
 
 #if USE_MAIN_THREAD
     [self reshape:[NSValue valueWithCGSize:CGSizeMake(width, height)]];
@@ -147,10 +165,23 @@ - (void)startGL:(JavaObject<AndroidSurfaceHolder> *)holder
         [self setupPaths];
 
         CCDirectorAndroid *director = (CCDirectorAndroid*)[CCDirector sharedDirector];
+        director.delegate = self;
         director.contentScaleFactor = _glView.contentScaleFactor;
         [CCTexture setDefaultAlphaPixelFormat:CCTexturePixelFormat_RGBA8888];
         [director setView:_glView];
 
+        if([_cocos2dSetupConfig[CCSetupScreenMode] isEqual:CCScreenModeFixed])
+        {
+            CGSize fixed = {568, 384};
+            if([_cocos2dSetupConfig[CCSetupScreenOrientation] isEqualToString:CCScreenOrientationPortrait])
+            {
+                CC_SWAP(fixed.width, fixed.height);
+            }
+            
+            director.designSize = fixed;
+            [director setProjection:CCDirectorProjectionCustom];
+        }
+        
         [director runWithScene:[self startScene]];
         [director setAnimationInterval:1.0/60.0];
         [director startAnimation];
@@ -270,6 +301,20 @@ - (void)popApplicationContext:(EGLContext)ctx
     }
 }
 
+#pragma mark CCDirector Delegate
+
+// Projection delegate is only used if the fixed resolution mode is enabled
+-(GLKMatrix4)updateProjection
+{
+	CGSize sizePoint = [CCDirector sharedDirector].viewSize;
+	CGSize fixed = [CCDirector sharedDirector].designSize;
+	
+	// Half of the extra size that will be cut off
+	CGPoint offset = ccpMult(ccp(fixed.width - sizePoint.width, fixed.height - sizePoint.height), 0.5);
+	
+	return CCMatrix4MakeOrtho(offset.x, sizePoint.width + offset.x, offset.y, sizePoint.height + offset.y, -1024, 1024);
+}
+
 @end
 
 #endif

cocos2d/Platforms/Android/CCActivity.m

@@ -17,11 +17,32 @@
 
 #import "../../Platforms/CCGL.h"
 
+enum CCAndroidScreenMode {
+    
+    /* 
+     NOTE: Emulation modes are not ideal and are only inteded for quick prototyping, 
+     because emulation modes force a an aspect ratio that is not intended for the device.
+     */
+    
+    /*
+     Keeps true to the device resolution and calculates a content scale
+     based on AndroidDisplayMetrics density property
+     */
+    CCNativeScreenMode,
+    
+    /* 
+     Provides a screen that is 320pt wide and has the aspect ratio of the
+     device. The screen size in pixels matches the native
+     resolution.
+     */
+    CCScreenScaledAspectFitEmulationMode
+};
+
 BRIDGE_CLASS("org.cocos2d.CCGLView")
 @interface CCGLView : AndroidSurfaceView
 
 - (id)initWithContext:(AndroidContext *)context;
-- (id)initWithContext:(AndroidContext *)context scaleFactor:(float)scaleFactor;
+- (id)initWithContext:(AndroidContext *)context screenMode:(enum CCAndroidScreenMode)screenMode scaleFactor:(float)scaleFactor;
 - (BOOL)onTouchEvent:(AndroidMotionEvent *)event;
 
 - (BOOL)setupView:(ANativeWindow*)window;
@@ -33,6 +54,7 @@ BRIDGE_CLASS("org.cocos2d.CCGLView")
 @property (nonatomic, readonly) EGLSurface eglSurface;
 @property (nonatomic, readonly) EGLContext eglContext;
 @property (nonatomic, readonly) EGLConfig eglConfiguration;
+@property (nonatomic, readonly) enum CCAndroidScreenMode screenMode;
 
 - (void)addGestureDetector:(AndroidGestureDetector *)detector;
 - (void)removeGestureDetector:(AndroidGestureDetector *)detector;

cocos2d/Platforms/Android/CCGLView.h

@@ -5,6 +5,7 @@
 //  Created by Oleg Osin on 5/22/14.
 //
 //
+
 #import "cocos2d.h"
 #import "CCGLView.h"
 
@@ -19,6 +20,8 @@
 #import "CCTouchAndroid.h"
 #import <CoreGraphics/CGGeometry.h>
 
+#define IPHONE3G_WIDTH 320.0f
+
 static NSMutableDictionary *touches = nil;
 static CCTouchEvent *currentEvent = nil;
 
@@ -29,12 +32,13 @@ @implementation CCGLView {
 @bridge (constructor) initWithContext:;
 @bridge (callback) onTouchEvent: = onTouchEvent;
 
-- (id)initWithContext:(AndroidContext *)context scaleFactor:(float)scaleFactor
+- (id)initWithContext:(AndroidContext *)context screenMode:(enum CCAndroidScreenMode)screenMode  scaleFactor:(float)scaleFactor
 {
     self = [self initWithContext:context];
     if (self)
     {
         _contentScaleFactor = scaleFactor;
+        _screenMode = screenMode;
     }
     return self;
 }
@@ -503,9 +507,35 @@ - (BOOL)setupView:(ANativeWindow*)window
         return NO;
     }
 
-    width /= _contentScaleFactor;
-    height /= _contentScaleFactor;
-//
+    switch (_screenMode)
+    {
+        case CCNativeScreenMode:
+        {
+            width /= _contentScaleFactor;
+            height /= _contentScaleFactor;
+        }
+        break;
+        
+        case CCScreenScaledAspectFitEmulationMode:
+        {
+            CGSize size = CGSizeMake(width, height);
+            if (width > height)
+                size = CGSizeMake(height, width);
+            
+            _contentScaleFactor = size.width / IPHONE3G_WIDTH;
+            
+            width /= _contentScaleFactor;
+            height /= _contentScaleFactor;
+        }
+        break;
+            
+            
+        default:
+            CCLOGWARN(@"WARNING: Failed to identify screen mode");
+        break;
+            
+    }
+    
 //    ANativeWindow_setBuffersGeometry(window, width, height, format);
 
     if(eglGetError() != EGL_SUCCESS) { NSLog(@"EGL ERROR: %i", eglGetError()); };

cocos2d/Platforms/Android/CCGLView.m

@@ -30,36 +30,6 @@
 #import <UIKit/UIKit.h>
 #import "CCDirectorIOS.h"
 
-extern NSString* const CCSetupPixelFormat;
-extern NSString* const CCSetupScreenMode;
-extern NSString* const CCSetupScreenOrientation;
-extern NSString* const CCSetupAnimationInterval;
-extern NSString* const CCSetupFixedUpdateInterval;
-extern NSString* const CCSetupShowDebugStats;
-extern NSString* const CCSetupTabletScale2X;
-
-extern NSString* const CCSetupDepthFormat;
-extern NSString* const CCSetupPreserveBackbuffer;
-extern NSString* const CCSetupMultiSampling;
-extern NSString* const CCSetupNumberOfSamples;
-
-// Landscape screen orientation. Used with CCSetupScreenOrientation.
-extern NSString* const CCScreenOrientationLandscape;
-
-// Portrait screen orientation.  Used with CCSetupScreenOrientation.
-extern NSString* const CCScreenOrientationPortrait;
-
-// Support all screen orientations.  Used with CCSetupScreenOrientation.
-extern NSString* const CCScreenOrientationAll;
-
-
-// The flexible screen mode is Cocos2d's default. It will give you an area that can vary slightly in size. In landscape mode the height will be 320 points for mobiles and 384 points for tablets. The width of the area can vary from 480 to 568 points.
-extern NSString* const CCScreenModeFlexible;
-
-// The fixed screen mode will setup the working area to be 568 x 384 points. Depending on the device, the outer edges may be cropped. The safe area, that will be displayed on all sorts of devices, is 480 x 320 points and placed in the center of the working area.
-extern NSString* const CCScreenModeFixed;
-
-
 @class CCAppDelegate;
 @class CCScene;
 

cocos2d/Platforms/iOS/CCAppDelegate.h

@@ -34,26 +34,6 @@
 
 #import "OALSimpleAudio.h"
 
-NSString* const CCSetupPixelFormat = @"CCSetupPixelFormat";
-NSString* const CCSetupScreenMode = @"CCSetupScreenMode";
-NSString* const CCSetupScreenOrientation = @"CCSetupScreenOrientation";
-NSString* const CCSetupAnimationInterval = @"CCSetupAnimationInterval";
-NSString* const CCSetupFixedUpdateInterval = @"CCSetupFixedUpdateInterval";
-NSString* const CCSetupShowDebugStats = @"CCSetupShowDebugStats";
-NSString* const CCSetupTabletScale2X = @"CCSetupTabletScale2X";
-
-NSString* const CCSetupDepthFormat = @"CCSetupDepthFormat";
-NSString* const CCSetupPreserveBackbuffer = @"CCSetupPreserveBackbuffer";
-NSString* const CCSetupMultiSampling = @"CCSetupMultiSampling";
-NSString* const CCSetupNumberOfSamples = @"CCSetupNumberOfSamples";
-
-NSString* const CCScreenOrientationLandscape = @"CCScreenOrientationLandscape";
-NSString* const CCScreenOrientationPortrait = @"CCScreenOrientationPortrait";
-NSString* const CCScreenOrientationAll = @"CCScreenOrientationAll";
-
-NSString* const CCScreenModeFlexible = @"CCScreenModeFlexible";
-NSString* const CCScreenModeFixed = @"CCScreenModeFixed";
-
 // Fixed size. As wide as iPhone 5 at 2x and as high as the iPad at 2x.
 const CGSize FIXED_SIZE = {568, 384};