From 547905465b3462092c48e17a921fa076a13be71a Mon Sep 17 00:00:00 2001 From: Walzer Date: Wed, 10 Aug 2011 14:45:13 +0800 Subject: [PATCH] issue #540, add RootViewController into xcode3 templates; rename _XXX_Prefix.pch to Prefix.pch; remove MIT license in user code. --- ...EASIDENTIFIER____Prefix.pch => Prefix.pch} | 0 .../project.pbxproj.REMOVED.git-id | 2 +- .../xcode3/cocos2d-x_app/ios/AppController.h | 5 +- .../xcode3/cocos2d-x_app/ios/AppController.mm | 16 ++++- .../cocos2d-x_app/ios/RootViewController.h | 16 +++++ .../cocos2d-x_app/ios/RootViewController.mm | 61 +++++++++++++++++++ ...EASIDENTIFIER____Prefix.pch => Prefix.pch} | 0 .../project.pbxproj.REMOVED.git-id | 2 +- .../cocos2d-x_box2d_app/ios/AppController.h | 5 +- .../cocos2d-x_box2d_app/ios/AppController.mm | 21 +++++-- .../ios/RootViewController.h | 16 +++++ .../ios/RootViewController.mm | 61 +++++++++++++++++++ ...EASIDENTIFIER____Prefix.pch => Prefix.pch} | 0 .../project.pbxproj.REMOVED.git-id | 2 +- .../ios/AppController.h | 5 +- .../ios/AppController.mm | 16 ++++- .../ios/RootViewController.h | 16 +++++ .../ios/RootViewController.mm | 61 +++++++++++++++++++ ...EASIDENTIFIER____Prefix.pch => Prefix.pch} | 0 .../project.pbxproj.REMOVED.git-id | 2 +- .../cocos2d-x_lua_app/ios/AppController.h | 30 +++------ .../cocos2d-x_lua_app/ios/AppController.mm | 31 +++------- .../ios/RootViewController.h | 31 +++------- .../ios/RootViewController.mm | 31 +++------- 24 files changed, 319 insertions(+), 111 deletions(-) rename template/xcode3/cocos2d-x_app/{___PROJECTNAMEASIDENTIFIER____Prefix.pch => Prefix.pch} (100%) create mode 100644 template/xcode3/cocos2d-x_app/ios/RootViewController.h create mode 100644 template/xcode3/cocos2d-x_app/ios/RootViewController.mm rename template/xcode3/cocos2d-x_box2d_app/{___PROJECTNAMEASIDENTIFIER____Prefix.pch => Prefix.pch} (100%) create mode 100644 template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.h create mode 100644 template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.mm rename template/xcode3/cocos2d-x_chipmunk_app/{___PROJECTNAMEASIDENTIFIER____Prefix.pch => Prefix.pch} (100%) create mode 100644 template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.h create mode 100644 template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.mm rename template/xcode3/cocos2d-x_lua_app/{___PROJECTNAMEASIDENTIFIER____Prefix.pch => Prefix.pch} (100%) diff --git a/template/xcode3/cocos2d-x_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_app/Prefix.pch similarity index 100% rename from template/xcode3/cocos2d-x_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch rename to template/xcode3/cocos2d-x_app/Prefix.pch diff --git a/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 07b1ebe830..f8ba15728e 100644 --- a/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -8a8e4250f3cfe00ec9909ad8b1cedfcccb4acf64 \ No newline at end of file +3aab8d3693dcaba52bbe6cf1d88bd085701c71bb \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_app/ios/AppController.h b/template/xcode3/cocos2d-x_app/ios/AppController.h index c7b2955669..5ed7df2f27 100644 --- a/template/xcode3/cocos2d-x_app/ios/AppController.h +++ b/template/xcode3/cocos2d-x_app/ios/AppController.h @@ -1,13 +1,16 @@ // -// ___PROJECTNAMEASIDENTIFIER___AppController.h +// AppController.h // ___PROJECTNAME___ // // Created by ___FULLUSERNAME___ on ___DATE___. // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // +@class RootViewController; + @interface AppController : NSObject { UIWindow *window; + RootViewController *viewController; } @end diff --git a/template/xcode3/cocos2d-x_app/ios/AppController.mm b/template/xcode3/cocos2d-x_app/ios/AppController.mm index cf823c55d7..36408f1ce5 100644 --- a/template/xcode3/cocos2d-x_app/ios/AppController.mm +++ b/template/xcode3/cocos2d-x_app/ios/AppController.mm @@ -1,16 +1,19 @@ // -// ___PROJECTNAMEASIDENTIFIER___AppController.mm +// AppController.mm // ___PROJECTNAME___ // // Created by ___FULLUSERNAME___ on ___DATE___. // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // + #import #import "AppController.h" #import "cocos2d.h" #import "EAGLView.h" #import "AppDelegate.h" +#import "RootViewController.h" + @implementation AppController #pragma mark - @@ -32,7 +35,14 @@ static AppDelegate s_sharedApplication; sharegroup: nil multiSampling: NO numberOfSamples: 0 ]; - [window addSubview: __glView]; + + // Use RootViewController manage EAGLView + viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; + viewController.wantsFullScreenLayout = YES; + viewController.view = __glView; + + // Set RootViewController to window + window.rootViewController = viewController; [window makeKeyAndVisible]; [[UIApplication sharedApplication] setStatusBarHidden: YES]; @@ -41,6 +51,7 @@ static AppDelegate s_sharedApplication; return YES; } + - (void)applicationWillResignActive:(UIApplication *)application { /* Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. @@ -95,3 +106,4 @@ static AppDelegate s_sharedApplication; @end + diff --git a/template/xcode3/cocos2d-x_app/ios/RootViewController.h b/template/xcode3/cocos2d-x_app/ios/RootViewController.h new file mode 100644 index 0000000000..dbc1baefda --- /dev/null +++ b/template/xcode3/cocos2d-x_app/ios/RootViewController.h @@ -0,0 +1,16 @@ +// +// RootViewController.h +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + +#import + + +@interface RootViewController : UIViewController { + +} + +@end diff --git a/template/xcode3/cocos2d-x_app/ios/RootViewController.mm b/template/xcode3/cocos2d-x_app/ios/RootViewController.mm new file mode 100644 index 0000000000..88fcd37091 --- /dev/null +++ b/template/xcode3/cocos2d-x_app/ios/RootViewController.mm @@ -0,0 +1,61 @@ +// +// RootViewController.mm +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + +#import "RootViewController.h" + + +@implementation RootViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement loadView to create a view hierarchy programmatically, without using a nib. +- (void)loadView { +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} + +*/ +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff --git a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_box2d_app/Prefix.pch similarity index 100% rename from template/xcode3/cocos2d-x_box2d_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch rename to template/xcode3/cocos2d-x_box2d_app/Prefix.pch diff --git a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 1d569d2df6..d9d84e667e 100644 --- a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -66024535e3177e78e142dc5f54f603198c2c7550 \ No newline at end of file +d018a539198cdce661d24e7f45fbce6fe66ff1a1 \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/AppController.h b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.h index c7b2955669..5ed7df2f27 100644 --- a/template/xcode3/cocos2d-x_box2d_app/ios/AppController.h +++ b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.h @@ -1,13 +1,16 @@ // -// ___PROJECTNAMEASIDENTIFIER___AppController.h +// AppController.h // ___PROJECTNAME___ // // Created by ___FULLUSERNAME___ on ___DATE___. // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // +@class RootViewController; + @interface AppController : NSObject { UIWindow *window; + RootViewController *viewController; } @end diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm index be45ef991c..36408f1ce5 100644 --- a/template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm +++ b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm @@ -1,16 +1,19 @@ // -// ___PROJECTNAMEASIDENTIFIER___AppController.mm +// AppController.mm // ___PROJECTNAME___ // // Created by ___FULLUSERNAME___ on ___DATE___. // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // + #import #import "AppController.h" #import "cocos2d.h" #import "EAGLView.h" #import "AppDelegate.h" +#import "RootViewController.h" + @implementation AppController #pragma mark - @@ -28,11 +31,18 @@ static AppDelegate s_sharedApplication; EAGLView *__glView = [EAGLView viewWithFrame: [window bounds] pixelFormat: kEAGLColorFormatRGBA8 depthFormat: GL_DEPTH_COMPONENT16_OES - preserveBackbuffer: NO + preserveBackbuffer: NO sharegroup: nil - multiSampling: NO - numberOfSamples:0 ]; - [window addSubview: __glView]; + multiSampling: NO + numberOfSamples: 0 ]; + + // Use RootViewController manage EAGLView + viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; + viewController.wantsFullScreenLayout = YES; + viewController.view = __glView; + + // Set RootViewController to window + window.rootViewController = viewController; [window makeKeyAndVisible]; [[UIApplication sharedApplication] setStatusBarHidden: YES]; @@ -96,3 +106,4 @@ static AppDelegate s_sharedApplication; @end + diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.h b/template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.h new file mode 100644 index 0000000000..dbc1baefda --- /dev/null +++ b/template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.h @@ -0,0 +1,16 @@ +// +// RootViewController.h +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + +#import + + +@interface RootViewController : UIViewController { + +} + +@end diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.mm b/template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.mm new file mode 100644 index 0000000000..88fcd37091 --- /dev/null +++ b/template/xcode3/cocos2d-x_box2d_app/ios/RootViewController.mm @@ -0,0 +1,61 @@ +// +// RootViewController.mm +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + +#import "RootViewController.h" + + +@implementation RootViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement loadView to create a view hierarchy programmatically, without using a nib. +- (void)loadView { +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} + +*/ +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff --git a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_chipmunk_app/Prefix.pch similarity index 100% rename from template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch rename to template/xcode3/cocos2d-x_chipmunk_app/Prefix.pch diff --git a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 0f18eb8789..9db7519b9e 100644 --- a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -a6ca12b0bdd905d2b0dd4cad0ca30ea437326572 \ No newline at end of file +b59f29f9bd284c46876e7ecc47b74bfaf8a00aa6 \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h index c7b2955669..5ed7df2f27 100644 --- a/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h @@ -1,13 +1,16 @@ // -// ___PROJECTNAMEASIDENTIFIER___AppController.h +// AppController.h // ___PROJECTNAME___ // // Created by ___FULLUSERNAME___ on ___DATE___. // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // +@class RootViewController; + @interface AppController : NSObject { UIWindow *window; + RootViewController *viewController; } @end diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm index 481f105daa..36408f1ce5 100644 --- a/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm @@ -1,16 +1,19 @@ // -// ___PROJECTNAMEASIDENTIFIER___AppController.mm +// AppController.mm // ___PROJECTNAME___ // // Created by ___FULLUSERNAME___ on ___DATE___. // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // + #import #import "AppController.h" #import "cocos2d.h" #import "EAGLView.h" #import "AppDelegate.h" +#import "RootViewController.h" + @implementation AppController #pragma mark - @@ -32,7 +35,14 @@ static AppDelegate s_sharedApplication; sharegroup: nil multiSampling: NO numberOfSamples: 0 ]; - [window addSubview: __glView]; + + // Use RootViewController manage EAGLView + viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; + viewController.wantsFullScreenLayout = YES; + viewController.view = __glView; + + // Set RootViewController to window + window.rootViewController = viewController; [window makeKeyAndVisible]; [[UIApplication sharedApplication] setStatusBarHidden: YES]; @@ -72,7 +82,6 @@ static AppDelegate s_sharedApplication; cocos2d::CCApplication::sharedApplication().applicationWillEnterForeground(); } - - (void)applicationWillTerminate:(UIApplication *)application { /* Called when the application is about to terminate. @@ -97,3 +106,4 @@ static AppDelegate s_sharedApplication; @end + diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.h b/template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.h new file mode 100644 index 0000000000..dbc1baefda --- /dev/null +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.h @@ -0,0 +1,16 @@ +// +// RootViewController.h +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + +#import + + +@interface RootViewController : UIViewController { + +} + +@end diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.mm b/template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.mm new file mode 100644 index 0000000000..88fcd37091 --- /dev/null +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/RootViewController.mm @@ -0,0 +1,61 @@ +// +// RootViewController.mm +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + +#import "RootViewController.h" + + +@implementation RootViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement loadView to create a view hierarchy programmatically, without using a nib. +- (void)loadView { +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} + +*/ +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff --git a/template/xcode3/cocos2d-x_lua_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch b/template/xcode3/cocos2d-x_lua_app/Prefix.pch similarity index 100% rename from template/xcode3/cocos2d-x_lua_app/___PROJECTNAMEASIDENTIFIER____Prefix.pch rename to template/xcode3/cocos2d-x_lua_app/Prefix.pch diff --git a/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 823057f425..8e3940652c 100644 --- a/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -4f2f642918e859dde3db5a24ebb9484634f1d2fc \ No newline at end of file +8feced937b259baf35f5ea1d21cf2adad5d02f7d \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_lua_app/ios/AppController.h b/template/xcode3/cocos2d-x_lua_app/ios/AppController.h index dbbf494977..5ed7df2f27 100644 --- a/template/xcode3/cocos2d-x_lua_app/ios/AppController.h +++ b/template/xcode3/cocos2d-x_lua_app/ios/AppController.h @@ -1,26 +1,10 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - 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. - ****************************************************************************/ +// +// AppController.h +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// @class RootViewController; diff --git a/template/xcode3/cocos2d-x_lua_app/ios/AppController.mm b/template/xcode3/cocos2d-x_lua_app/ios/AppController.mm index fb4c058c97..36408f1ce5 100644 --- a/template/xcode3/cocos2d-x_lua_app/ios/AppController.mm +++ b/template/xcode3/cocos2d-x_lua_app/ios/AppController.mm @@ -1,26 +1,11 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - 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. - ****************************************************************************/ +// +// AppController.mm +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// + #import #import "AppController.h" #import "cocos2d.h" diff --git a/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.h b/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.h index a40c2edd28..dbc1baefda 100644 --- a/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.h +++ b/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.h @@ -1,27 +1,10 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - 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. - ****************************************************************************/ +// +// RootViewController.h +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// #import diff --git a/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.mm b/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.mm index 90d9a0941c..88fcd37091 100644 --- a/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.mm +++ b/template/xcode3/cocos2d-x_lua_app/ios/RootViewController.mm @@ -1,27 +1,10 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - 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. - ****************************************************************************/ +// +// RootViewController.mm +// ___PROJECTNAME___ +// +// Created by ___FULLUSERNAME___ on ___DATE___. +// Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. +// #import "RootViewController.h"