Merge pull request #1218 from andykorth/CCDirector/UpdateTestBase

Update Test project to work with CCAppController changes

Author: slembcke

Android/AppActivity.h

@@ -0,0 +1,31 @@
+/*
+ * SpriteBuilder: http://www.spritebuilder.org
+ *
+ * Copyright (c) 2014 Apportable Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#import "CCActivity.h"
+
+BRIDGE_CLASS("com.apportable.GLActivity")
+@interface PROJECTIDENTIFIERActivity : CCActivity
+
+@end

Android/AppActivity.m

@@ -0,0 +1,50 @@
+/*
+ * SpriteBuilder: http://www.spritebuilder.org
+ *
+ * Copyright (c) 2014 Apportable Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#import "PROJECTIDENTIFIERActivity.h"
+#import "PROJECTIDENTIFIERController.h"
+
+#import <AndroidKit/AndroidKeyEvent.h>
+
+@implementation PROJECTIDENTIFIERActivity
+
+
+- (BOOL)onKeyUp:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event
+{
+    if (keyCode == AndroidKeyEventKeycodeBack)
+    {
+        [self finish];
+    }
+    return NO;
+}
+
+- (void)run
+{
+    [super run];
+    
+    [PROJECTIDENTIFIERController setupApplication];
+}
+
+@end

Mac/AppDelegate.h

@@ -0,0 +1,6 @@
+#import <Cocoa/Cocoa.h>
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@end
+

Mac/AppDelegate.m

@@ -0,0 +1,28 @@
+#import "AppDelegate.h"
+#import "CCPackageManager.h"
+#import "CCDirector_Private.h"
+#import "AppController.h"
+
+@interface AppDelegate ()
+
+@property (weak) IBOutlet NSWindow *window;
+@property (weak) IBOutlet CC_VIEW<CCView> *glView;
+@end
+
+@implementation AppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    AppController *controller = [AppController sharedController];
+    controller.window = _window;
+    controller.glView = _glView;
+    [controller setupApplication];
+    return;
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification
+{
+    [[CCPackageManager sharedManager] savePackages];
+}
+
+@end

Mac/main.m

@@ -0,0 +1,7 @@
+//  Copyright (c) 2015 Apportable. All rights reserved.
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, const char * argv[]) {
+    return NSApplicationMain(argc, argv);
+}

UnitTests/CCTextureTests.m

@@ -15,7 +15,7 @@ - (void)setUp
 {
     [super setUp];
 
-    [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
+//    [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
 }
 
 -(void)testTextureCache

cocos2d-tests.xcodeproj/project.pbxproj

@@ -22,15 +22,11 @@
  * THE SOFTWARE.
  */
 
-#import <UIKit/UIKit.h>
-#import "cocos2d.h"
+#import "CCAppController.h"
 
-@interface AppController : CCAppDelegate
-{
-}
+@interface AppController : CCAppController
 
-- (void)configureCocos2d;
-
-- (void)configureFileUtilsSearchPathAndRegisterSpriteSheets;
++ (AppController*)sharedController;
++ (void)setupApplication;
 
 @end

cocos2d-ui-tests/ios/AppDelegate.h renamed to cocos2d-ui-tests/ios/AppController.h

@@ -24,43 +24,50 @@
 
 #import "cocos2d.h"
 
-#import "AppDelegate.h"
+#import "AppController.h"
 #import "MainMenu.h"
 #import "TestBase.h"
 #import "CCPackageConstants.h"
 
 @implementation AppController
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    [self configureCocos2d];
 
-    return YES;
+- (void)setupApplication
+{
+    [self configureFileUtilsSearchPathAndRegisterSpriteSheets];
+    [super setupApplication];
 }
 
-- (void)configureCocos2d
+- (NSDictionary*)iosConfig
 {
-    // Configure the file utils to work with SpriteBuilder, but use a custom resource path (Resources-shared instead of Published-iOS)
-    [CCBReader configureCCFileUtils];
-
-    [self configureFileUtilsSearchPathAndRegisterSpriteSheets];
+    return @{
+             CCSetupDepthFormat: @GL_DEPTH24_STENCIL8,
+             CCSetupTabletScale2X: @YES,
+             CCSetupShowDebugStats: @(getenv("SHOW_DEBUG_STATS") != nil),
+             };
+}
 
-    [self setupCocos2dWithOptions:@{
-			CCSetupDepthFormat: @GL_DEPTH24_STENCIL8,
-//			CCSetupScreenMode: CCScreenModeFixed,
-//			CCSetupScreenOrientation: CCScreenOrientationPortrait,
-			CCSetupTabletScale2X: @YES,
-			CCSetupShowDebugStats: @(getenv("SHOW_DEBUG_STATS") != nil),
-		}];
+- (NSDictionary*)macConfig
+{
+    NSMutableDictionary *config = [NSMutableDictionary dictionary];
+    config[CCMacDefaultWindowSize] = [NSValue valueWithCGSize:[self defaultWindowSize]];
+    config[CCSetupDepthFormat] = @GL_DEPTH24_STENCIL8;
+    config[CCSetupTabletScale2X] = @YES;
+    config[CCSetupShowDebugStats] = @(getenv("SHOW_DEBUG_STATS") != nil);
+    
+    return config;
 }
 
 - (void)configureFileUtilsSearchPathAndRegisterSpriteSheets
 {
     [[NSUserDefaults standardUserDefaults] setValue:nil forKey:PACKAGE_STORAGE_USERDEFAULTS_KEY];
     [[NSUserDefaults standardUserDefaults] synchronize];
 
+    // The testbed uses a different directory dictionary than is created by the default CCFileUtils constructor- it uses the file utils one
+    [CCBReader configureCCFileUtils];
     CCFileUtils* sharedFileUtils = [CCFileUtils sharedFileUtils];
 
+    // Testbed needs special directory search paths:
     sharedFileUtils.searchPath = @[
         [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Images"],
         [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Fonts"],
@@ -74,60 +81,69 @@ - (void)configureFileUtilsSearchPathAndRegisterSpriteSheets
     [[CCSpriteFrameCache sharedSpriteFrameCache] registerSpriteFramesFile:@"TilesAtlassed.plist"];
 }
 
-- (CCScene*) startScene
+- (CCScene*) createFirstScene
+{
+    const char *testName = getenv("Test");
+    
+    if(testName){
+        return [TestBase sceneWithTestName:[NSString stringWithCString:testName encoding:NSUTF8StringEncoding]];
+    } else {
+        return [MainMenu scene];
+    }
+}
+
+
+#pragma mark Android
+
+#if __CC_PLATFORM_ANDROID
+
+/*
+ Add any android specific overrides here
+ */
+
+#endif
+
+
+#pragma mark Mac
+
+#if __CC_PLATFORM_MAC
+
+/*
+ Add any Mac specific overrides here
+ */
+-(CGSize)defaultWindowSize
+{
+    return CGSizeMake(960.0f, 640.0f);
+}
+
+#endif
+
+#pragma mark Singleton Methods
+
+static AppController *__sharedController;
+
+/*
+ These methods are used in the framework to reference this controller.
+ */
++ (AppController*)sharedController
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^
+                  {
+                      __sharedController = [[AppController alloc] init];
+                  });
+    
+    return __sharedController;
+}
+
++ (void)setupApplication
 {
-	const char *testName = getenv("Test");
-	
-	if(testName){
-		return [TestBase sceneWithTestName:[NSString stringWithCString:testName encoding:NSUTF8StringEncoding]];
-	} else {
-		return [MainMenu scene];
-	}
+    static dispatch_once_t setupToken;
+    dispatch_once(&setupToken, ^
+                  {
+                      [[AppController sharedController] setupApplication];
+                  });
 }
 
-//// I'm going to leave this in for testing the fixed size screen mode in the future.
-//- (CCScene*) startScene
-//{
-////    return [MainMenu scene];
-//	CCScene *scene = [CCScene node];
-//	
-////	// Landscape
-////	{
-////		// iPad
-////		CCNode *node = [CCNodeColor nodeWithColor:[CCColor greenColor] width:512 height:384];
-////		node.position = ccp(28, 0);
-////		[scene addChild:node];
-////	}{
-////		// iPhone5
-////		CCNode *node = [CCNodeColor nodeWithColor:[CCColor redColor] width:568 height:320];
-////		node.position = ccp(0, 32);
-////		[scene addChild:node];
-////	}{
-////		// iPhone
-////		CCNode *node = [CCNodeColor nodeWithColor:[CCColor blueColor] width:480 height:320];
-////		node.position = ccp(44, 32);
-////		[scene addChild:node];
-////	}
-//	
-//	// Portrait
-//	{
-//		// iPad
-//		CCNode *node = [CCNodeColor nodeWithColor:[CCColor greenColor] width:384 height:512];
-//		node.position = ccp(0, 28);
-//		[scene addChild:node];
-//	}{
-//		// iPhone5
-//		CCNode *node = [CCNodeColor nodeWithColor:[CCColor redColor] width:320 height:568];
-//		node.position = ccp(32, 0);
-//		[scene addChild:node];
-//	}{
-//		// iPhone
-//		CCNode *node = [CCNodeColor nodeWithColor:[CCColor blueColor] width:320 height:480];
-//		node.position = ccp(32, 44);
-//		[scene addChild:node];
-//	}
-//	
-//	return scene;
-//}
 
 @end