From d92e68ad58563f04de517c4ba761056536643bad Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sat, 2 Apr 2016 17:44:11 +0200 Subject: [PATCH] Updated to cocos2d-objc 3.5. --- .../3/Resources-ios/AppDelegate.m | 8 +- .../project.pbxproj | 99 +++++++++++++++---- .../3/src/spine/SkeletonRenderer.m | 5 +- 3 files changed, 87 insertions(+), 25 deletions(-) diff --git a/spine-cocos2d-iphone/3/Resources-ios/AppDelegate.m b/spine-cocos2d-iphone/3/Resources-ios/AppDelegate.m index adc99b4d4..62bbf83e0 100644 --- a/spine-cocos2d-iphone/3/Resources-ios/AppDelegate.m +++ b/spine-cocos2d-iphone/3/Resources-ios/AppDelegate.m @@ -24,11 +24,13 @@ CCSetupShowDebugStats: @YES, }]; + [[CCDirector sharedDirector] runWithScene:[SpineboyExample scene]]; + return YES; } -- (CCScene*) startScene { - return [SpineboyExample scene]; -} +//- (CCScene*) startScene { +// return [SpineboyExample scene]; +//} @end diff --git a/spine-cocos2d-iphone/3/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj b/spine-cocos2d-iphone/3/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj index ca745a17a..d16b1511e 100644 --- a/spine-cocos2d-iphone/3/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj +++ b/spine-cocos2d-iphone/3/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 43C32888170B0DBE004A9460 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 43C3287C170B0DBE004A9460 /* iTunesArtwork */; }; 43C32A06170B0F93004A9460 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 43C32A05170B0F93004A9460 /* main.m */; }; 43C32A09170B10FF004A9460 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 43C32A08170B10FF004A9460 /* AppDelegate.m */; }; + 43CA50391CAF6BCE005ABFFC /* libcocos2d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 431D321E1C73FF8A002061D6 /* libcocos2d.a */; }; 43F7010F1927FBC700CA4038 /* goblins-mesh.atlas in Resources */ = {isa = PBXBuildFile; fileRef = 43F7010C1927FBC700CA4038 /* goblins-mesh.atlas */; }; 43F701101927FBC700CA4038 /* goblins-mesh.json in Resources */ = {isa = PBXBuildFile; fileRef = 43F7010D1927FBC700CA4038 /* goblins-mesh.json */; }; 43F701111927FBC700CA4038 /* goblins-mesh.png in Resources */ = {isa = PBXBuildFile; fileRef = 43F7010E1927FBC700CA4038 /* goblins-mesh.png */; }; @@ -70,16 +71,43 @@ 9A5D24A5170A94DA0030D4DD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5D24A4170A94DA0030D4DD /* Foundation.framework */; }; 9A5D24A7170A94DA0030D4DD /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5D24A6170A94DA0030D4DD /* CoreGraphics.framework */; }; 9A5D24A9170A94DA0030D4DD /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5D24A8170A94DA0030D4DD /* GameKit.framework */; }; - A28E1F0C192926C500D16B23 /* libcocos2d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A28E1F0B192926A300D16B23 /* libcocos2d.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - A28E1F0A192926A300D16B23 /* PBXContainerItemProxy */ = { + 431D321D1C73FF8A002061D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = A28E1F04192926A200D16B23 /* cocos2d-ios.xcodeproj */; + containerPortal = A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */; proxyType = 2; remoteGlobalIDString = 5018F24D0DFDEAC400C013A5; - remoteInfo = cocos2d; + remoteInfo = "cocos2d-ios"; + }; + 431D32211C73FF8A002061D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 7A4037A819E37038007B6E8F; + remoteInfo = "cocos2d-mac"; + }; + 431D32231C73FF8A002061D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B7E7DE341A76DB7D004234B7; + remoteInfo = cocos2dMacFramework; + }; + 43CA50371CAF6BCE005ABFFC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 08F4AB671C6E98A1004DAAF7; + remoteInfo = "cocos2d-tvos"; + }; + 43CA503A1CAF6E78005ABFFC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 5018F24C0DFDEAC400C013A5; + remoteInfo = "cocos2d-ios"; }; /* End PBXContainerItemProxy section */ @@ -185,7 +213,7 @@ 9A5D24A4170A94DA0030D4DD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 9A5D24A6170A94DA0030D4DD /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 9A5D24A8170A94DA0030D4DD /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; }; - A28E1F04192926A200D16B23 /* cocos2d-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "cocos2d-ios.xcodeproj"; path = "cocos2d/cocos2d-ios.xcodeproj"; sourceTree = SOURCE_ROOT; }; + A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d.xcodeproj; path = cocos2d/cocos2d.xcodeproj; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -193,8 +221,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 43CA50391CAF6BCE005ABFFC /* libcocos2d.a in Frameworks */, 83F1A0EF1986955A001F6B44 /* GLKit.framework in Frameworks */, - A28E1F0C192926C500D16B23 /* libcocos2d.a in Frameworks */, 652107961895250000B1FF07 /* CoreText.framework in Frameworks */, 9A5D2499170A94DA0030D4DD /* QuartzCore.framework in Frameworks */, 9A5D249B170A94DA0030D4DD /* OpenGLES.framework in Frameworks */, @@ -211,6 +239,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 431D32161C73FF8A002061D6 /* Products */ = { + isa = PBXGroup; + children = ( + 431D321E1C73FF8A002061D6 /* libcocos2d.a */, + 431D32221C73FF8A002061D6 /* libcocos2d-mac.a */, + 431D32241C73FF8A002061D6 /* cocos2dMacFramework.framework */, + 43CA50381CAF6BCE005ABFFC /* libcocos2d-tvos.a */, + ); + name = Products; + sourceTree = ""; + }; 43C32821170B0BBC004A9460 /* Classes */ = { isa = PBXGroup; children = ( @@ -378,20 +417,12 @@ 9A5D24C3170A94DA0030D4DD /* cocos2d */ = { isa = PBXGroup; children = ( - A28E1F04192926A200D16B23 /* cocos2d-ios.xcodeproj */, + A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */, ); name = cocos2d; path = Spine; sourceTree = ""; }; - A28E1F05192926A200D16B23 /* Products */ = { - isa = PBXGroup; - children = ( - A28E1F0B192926A300D16B23 /* libcocos2d.a */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -406,6 +437,7 @@ buildRules = ( ); dependencies = ( + 43CA503B1CAF6E78005ABFFC /* PBXTargetDependency */, ); name = SpineExample; productName = "spine-cocos2d-iphone-ios"; @@ -433,8 +465,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = A28E1F05192926A200D16B23 /* Products */; - ProjectRef = A28E1F04192926A200D16B23 /* cocos2d-ios.xcodeproj */; + ProductGroup = 431D32161C73FF8A002061D6 /* Products */; + ProjectRef = A28E1F04192926A200D16B23 /* cocos2d.xcodeproj */; }, ); projectRoot = ""; @@ -445,11 +477,32 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - A28E1F0B192926A300D16B23 /* libcocos2d.a */ = { + 431D321E1C73FF8A002061D6 /* libcocos2d.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libcocos2d.a; - remoteRef = A28E1F0A192926A300D16B23 /* PBXContainerItemProxy */; + remoteRef = 431D321D1C73FF8A002061D6 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 431D32221C73FF8A002061D6 /* libcocos2d-mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d-mac.a"; + remoteRef = 431D32211C73FF8A002061D6 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 431D32241C73FF8A002061D6 /* cocos2dMacFramework.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = cocos2dMacFramework.framework; + remoteRef = 431D32231C73FF8A002061D6 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 43CA50381CAF6BCE005ABFFC /* libcocos2d-tvos.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d-tvos.a"; + remoteRef = 43CA50371CAF6BCE005ABFFC /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -526,6 +579,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 43CA503B1CAF6E78005ABFFC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2d-ios"; + targetProxy = 43CA503A1CAF6E78005ABFFC /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 9A5D2641170A94DC0030D4DD /* Debug */ = { isa = XCBuildConfiguration; diff --git a/spine-cocos2d-iphone/3/src/spine/SkeletonRenderer.m b/spine-cocos2d-iphone/3/src/spine/SkeletonRenderer.m index 164b41f4e..0f1985fea 100644 --- a/spine-cocos2d-iphone/3/src/spine/SkeletonRenderer.m +++ b/spine-cocos2d-iphone/3/src/spine/SkeletonRenderer.m @@ -32,10 +32,9 @@ #import #import #import -#import "CCNode_Private.h" #import "CCDrawNode.h" -static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0}; +static const unsigned short quadTriangles[6] = {0, 1, 2, 2, 3, 0}; @interface SkeletonRenderer (Private) - (void) initialize:(spSkeletonData*)skeletonData ownsSkeletonData:(bool)ownsSkeletonData; @@ -148,7 +147,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0}; int blendMode = -1; const float* uvs = 0; int verticesCount = 0; - const int* triangles = 0; + const unsigned short* triangles = 0; int trianglesCount = 0; float r = 0, g = 0, b = 0, a = 0; for (int i = 0, n = _skeleton->slotsCount; i < n; i++) {