From 48acd5f8c3c39bafa01a427c14ed2c972bab6e6c Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 13:24:09 +0100 Subject: [PATCH 01/10] fix some classes not autocompleting in Swift, updated template --- .../Source/Bridging-Header.h | 25 ++++++++++++++----- .../Source/MainScene.m | 4 +++ .../Source/MainScene.swift | 4 +++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/Source/Bridging-Header.h b/Support/PROJECTNAME.spritebuilder/Source/Bridging-Header.h index d39e6e835..f00608ba5 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/Bridging-Header.h +++ b/Support/PROJECTNAME.spritebuilder/Source/Bridging-Header.h @@ -1,16 +1,29 @@ #import "cocos2d.h" -#import "cocos2d-ui.h" // Imported explicitly and with relative path. // Class would otherwise be available but not autocompleting/syntax-highlighting. // Perhaps an Xcode bug? + +#import "libs/cocos2d-iphone/cocos2d/CCMotionStreak.h" +#import "libs/cocos2d-iphone/cocos2d/CCNodeColor.h" +#import "libs/cocos2d-iphone/cocos2d/CCPackage.h" +#import "libs/cocos2d-iphone/cocos2d/CCPackageHelper.h" +#import "libs/cocos2d-iphone/cocos2d/CCPackageManager.h" +#import "libs/cocos2d-iphone/cocos2d/CCPackageManagerDelegate.h" +#import "libs/cocos2d-iphone/cocos2d/CCParallaxNode.h" +#import "libs/cocos2d-iphone/cocos2d/CCParticleSystem.h" +#import "libs/cocos2d-iphone/cocos2d/CCPhysicsBody.h" +#import "libs/cocos2d-iphone/cocos2d/CCPhysicsNode.h" + +//#import "libs/cocos2d-iphone/cocos2d/Platforms/iOS/CCAppDelegate.h" +//#import "libs/cocos2d-iphone/cocos2d/Platforms/iOS/CCMetalView.h" #import "libs/cocos2d-iphone/cocos2d/Support/CCColor.h" + +#import "libs/cocos2d-iphone/cocos2d-ui/cocos2d-ui.h" #import "libs/cocos2d-iphone/cocos2d-ui/CCBReader/CCBReader.h" -#import "libs/cocos2d-iphone/cocos2d-ui/CCControl.h" -#import "libs/cocos2d-iphone/cocos2d-ui/CCButton.h" -#import "libs/cocos2d-iphone/cocos2d-ui/CCSlider.h" -#import "libs/cocos2d-iphone/cocos2d-ui/CCTextField.h" +#import "libs/cocos2d-iphone/cocos2d-ui/CCBReader/CCAnimationManager.h" + #import "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/ObjectAL.h" #import "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/AudioTrack/OALAudioTrack.h" #import "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/AudioTrack/OALAudioTracks.h" -#import "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/Session/OALAudioSession.h" +#import "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/Session/OALAudioSession.h" \ No newline at end of file diff --git a/Support/PROJECTNAME.spritebuilder/Source/MainScene.m b/Support/PROJECTNAME.spritebuilder/Source/MainScene.m index fbd20d648..0db17b6fd 100755 --- a/Support/PROJECTNAME.spritebuilder/Source/MainScene.m +++ b/Support/PROJECTNAME.spritebuilder/Source/MainScene.m @@ -2,4 +2,8 @@ @implementation MainScene +-(void) didLoadFromCCB { + +} + @end diff --git a/Support/PROJECTNAME.spritebuilder/Source/MainScene.swift b/Support/PROJECTNAME.spritebuilder/Source/MainScene.swift index 4a0000dea..55c8f959d 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/MainScene.swift +++ b/Support/PROJECTNAME.spritebuilder/Source/MainScene.swift @@ -2,4 +2,8 @@ import Foundation class MainScene: CCNode { + func didLoadFromCCB() { + + } + } From 103638bf313412671489aadad1156676dd43ecba Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 13:48:16 +0100 Subject: [PATCH 02/10] fixed template project's "Source" group not pointing to the Source folder merge-friendly change by editing paths in pbxproj rather than remove & re-add of source group --- .../PROJECTNAME.xcodeproj/project.pbxproj | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj index 7ebb6c754..032b7183c 100755 --- a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj +++ b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj @@ -180,19 +180,19 @@ 5B121011197483EE004C1E1D /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; 5B121013197483EE004C1E1D /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; 5B121015197483EE004C1E1D /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; - 5B12101B19748413004C1E1D /* PROJECTIDENTIFIERActivity.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; name = PROJECTIDENTIFIERActivity.java; path = Source/Platforms/Android/java/org/cocos2d/PROJECTIDENTIFIER/PROJECTIDENTIFIERActivity.java; sourceTree = ""; }; + 5B12101B19748413004C1E1D /* PROJECTIDENTIFIERActivity.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; name = PROJECTIDENTIFIERActivity.java; path = Platforms/Android/java/org/cocos2d/PROJECTIDENTIFIER/PROJECTIDENTIFIERActivity.java; sourceTree = ""; }; 5B121021197484A3004C1E1D /* PROJECTNAME Java.jar */ = {isa = PBXFileReference; explicitFileType = compiled.java.jar; includeInIndex = 0; path = "PROJECTNAME Java.jar"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5B12102E197484FA004C1E1D /* PROJECTIDENTIFIERActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PROJECTIDENTIFIERActivity.h; path = Source/Platforms/Android/PROJECTIDENTIFIERActivity.h; sourceTree = ""; }; - 5B12102F197484FA004C1E1D /* PROJECTIDENTIFIERActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PROJECTIDENTIFIERActivity.m; path = Source/Platforms/Android/PROJECTIDENTIFIERActivity.m; sourceTree = ""; }; + 5B12102E197484FA004C1E1D /* PROJECTIDENTIFIERActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PROJECTIDENTIFIERActivity.h; path = Platforms/Android/PROJECTIDENTIFIERActivity.h; sourceTree = ""; }; + 5B12102F197484FA004C1E1D /* PROJECTIDENTIFIERActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PROJECTIDENTIFIERActivity.m; path = Platforms/Android/PROJECTIDENTIFIERActivity.m; sourceTree = ""; }; 5B121033197485FE004C1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Platforms/Android/Info.plist; sourceTree = ""; }; 5B121034197485FE004C1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Platforms/iOS/Info.plist; sourceTree = ""; }; 5BA4619E1974C88900785744 /* AndroidManifest.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = AndroidManifest.xml; path = Platforms/Android/AndroidManifest.xml; sourceTree = ""; }; - 7A046D7519E84C36004C4763 /* MainScene.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MainScene.swift; path = Source/MainScene.swift; sourceTree = ""; }; + 7A046D7519E84C36004C4763 /* MainScene.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MainScene.swift; path = MainScene.swift; sourceTree = ""; }; 7A4035FF19DDEE84007B6E8F /* PROJECTNAME Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PROJECTNAME Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 7A40360219DDEE84007B6E8F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Platforms/Mac/Info.plist; sourceTree = ""; }; 7A40360319DDEE84007B6E8F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/Platforms/Mac/main.m; sourceTree = ""; }; - 7A40360519DDEE84007B6E8F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/Platforms/Mac/AppDelegate.h; sourceTree = ""; }; - 7A40360619DDEE84007B6E8F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/Platforms/Mac/AppDelegate.m; sourceTree = ""; }; + 7A40360519DDEE84007B6E8F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Platforms/Mac/AppDelegate.h; sourceTree = ""; }; + 7A40360619DDEE84007B6E8F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Platforms/Mac/AppDelegate.m; sourceTree = ""; }; 7A4036F419DE3FA8007B6E8F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; 7A59493A19E37F9300F65F90 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; 7A59493C19E37FB200F65F90 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; @@ -213,8 +213,8 @@ B71F590F188484E7003F4D28 /* Settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Settings.png; path = Icons/Settings.png; sourceTree = ""; }; B71F5910188484E7003F4D28 /* Settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Settings@2x.png"; path = "Icons/Settings@2x.png"; sourceTree = ""; }; B737893A180761570076A88C /* Published-iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Published-iOS"; path = "Source/Resources/Published-iOS"; sourceTree = SOURCE_ROOT; }; - B737893D1807617C0076A88C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/Platforms/iOS/AppDelegate.h; sourceTree = ""; }; - B737893E1807617C0076A88C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/Platforms/iOS/AppDelegate.m; sourceTree = ""; }; + B737893D1807617C0076A88C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Platforms/iOS/AppDelegate.h; sourceTree = ""; }; + B737893E1807617C0076A88C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Platforms/iOS/AppDelegate.m; sourceTree = ""; }; B7378940180761A80076A88C /* cocos2d.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d.xcodeproj; path = "Source/libs/cocos2d-iphone/cocos2d.xcodeproj"; sourceTree = SOURCE_ROOT; }; B737896B180762440076A88C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "Source/Resources/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; B737896C180762440076A88C /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "Source/Resources/Default-Landscape~ipad.png"; sourceTree = SOURCE_ROOT; }; @@ -222,8 +222,8 @@ B737896E180762440076A88C /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Source/Resources/Default@2x.png"; sourceTree = SOURCE_ROOT; }; B73789851807631A0076A88C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/Platforms/iOS/main.m; sourceTree = SOURCE_ROOT; }; B73789861807631A0076A88C /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = Source/Prefix.pch; sourceTree = SOURCE_ROOT; }; - B7378992180767190076A88C /* MainScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainScene.h; path = Source/MainScene.h; sourceTree = ""; }; - B7378993180767190076A88C /* MainScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainScene.m; path = Source/MainScene.m; sourceTree = ""; }; + B7378992180767190076A88C /* MainScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainScene.h; path = MainScene.h; sourceTree = ""; }; + B7378993180767190076A88C /* MainScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainScene.m; path = MainScene.m; sourceTree = ""; }; B77F1B2E17B978D7009739AE /* PROJECTNAME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PROJECTNAME.app; sourceTree = BUILT_PRODUCTS_DIR; }; B77F1B3117B978D7009739AE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; B77F1B3317B978D7009739AE /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; @@ -241,7 +241,7 @@ BC5399D51A44DCC90063F482 /* GLActivityKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLActivityKit.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/GLActivityKit.framework"; sourceTree = ""; }; BC5399D61A44DCC90063F482 /* JavaFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaFoundation.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/JavaFoundation.framework"; sourceTree = ""; }; BC5399D71A44DCC90063F482 /* JavaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaKit.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/JavaKit.framework"; sourceTree = ""; }; - D352B48019EC608A00829775 /* MetalShaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = MetalShaders; path = Source/MetalShaders; sourceTree = ""; }; + D352B48019EC608A00829775 /* MetalShaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = MetalShaders; path = MetalShaders; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -480,7 +480,7 @@ 7A046D7519E84C36004C4763 /* MainScene.swift */, D352B48019EC608A00829775 /* MetalShaders */, ); - name = Source; + path = Source; sourceTree = ""; }; B73789911807667A0076A88C /* Icons */ = { From 57c445c7273b822e9d2b9dd686b0ba9b996fd0fc Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 13:49:48 +0100 Subject: [PATCH 03/10] fixed a typo: XCode -> Xcode --- SpriteBuilder/ccBuilder/en.lproj/MainMenu.xib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SpriteBuilder/ccBuilder/en.lproj/MainMenu.xib b/SpriteBuilder/ccBuilder/en.lproj/MainMenu.xib index 149e1606d..4d671387e 100644 --- a/SpriteBuilder/ccBuilder/en.lproj/MainMenu.xib +++ b/SpriteBuilder/ccBuilder/en.lproj/MainMenu.xib @@ -1,5 +1,5 @@ - + @@ -221,7 +221,7 @@ - + From b155769d2a891292af9d028dc791bb1e5418a1ff Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 14:10:48 +0100 Subject: [PATCH 04/10] fixed all the broken paths for groups in PROJECTNAME template --- .../PROJECTNAME.xcodeproj/project.pbxproj | 92 ++++++++++--------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj index 032b7183c..3b09e1e1b 100755 --- a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj +++ b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj @@ -98,6 +98,9 @@ BC5399DB1A44DCC90063F482 /* JavaFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC5399D61A44DCC90063F482 /* JavaFoundation.framework */; }; BC5399DC1A44DCC90063F482 /* JavaKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC5399D71A44DCC90063F482 /* JavaKit.framework */; }; BCD00A8C1A44E83400DA5AD0 /* CoreJava.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC5399D41A44DCC90063F482 /* CoreJava.framework */; }; + DC5177EA1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */; }; + DC5177EB1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */; }; + DC5177EC1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -180,50 +183,50 @@ 5B121011197483EE004C1E1D /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; 5B121013197483EE004C1E1D /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; 5B121015197483EE004C1E1D /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; - 5B12101B19748413004C1E1D /* PROJECTIDENTIFIERActivity.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; name = PROJECTIDENTIFIERActivity.java; path = Platforms/Android/java/org/cocos2d/PROJECTIDENTIFIER/PROJECTIDENTIFIERActivity.java; sourceTree = ""; }; + 5B12101B19748413004C1E1D /* PROJECTIDENTIFIERActivity.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; name = PROJECTIDENTIFIERActivity.java; path = java/org/cocos2d/PROJECTIDENTIFIER/PROJECTIDENTIFIERActivity.java; sourceTree = ""; }; 5B121021197484A3004C1E1D /* PROJECTNAME Java.jar */ = {isa = PBXFileReference; explicitFileType = compiled.java.jar; includeInIndex = 0; path = "PROJECTNAME Java.jar"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5B12102E197484FA004C1E1D /* PROJECTIDENTIFIERActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PROJECTIDENTIFIERActivity.h; path = Platforms/Android/PROJECTIDENTIFIERActivity.h; sourceTree = ""; }; - 5B12102F197484FA004C1E1D /* PROJECTIDENTIFIERActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PROJECTIDENTIFIERActivity.m; path = Platforms/Android/PROJECTIDENTIFIERActivity.m; sourceTree = ""; }; - 5B121033197485FE004C1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Platforms/Android/Info.plist; sourceTree = ""; }; - 5B121034197485FE004C1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Platforms/iOS/Info.plist; sourceTree = ""; }; - 5BA4619E1974C88900785744 /* AndroidManifest.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = AndroidManifest.xml; path = Platforms/Android/AndroidManifest.xml; sourceTree = ""; }; - 7A046D7519E84C36004C4763 /* MainScene.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MainScene.swift; path = MainScene.swift; sourceTree = ""; }; + 5B12102E197484FA004C1E1D /* PROJECTIDENTIFIERActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PROJECTIDENTIFIERActivity.h; sourceTree = ""; }; + 5B12102F197484FA004C1E1D /* PROJECTIDENTIFIERActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PROJECTIDENTIFIERActivity.m; sourceTree = ""; }; + 5B121033197485FE004C1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5B121034197485FE004C1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5BA4619E1974C88900785744 /* AndroidManifest.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = AndroidManifest.xml; sourceTree = ""; }; + 7A046D7519E84C36004C4763 /* MainScene.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainScene.swift; sourceTree = ""; }; 7A4035FF19DDEE84007B6E8F /* PROJECTNAME Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PROJECTNAME Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 7A40360219DDEE84007B6E8F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Platforms/Mac/Info.plist; sourceTree = ""; }; - 7A40360319DDEE84007B6E8F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/Platforms/Mac/main.m; sourceTree = ""; }; - 7A40360519DDEE84007B6E8F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Platforms/Mac/AppDelegate.h; sourceTree = ""; }; - 7A40360619DDEE84007B6E8F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Platforms/Mac/AppDelegate.m; sourceTree = ""; }; + 7A40360219DDEE84007B6E8F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7A40360319DDEE84007B6E8F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 7A40360519DDEE84007B6E8F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 7A40360619DDEE84007B6E8F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 7A4036F419DE3FA8007B6E8F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; 7A59493A19E37F9300F65F90 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; 7A59493C19E37FB200F65F90 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; - 7A59498A19E38E4A00F65F90 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MainMenu.xib; path = Platforms/Mac/MainMenu.xib; sourceTree = ""; }; + 7A59498A19E38E4A00F65F90 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; 7AFCD5DB19E9BD9F00BCCCDA /* cocos2d.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = "Source/libs/cocos2d-iphone/cocos2d/cocos2d.h"; sourceTree = ""; }; 7AFCD5DD19E9BDC200BCCCDA /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Source/Bridging-Header.h"; sourceTree = ""; }; 7BF6AF9F1A425F9800FFF9BA /* JavaFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaFoundation.framework; path = "../../../../../../../Library/SBAndroid/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/JavaFoundation.framework"; sourceTree = ""; }; 8392007918EE8E3300B6C429 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; 927F61BF196C771E000F43EF /* PROJECTNAME Android.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PROJECTNAME Android.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - B71F5907188484E7003F4D28 /* iPad-old.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "iPad-old.png"; path = "Icons/iPad-old.png"; sourceTree = ""; }; - B71F5908188484E7003F4D28 /* iPad-old@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "iPad-old@2x.png"; path = "Icons/iPad-old@2x.png"; sourceTree = ""; }; - B71F5909188484E7003F4D28 /* iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iPad.png; path = Icons/iPad.png; sourceTree = ""; }; - B71F590A188484E7003F4D28 /* iPad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "iPad@2x.png"; path = "Icons/iPad@2x.png"; sourceTree = ""; }; - B71F590B188484E7003F4D28 /* iPhone-old.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "iPhone-old.png"; path = "Icons/iPhone-old.png"; sourceTree = ""; }; - B71F590C188484E7003F4D28 /* iPhone-old@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "iPhone-old@2x.png"; path = "Icons/iPhone-old@2x.png"; sourceTree = ""; }; - B71F590D188484E7003F4D28 /* iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iPhone.png; path = Icons/iPhone.png; sourceTree = ""; }; - B71F590E188484E7003F4D28 /* iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "iPhone@2x.png"; path = "Icons/iPhone@2x.png"; sourceTree = ""; }; - B71F590F188484E7003F4D28 /* Settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Settings.png; path = Icons/Settings.png; sourceTree = ""; }; - B71F5910188484E7003F4D28 /* Settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Settings@2x.png"; path = "Icons/Settings@2x.png"; sourceTree = ""; }; - B737893A180761570076A88C /* Published-iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Published-iOS"; path = "Source/Resources/Published-iOS"; sourceTree = SOURCE_ROOT; }; - B737893D1807617C0076A88C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Platforms/iOS/AppDelegate.h; sourceTree = ""; }; - B737893E1807617C0076A88C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Platforms/iOS/AppDelegate.m; sourceTree = ""; }; + B71F5907188484E7003F4D28 /* iPad-old.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad-old.png"; sourceTree = ""; }; + B71F5908188484E7003F4D28 /* iPad-old@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad-old@2x.png"; sourceTree = ""; }; + B71F5909188484E7003F4D28 /* iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iPad.png; sourceTree = ""; }; + B71F590A188484E7003F4D28 /* iPad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPad@2x.png"; sourceTree = ""; }; + B71F590B188484E7003F4D28 /* iPhone-old.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone-old.png"; sourceTree = ""; }; + B71F590C188484E7003F4D28 /* iPhone-old@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone-old@2x.png"; sourceTree = ""; }; + B71F590D188484E7003F4D28 /* iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iPhone.png; sourceTree = ""; }; + B71F590E188484E7003F4D28 /* iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iPhone@2x.png"; sourceTree = ""; }; + B71F590F188484E7003F4D28 /* Settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Settings.png; sourceTree = ""; }; + B71F5910188484E7003F4D28 /* Settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Settings@2x.png"; sourceTree = ""; }; + B737893A180761570076A88C /* Published-iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Published-iOS"; sourceTree = ""; }; + B737893D1807617C0076A88C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + B737893E1807617C0076A88C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; B7378940180761A80076A88C /* cocos2d.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d.xcodeproj; path = "Source/libs/cocos2d-iphone/cocos2d.xcodeproj"; sourceTree = SOURCE_ROOT; }; B737896B180762440076A88C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "Source/Resources/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; B737896C180762440076A88C /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "Source/Resources/Default-Landscape~ipad.png"; sourceTree = SOURCE_ROOT; }; B737896D180762440076A88C /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Source/Resources/Default.png; sourceTree = SOURCE_ROOT; }; B737896E180762440076A88C /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Source/Resources/Default@2x.png"; sourceTree = SOURCE_ROOT; }; - B73789851807631A0076A88C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/Platforms/iOS/main.m; sourceTree = SOURCE_ROOT; }; + B73789851807631A0076A88C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; }; B73789861807631A0076A88C /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = Source/Prefix.pch; sourceTree = SOURCE_ROOT; }; - B7378992180767190076A88C /* MainScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainScene.h; path = MainScene.h; sourceTree = ""; }; - B7378993180767190076A88C /* MainScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainScene.m; path = MainScene.m; sourceTree = ""; }; + B7378992180767190076A88C /* MainScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainScene.h; sourceTree = ""; }; + B7378993180767190076A88C /* MainScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainScene.m; sourceTree = ""; }; B77F1B2E17B978D7009739AE /* PROJECTNAME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PROJECTNAME.app; sourceTree = BUILT_PRODUCTS_DIR; }; B77F1B3117B978D7009739AE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; B77F1B3317B978D7009739AE /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; @@ -241,7 +244,8 @@ BC5399D51A44DCC90063F482 /* GLActivityKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLActivityKit.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/GLActivityKit.framework"; sourceTree = ""; }; BC5399D61A44DCC90063F482 /* JavaFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaFoundation.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/JavaFoundation.framework"; sourceTree = ""; }; BC5399D71A44DCC90063F482 /* JavaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaKit.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/JavaKit.framework"; sourceTree = ""; }; - D352B48019EC608A00829775 /* MetalShaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = MetalShaders; path = MetalShaders; sourceTree = ""; }; + D352B48019EC608A00829775 /* MetalShaders */ = {isa = PBXFileReference; lastKnownFileType = folder; path = MetalShaders; sourceTree = ""; }; + DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape@2x~ipad.png"; path = "Source/Resources/Default-Landscape@2x~ipad.png"; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -360,7 +364,7 @@ 7A40362219DDF090007B6E8F /* Android */, 7A9791C019E6FAC5001FFC4D /* Mac */, ); - name = Platforms; + path = Platforms; sourceTree = ""; }; 7A40362119DDF08C007B6E8F /* iOS */ = { @@ -369,7 +373,7 @@ B737893D1807617C0076A88C /* AppDelegate.h */, B737893E1807617C0076A88C /* AppDelegate.m */, ); - name = iOS; + path = iOS; sourceTree = ""; }; 7A40362219DDF090007B6E8F /* Android */ = { @@ -379,7 +383,7 @@ 5B12102E197484FA004C1E1D /* PROJECTIDENTIFIERActivity.h */, 5B12102F197484FA004C1E1D /* PROJECTIDENTIFIERActivity.m */, ); - name = Android; + path = Android; sourceTree = ""; }; 7A40365D19DDF896007B6E8F /* Platforms */ = { @@ -388,7 +392,7 @@ 7A40366019DDF8A6007B6E8F /* iOS */, 7A40365F19DDF89C007B6E8F /* Mac */, ); - name = Platforms; + path = Platforms; sourceTree = ""; }; 7A40365F19DDF89C007B6E8F /* Mac */ = { @@ -396,7 +400,7 @@ children = ( 7A40360319DDEE84007B6E8F /* main.m */, ); - name = Mac; + path = Mac; sourceTree = ""; }; 7A40366019DDF8A6007B6E8F /* iOS */ = { @@ -404,7 +408,7 @@ children = ( B73789851807631A0076A88C /* main.m */, ); - name = iOS; + path = iOS; sourceTree = ""; }; 7A40366119DDF8C2007B6E8F /* Platforms */ = { @@ -414,7 +418,7 @@ 7A40366319DDF8D4007B6E8F /* Android */, 7A40366419DDF8DB007B6E8F /* Mac */, ); - name = Platforms; + path = Platforms; sourceTree = ""; }; 7A40366219DDF8CB007B6E8F /* iOS */ = { @@ -422,7 +426,7 @@ children = ( 5B121034197485FE004C1E1D /* Info.plist */, ); - name = iOS; + path = iOS; sourceTree = ""; }; 7A40366319DDF8D4007B6E8F /* Android */ = { @@ -431,7 +435,7 @@ 5BA4619E1974C88900785744 /* AndroidManifest.xml */, 5B121033197485FE004C1E1D /* Info.plist */, ); - name = Android; + path = Android; sourceTree = ""; }; 7A40366419DDF8DB007B6E8F /* Mac */ = { @@ -440,7 +444,7 @@ 7A40360219DDEE84007B6E8F /* Info.plist */, 7A59498A19E38E4A00F65F90 /* MainMenu.xib */, ); - name = Mac; + path = Mac; sourceTree = ""; }; 7A9790F619E62E3F001FFC4D /* Products */ = { @@ -460,7 +464,7 @@ 7A40360519DDEE84007B6E8F /* AppDelegate.h */, 7A40360619DDEE84007B6E8F /* AppDelegate.m */, ); - name = Mac; + path = Mac; sourceTree = ""; }; 9222E2B918734FF800A246C7 /* libs */ = { @@ -498,10 +502,11 @@ B71F5910188484E7003F4D28 /* Settings@2x.png */, B737896B180762440076A88C /* Default-568h@2x.png */, B737896C180762440076A88C /* Default-Landscape~ipad.png */, + DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */, B737896D180762440076A88C /* Default.png */, B737896E180762440076A88C /* Default@2x.png */, ); - name = Icons; + path = Icons; sourceTree = ""; }; B77F1B2517B978D7009739AE = { @@ -724,7 +729,7 @@ }; 7A97910219E62E40001FFC4D /* cocos2dJava.jar */ = { isa = PBXReferenceProxy; - fileType = archive.jar; + fileType = compiled.java.jar; path = cocos2dJava.jar; remoteRef = 7A97910119E62E40001FFC4D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; @@ -746,6 +751,7 @@ 7A4036F719DE401F007B6E8F /* iPad-old.png in Resources */, 7A4036F819DE401F007B6E8F /* iPad-old@2x.png in Resources */, 7A4036F919DE401F007B6E8F /* iPad.png in Resources */, + DC5177EC1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */, 7A4036FA19DE401F007B6E8F /* iPad@2x.png in Resources */, 7A4036FB19DE401F007B6E8F /* iPhone-old.png in Resources */, 7A4036FC19DE401F007B6E8F /* iPhone-old@2x.png in Resources */, @@ -769,6 +775,7 @@ 927F61AD196C771E000F43EF /* Settings.png in Resources */, 927F61AE196C771E000F43EF /* Default@2x.png in Resources */, 927F61AF196C771E000F43EF /* iPad@2x.png in Resources */, + DC5177EB1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */, 927F61B0196C771E000F43EF /* iPad.png in Resources */, 927F61B1196C771E000F43EF /* iPad-old@2x.png in Resources */, 927F61B2196C771E000F43EF /* iPhone-old@2x.png in Resources */, @@ -791,6 +798,7 @@ B71F5919188484E7003F4D28 /* Settings.png in Resources */, B7378978180762440076A88C /* Default@2x.png in Resources */, B71F5914188484E7003F4D28 /* iPad@2x.png in Resources */, + DC5177EA1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */, B71F5913188484E7003F4D28 /* iPad.png in Resources */, B71F5912188484E7003F4D28 /* iPad-old@2x.png in Resources */, B71F5916188484E7003F4D28 /* iPhone-old@2x.png in Resources */, From f92e76b585ae854ca06d5cb713c02081435e8014 Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 14:18:53 +0100 Subject: [PATCH 05/10] added Swift AppDelegates --- .../PROJECTNAME.xcodeproj/project.pbxproj | 13 ++++- .../Source/Platforms/Mac/AppDelegate.swift | 50 +++++++++++++++++++ .../Source/Platforms/iOS/AppDelegate.swift | 48 ++++++++++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift create mode 100644 Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.swift diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj index 3b09e1e1b..2281f5d83 100755 --- a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj +++ b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj @@ -101,6 +101,8 @@ DC5177EA1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */; }; DC5177EB1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */; }; DC5177EC1AA73B93008E9752 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */; }; + DC5177F01AA73C06008E9752 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5177EF1AA73C06008E9752 /* AppDelegate.swift */; }; + DC5177F31AA73C12008E9752 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5177F21AA73C12008E9752 /* AppDelegate.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -223,7 +225,7 @@ B737896C180762440076A88C /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "Source/Resources/Default-Landscape~ipad.png"; sourceTree = SOURCE_ROOT; }; B737896D180762440076A88C /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Source/Resources/Default.png; sourceTree = SOURCE_ROOT; }; B737896E180762440076A88C /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Source/Resources/Default@2x.png"; sourceTree = SOURCE_ROOT; }; - B73789851807631A0076A88C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; }; + B73789851807631A0076A88C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; B73789861807631A0076A88C /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = Source/Prefix.pch; sourceTree = SOURCE_ROOT; }; B7378992180767190076A88C /* MainScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainScene.h; sourceTree = ""; }; B7378993180767190076A88C /* MainScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainScene.m; sourceTree = ""; }; @@ -246,6 +248,8 @@ BC5399D71A44DCC90063F482 /* JavaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaKit.framework; path = "../../../../Library/Application Support/Developer/Shared/Xcode/Platforms/Android.platform/Developer/SDKs/SBAndroid.sdk/System/Library/Frameworks/JavaKit.framework"; sourceTree = ""; }; D352B48019EC608A00829775 /* MetalShaders */ = {isa = PBXFileReference; lastKnownFileType = folder; path = MetalShaders; sourceTree = ""; }; DC5177E91AA73B93008E9752 /* Default-Landscape@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape@2x~ipad.png"; path = "Source/Resources/Default-Landscape@2x~ipad.png"; sourceTree = SOURCE_ROOT; }; + DC5177EF1AA73C06008E9752 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + DC5177F21AA73C12008E9752 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -372,6 +376,7 @@ children = ( B737893D1807617C0076A88C /* AppDelegate.h */, B737893E1807617C0076A88C /* AppDelegate.m */, + DC5177EF1AA73C06008E9752 /* AppDelegate.swift */, ); path = iOS; sourceTree = ""; @@ -392,7 +397,8 @@ 7A40366019DDF8A6007B6E8F /* iOS */, 7A40365F19DDF89C007B6E8F /* Mac */, ); - path = Platforms; + name = Platforms; + path = Source/Platforms; sourceTree = ""; }; 7A40365F19DDF89C007B6E8F /* Mac */ = { @@ -463,6 +469,7 @@ children = ( 7A40360519DDEE84007B6E8F /* AppDelegate.h */, 7A40360619DDEE84007B6E8F /* AppDelegate.m */, + DC5177F21AA73C12008E9752 /* AppDelegate.swift */, ); path = Mac; sourceTree = ""; @@ -877,6 +884,7 @@ 7A4036E819DE3F33007B6E8F /* MainScene.m in Sources */, 7A10CE5619F32FB0001673C3 /* MainScene.swift in Sources */, 7A40360419DDEE84007B6E8F /* main.m in Sources */, + DC5177F31AA73C12008E9752 /* AppDelegate.swift in Sources */, 7A59498E19E3941300F65F90 /* AppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -897,6 +905,7 @@ B73789871807631A0076A88C /* main.m in Sources */, 7A046D8C19E8A20E004C4763 /* MainScene.m in Sources */, 7A046D7919E84ED5004C4763 /* MainScene.swift in Sources */, + DC5177F01AA73C06008E9752 /* AppDelegate.swift in Sources */, 5B121038197487F2004C1E1D /* AppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift new file mode 100644 index 000000000..c1936b4c8 --- /dev/null +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift @@ -0,0 +1,50 @@ +import Foundation +import Cocoa + +@NSApplicationMain +class AppDelegate : NSObject, NSApplicationDelegate +{ + @IBOutlet weak var window : NSWindow! + @IBOutlet weak var glView : CCGLView! + + func applicationDidFinishLaunching(aNotification: NSNotification) { + var director : CCDirectorMac = CCDirector.sharedDirector() as CCDirectorMac + + // enable FPS and SPF + //director.displayStats = true + + // Set a default window size + var defaultSize = CGSize(width: 480.0, height: 320.0) + window.setFrame(CGRect(x: 0.0, y: 0.0, width: defaultSize.width, height: defaultSize.height), display: true, animate: false) + glView.frame = window.frame + + // connect the OpenGL view with the director + director.view = glView + + // 'Effects' don't work correctly when autoscale is turned on. + // Use kCCDirectorResize_NoScale if you don't want auto-scaling. + //director.resizeMode = kCCDirectorResize_NoScale + + // Enable "moving" mouse event. Default no. + window.acceptsMouseMovedEvents = false + + // Center main window + window.center() + + // Configure CCFileUtils to work with SpriteBuilder + CCBReader.configureCCFileUtils() + + CCPackageManager.sharedManager().loadPackages() + + director.runWithScene(CCBReader.loadAsScene("MainScene")) + } + + func applicationShouldTerminateAfterLastWindowClosed(theApplication: NSApplication) -> Bool { + return true; + } + + func applicationWillTerminate(aNotification: NSNotification) { + CCPackageManager.sharedManager().savePackages() + CCDirector.sharedDirector().stopAnimation() // required to fix stream of GL errors on shutdown + } +} \ No newline at end of file diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.swift b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.swift new file mode 100644 index 000000000..c2ce79373 --- /dev/null +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.swift @@ -0,0 +1,48 @@ +import Foundation + +@UIApplicationMain +class AppDelegate : CCAppDelegate +{ + override func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { + // Configure Cocos2d with the options set in SpriteBuilder + + // TODO: add support for Published-Android support + var configPath = NSBundle.mainBundle().resourcePath! + configPath = configPath.stringByAppendingPathComponent("Published-iOS") + configPath = configPath.stringByAppendingPathComponent("configCocos2d.plist") + + let cocos2dSetup = NSMutableDictionary(contentsOfFile: configPath) + + // Note: this needs to happen before configureCCFileUtils is called, because we need apportable to correctly setup the screen scale factor. + #if APPORTABLE + if cocos2dSetup[CCSetupScreenMode] == CCScreenModeFixed { + UIScreen.mainScreen().currentMode() = UIScreenMode.emulatedMode(UIScreenAspectFitEmulationMode) + } + else { + UIScreen.mainScreen().currentMode() = UIScreenMode.emulatedMode(UIScreenScaledAspectFitEmulationMode) + } + #endif + + // Configure CCFileUtils to work with SpriteBuilder + CCBReader.configureCCFileUtils() + + // Do any extra configuration of Cocos2d here (the example line changes the pixel format for faster rendering, but with less colors) + //cocos2dSetup[CCConfigPixelFormat] = kEAGLColorFormatRGB565 + + setupCocos2dWithOptions(cocos2dSetup) + + return true + } + + override func startScene() -> CCScene { + return CCBReader.loadAsScene("MainScene") + } + + // example override of UIApplicationDelegate method - be sure to call super! + override func applicationWillResignActive(application : UIApplication) { + // let CCAppDelegate handle default behavior + super.applicationWillResignActive(application) + + // add your code here... + } +} From 4a13bf61a98e473bad5f97cd3eaba2cb09bf267a Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 14:19:14 +0100 Subject: [PATCH 06/10] rename AppController to AppDelegate --- .../Source/Platforms/iOS/AppDelegate.h | 2 +- .../Source/Platforms/iOS/AppDelegate.m | 2 +- Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/main.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.h b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.h index 56ad761c8..4b5dc67e5 100755 --- a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.h +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.h @@ -26,7 +26,7 @@ #import #import "cocos2d.h" -@interface AppController : CCAppDelegate +@interface AppDelegate : CCAppDelegate { } diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.m b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.m index 8bb157156..ee99db51b 100755 --- a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.m +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/AppDelegate.m @@ -28,7 +28,7 @@ #import "AppDelegate.h" #import "CCBuilderReader.h" -@implementation AppController +@implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/main.m b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/main.m index 96472e3db..331013ee4 100755 --- a/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/main.m +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/iOS/main.m @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) { @autoreleasepool { - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); + int retVal = UIApplicationMain(argc, argv, nil, @"AppDelegate"); return retVal; } } From 1bc054b20fbf8dcb4790cc5c15c6a3178d7b501e Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 14:23:31 +0100 Subject: [PATCH 07/10] update SB project creator to support new swift appdelegates --- SpriteBuilder/ccBuilder/CCBProjectCreator.m | 31 +++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m index 4a3f1decc..207562452 100644 --- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m +++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m @@ -97,12 +97,17 @@ -(BOOL) createDefaultProjectAtPath:(NSString*)fileName engine:(CCBTargetEngine)e inFile:pbxprojFile search:@"MACOSX_DEPLOYMENT_TARGET = 10.10"]; [self removeLinesMatching:@".*MainScene[.]swift.*" inFile:pbxprojFile]; - filesToRemove = @[@"Source/MainScene.swift"]; + [self removeLinesMatching:@".*AppDelegate[.]swift.*" inFile:pbxprojFile]; + filesToRemove = @[@"Source/MainScene.swift", @"Source/Platforms/iOS/AppDelegate.swift", @"Source/Platforms/Mac/AppDelegate.swift"]; } else if (programmingLanguage == CCBProgrammingLanguageSwift) { [self removeLinesMatching:@".*MainScene[.][hm].*" inFile:pbxprojFile]; - filesToRemove = @[@"Source/MainScene.h", @"Source/MainScene.m"]; + [self removeLinesMatching:@".*AppDelegate[.][hm].*" inFile:pbxprojFile]; + [self removeLinesMatching:@".*main[.][m].*" inFile:pbxprojFile]; + filesToRemove = @[@"Source/MainScene.h", @"Source/MainScene.m", + @"Source/Platforms/iOS/AppDelegate.h", @"Source/Platforms/iOS/AppDelegate.m", @"Source/Platforms/iOS/main.m", + @"Source/Platforms/Mac/AppDelegate.h", @"Source/Platforms/Mac/AppDelegate.m", @"Source/Platforms/Mac/main.m"]; } for (NSString *file in filesToRemove) @@ -157,6 +162,12 @@ -(BOOL) createDefaultProjectAtPath:(NSString*)fileName engine:(CCBTargetEngine)e // Update Mac Xib file NSString* xibFileName = [parentPath stringByAppendingPathComponent:@"Source/Resources/Platforms/Mac/MainMenu.xib"]; + if (programmingLanguage == CCBProgrammingLanguageObjectiveC) + { + // this fixes the ObjC Mac target not being able to "find" the AppDelegate class + // CAUTION: This has to be performed *before* the substitutions below since "PROJECTNAME" is a substring of the search string + [self removeAppDelegateModuleAndTargetFromXib:xibFileName]; + } [self setName:identifier inFile:xibFileName search:substitutableProjectIdentifier]; [self setName:projName inFile:xibFileName search:substitutableProjectName]; @@ -235,4 +246,20 @@ - (void) removeLinesMatching:(NSString*)pattern inFile:(NSString*)fileName [updatedFileData writeToFile:fileName atomically:YES]; } +-(void) removeAppDelegateModuleAndTargetFromXib:(NSString*)xibFileName +{ + // this fixes the ObjC Mac target not being able to "find" the AppDelegate class because the Xib specified a custom module and target, + // which coincidentally is necessary for the Mac target in Swift to find the AppDelegate - so best solution was to setup Main.xib so + // that it works with Swift and removing the module & target for ObjC projects + NSData *fileData = [NSData dataWithContentsOfFile:xibFileName]; + NSString *fileString = [[NSString alloc] initWithData:fileData encoding:NSUTF8StringEncoding]; + + NSString* searchFor = @"customClass=\"AppDelegate\" customModule=\"PROJECTNAME\" customModuleProvider=\"target\""; + NSString* replaceWith = @"customClass=\"AppDelegate\""; + fileString = [fileString stringByReplacingOccurrencesOfString:searchFor withString:replaceWith]; + + NSData *updatedFileData = [fileString dataUsingEncoding:NSUTF8StringEncoding]; + [updatedFileData writeToFile:xibFileName atomically:YES]; +} + @end From f9c74a9a146b1d53b1809b21cdcb9e15a075cac4 Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 14:29:52 +0100 Subject: [PATCH 08/10] fix #1393 Mac window does not take title bar height into consideration --- .../Source/Platforms/Mac/AppDelegate.m | 53 ++++++++++++------- .../Source/Platforms/Mac/AppDelegate.swift | 15 ++++-- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.m b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.m index 735f041bd..9e9c638fb 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.m +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.m @@ -8,42 +8,57 @@ @interface AppDelegate () @implementation AppDelegate -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification +- (float)titleBarHeight { - CCDirectorMac *director = (CCDirectorMac*) [CCDirector sharedDirector]; + NSRect frame = NSMakeRect (0, 0, 200, 200); + NSRect contentRect; + contentRect = [NSWindow contentRectForFrameRect:frame styleMask:NSTitledWindowMask]; + return (frame.size.height - contentRect.size.height); +} +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification +{ + CCDirectorMac *director = (CCDirectorMac*)[CCDirector sharedDirector]; + // enable FPS and SPF - // [director setDisplayStats:YES]; - - // Set a default window size - CGSize defaultWindowSize = CGSizeMake(480.0f, 320.0f); - [self.window setFrame:CGRectMake(0.0f, 0.0f, defaultWindowSize.width, defaultWindowSize.height) display:true animate:false]; - [self.glView setFrame:self.window.frame]; - + // director.displayStats = YES; + + // Set a default view size + CGSize defaultSize = CGSizeMake(480, 320); + // window height must be increased by titleBarHeight to prevent the view being obstructed by the title bar + [_window setFrame:CGRectMake(0, 0, defaultSize.width, defaultSize.height + [self titleBarHeight]) display:true animate:false]; + [_glView setFrame:CGRectMake(0, 0, defaultSize.width, defaultSize.height)]; + // connect the OpenGL view with the director - [director setView:self.glView]; - + director.view = _glView; + // 'Effects' don't work correctly when autoscale is turned on. // Use kCCDirectorResize_NoScale if you don't want auto-scaling. - //[director setResizeMode:kCCDirectorResize_NoScale]; - + //director.resizeMode = kCCDirectorResize_NoScale; + // Enable "moving" mouse event. Default no. - [self.window setAcceptsMouseMovedEvents:NO]; - + _window.acceptsMouseMovedEvents = NO; + // Center main window - [self.window center]; - + [_window center]; + // Configure CCFileUtils to work with SpriteBuilder [CCBReader configureCCFileUtils]; [[CCPackageManager sharedManager] loadPackages]; - + [director runWithScene:[CCBReader loadAsScene:@"MainScene"]]; } +- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication +{ + return YES; +} + - (void)applicationWillTerminate:(NSNotification *)aNotification { [[CCPackageManager sharedManager] savePackages]; + [[CCDirector sharedDirector] stopAnimation]; // required to fix stream of GL errors on shutdown } -@end +@end \ No newline at end of file diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift index c1936b4c8..cdea5c929 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift @@ -7,6 +7,12 @@ class AppDelegate : NSObject, NSApplicationDelegate @IBOutlet weak var window : NSWindow! @IBOutlet weak var glView : CCGLView! + func titleBarHeight() -> Float { + let frame = NSRect(x:0, y:0, width:200, height:200) + let contentRect = NSWindow.contentRectForFrameRect(frame, styleMask: NSTitledWindowMask) + return (frame.size.height - contentRect.size.height) + } + func applicationDidFinishLaunching(aNotification: NSNotification) { var director : CCDirectorMac = CCDirector.sharedDirector() as CCDirectorMac @@ -14,10 +20,11 @@ class AppDelegate : NSObject, NSApplicationDelegate //director.displayStats = true // Set a default window size - var defaultSize = CGSize(width: 480.0, height: 320.0) - window.setFrame(CGRect(x: 0.0, y: 0.0, width: defaultSize.width, height: defaultSize.height), display: true, animate: false) - glView.frame = window.frame - + var defaultSize = CGSize(width: 480, height: 320) + // window height must be increased by titleBarHeight to prevent the view being obstructed by the title bar + window.setFrame(CGRect(x: 0, y: 0, width: defaultSize.width, height: defaultSize.height + titleBarHeight()), display: true, animate: false) + glView.setFrame(CGRect(x: 0, y: 0, width: defaultSize.width, height: defaultSize.height)) + // connect the OpenGL view with the director director.view = glView From 562aed81e02c889ace80b9edf40e98b1d65b15fa Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 4 Mar 2015 15:21:08 +0100 Subject: [PATCH 09/10] fix Mac Swift build and main xib --- .../Source/Platforms/Mac/AppDelegate.swift | 4 ++-- .../Source/Resources/Platforms/Mac/MainMenu.xib | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift index cdea5c929..b5507f1be 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift +++ b/Support/PROJECTNAME.spritebuilder/Source/Platforms/Mac/AppDelegate.swift @@ -7,7 +7,7 @@ class AppDelegate : NSObject, NSApplicationDelegate @IBOutlet weak var window : NSWindow! @IBOutlet weak var glView : CCGLView! - func titleBarHeight() -> Float { + func titleBarHeight() -> CGFloat { let frame = NSRect(x:0, y:0, width:200, height:200) let contentRect = NSWindow.contentRectForFrameRect(frame, styleMask: NSTitledWindowMask) return (frame.size.height - contentRect.size.height) @@ -23,7 +23,7 @@ class AppDelegate : NSObject, NSApplicationDelegate var defaultSize = CGSize(width: 480, height: 320) // window height must be increased by titleBarHeight to prevent the view being obstructed by the title bar window.setFrame(CGRect(x: 0, y: 0, width: defaultSize.width, height: defaultSize.height + titleBarHeight()), display: true, animate: false) - glView.setFrame(CGRect(x: 0, y: 0, width: defaultSize.width, height: defaultSize.height)) + glView.frame = CGRect(x: 0, y: 0, width: defaultSize.width, height: defaultSize.height) // connect the OpenGL view with the director director.view = glView diff --git a/Support/PROJECTNAME.spritebuilder/Source/Resources/Platforms/Mac/MainMenu.xib b/Support/PROJECTNAME.spritebuilder/Source/Resources/Platforms/Mac/MainMenu.xib index 2aca403d3..cb43175d4 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/Resources/Platforms/Mac/MainMenu.xib +++ b/Support/PROJECTNAME.spritebuilder/Source/Resources/Platforms/Mac/MainMenu.xib @@ -11,7 +11,7 @@ - + From d5e3d6bf1180220754dd343364f2ff0330e3abf3 Mon Sep 17 00:00:00 2001 From: Steffen Itterheim Date: Wed, 11 Mar 2015 13:56:54 +0100 Subject: [PATCH 10/10] removed "Apportable" as template project's Organization because every new file users create have "Copyright (c) Apportable" in their copyright header, see; http://forum.cocos2d-swift.org/t/copyright-stuck-on-apportable/16890 --- .../PROJECTNAME.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj index 2281f5d83..1dd093552 100755 --- a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj +++ b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj @@ -678,7 +678,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0610; - ORGANIZATIONNAME = Apportable; + ORGANIZATIONNAME = ""; TargetAttributes = { 7A4035FE19DDEE84007B6E8F = { CreatedOnToolsVersion = 6.0.1;