From d5cb07fea03e286b60196ec6706713bbc633ce0a Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 24 Sep 2013 16:28:04 +0200 Subject: [PATCH] spine-cocos2d-iphone compiles with latest spine-c. --- .../project.pbxproj | 12 ++++++++++++ .../project.pbxproj | 12 ++++++++++++ spine-cocos2d-iphone/src/spine/CCSkeleton.m | 2 +- .../src/spine/spine-cocos2d-iphone.m | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/spine-cocos2d-iphone/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj b/spine-cocos2d-iphone/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj index 9b9cb95fa..2dc5a84bd 100644 --- a/spine-cocos2d-iphone/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj +++ b/spine-cocos2d-iphone/spine-cocos2d-iphone-ios.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 4374AF5F17F1D74000401ACE /* BoundingBoxAttachment.c in Sources */ = {isa = PBXBuildFile; fileRef = 4374AF5D17F1D74000401ACE /* BoundingBoxAttachment.c */; }; + 4374AF6017F1D74000401ACE /* SkeletonBounds.c in Sources */ = {isa = PBXBuildFile; fileRef = 4374AF5E17F1D74000401ACE /* SkeletonBounds.c */; }; 43C3282B170B0BF6004A9460 /* ExampleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 43C32827170B0BF6004A9460 /* ExampleLayer.m */; }; 43C3282F170B0C19004A9460 /* spine-cocos2d-iphone.m in Sources */ = {isa = PBXBuildFile; fileRef = 43C3282D170B0C19004A9460 /* spine-cocos2d-iphone.m */; }; 43C32855170B0C6C004A9460 /* Animation.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C32830170B0C6C004A9460 /* Animation.c */; }; @@ -173,6 +175,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 4374AF5D17F1D74000401ACE /* BoundingBoxAttachment.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = BoundingBoxAttachment.c; path = "../spine-c/src/spine/BoundingBoxAttachment.c"; sourceTree = ""; }; + 4374AF5E17F1D74000401ACE /* SkeletonBounds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkeletonBounds.c; path = "../spine-c/src/spine/SkeletonBounds.c"; sourceTree = ""; }; + 4374AF6217F1D74E00401ACE /* BoundingBoxAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BoundingBoxAttachment.h; path = "../spine-c/include/spine/BoundingBoxAttachment.h"; sourceTree = ""; }; + 4374AF6317F1D74E00401ACE /* SkeletonBounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkeletonBounds.h; path = "../spine-c/include/spine/SkeletonBounds.h"; sourceTree = ""; }; 43C32826170B0BF6004A9460 /* ExampleLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExampleLayer.h; path = example/ExampleLayer.h; sourceTree = ""; }; 43C32827170B0BF6004A9460 /* ExampleLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExampleLayer.m; path = example/ExampleLayer.m; sourceTree = ""; }; 43C3282D170B0C19004A9460 /* spine-cocos2d-iphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "spine-cocos2d-iphone.m"; path = "src/spine/spine-cocos2d-iphone.m"; sourceTree = ""; }; @@ -556,6 +562,8 @@ 43C3283F170B0C6C004A9460 /* Bone.h */, 43C32840170B0C6C004A9460 /* BoneData.c */, 43C32841170B0C6C004A9460 /* BoneData.h */, + 4374AF5D17F1D74000401ACE /* BoundingBoxAttachment.c */, + 4374AF6217F1D74E00401ACE /* BoundingBoxAttachment.h */, 43C32842170B0C6C004A9460 /* extension.c */, 43C32843170B0C6C004A9460 /* extension.h */, 43C32844170B0C6C004A9460 /* Json.c */, @@ -564,6 +572,8 @@ 43C32847170B0C6C004A9460 /* RegionAttachment.h */, 43C32848170B0C6C004A9460 /* Skeleton.c */, 43C32849170B0C6C004A9460 /* Skeleton.h */, + 4374AF5E17F1D74000401ACE /* SkeletonBounds.c */, + 4374AF6317F1D74E00401ACE /* SkeletonBounds.h */, 43C3284A170B0C6C004A9460 /* SkeletonData.c */, 43C3284B170B0C6C004A9460 /* SkeletonData.h */, 43C3284C170B0C6C004A9460 /* SkeletonJson.c */, @@ -1230,6 +1240,8 @@ 43C32A09170B10FF004A9460 /* AppDelegate.mm in Sources */, 43DB2A3D172C16BC003045C5 /* CCSkeleton.m in Sources */, 43DB2A3E172C16BC003045C5 /* CCSkeletonAnimation.m in Sources */, + 4374AF5F17F1D74000401ACE /* BoundingBoxAttachment.c in Sources */, + 4374AF6017F1D74000401ACE /* SkeletonBounds.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/spine-cocos2d-iphone/spine-cocos2d-iphone-mac.xcodeproj/project.pbxproj b/spine-cocos2d-iphone/spine-cocos2d-iphone-mac.xcodeproj/project.pbxproj index c78f3434e..8647407de 100644 --- a/spine-cocos2d-iphone/spine-cocos2d-iphone-mac.xcodeproj/project.pbxproj +++ b/spine-cocos2d-iphone/spine-cocos2d-iphone-mac.xcodeproj/project.pbxproj @@ -127,6 +127,8 @@ 4319B84416FF9D3A00C1D7A9 /* LICENSE_cocos2d.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4319B7C816FF9D3900C1D7A9 /* LICENSE_cocos2d.txt */; }; 4319B84516FF9D3A00C1D7A9 /* LICENSE_CocosDenshion.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4319B7C916FF9D3900C1D7A9 /* LICENSE_CocosDenshion.txt */; }; 4319B84616FF9D3A00C1D7A9 /* LICENSE_Kazmath.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4319B7CA16FF9D3900C1D7A9 /* LICENSE_Kazmath.txt */; }; + 4374AF6D17F1D85F00401ACE /* BoundingBoxAttachment.c in Sources */ = {isa = PBXBuildFile; fileRef = 4374AF6B17F1D85F00401ACE /* BoundingBoxAttachment.c */; }; + 4374AF6E17F1D85F00401ACE /* SkeletonBounds.c in Sources */ = {isa = PBXBuildFile; fileRef = 4374AF6C17F1D85F00401ACE /* SkeletonBounds.c */; }; 43BFBE0F170A778A00ECBACB /* spine-cocos2d-iphone.m in Sources */ = {isa = PBXBuildFile; fileRef = 43BFBE0D170A778A00ECBACB /* spine-cocos2d-iphone.m */; }; 43BFBE10170A804700ECBACB /* Animation.c in Sources */ = {isa = PBXBuildFile; fileRef = 43BFBDB3170A705100ECBACB /* Animation.c */; }; 43BFBE11170A804700ECBACB /* AnimationState.c in Sources */ = {isa = PBXBuildFile; fileRef = 43BFBDB4170A705100ECBACB /* AnimationState.c */; }; @@ -419,6 +421,10 @@ 4319B7C816FF9D3900C1D7A9 /* LICENSE_cocos2d.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE_cocos2d.txt; sourceTree = ""; }; 4319B7C916FF9D3900C1D7A9 /* LICENSE_CocosDenshion.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE_CocosDenshion.txt; sourceTree = ""; }; 4319B7CA16FF9D3900C1D7A9 /* LICENSE_Kazmath.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE_Kazmath.txt; sourceTree = ""; }; + 4374AF6817F1D84300401ACE /* BoundingBoxAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BoundingBoxAttachment.h; path = "../spine-c/include/spine/BoundingBoxAttachment.h"; sourceTree = ""; }; + 4374AF6917F1D84300401ACE /* SkeletonBounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkeletonBounds.h; path = "../spine-c/include/spine/SkeletonBounds.h"; sourceTree = ""; }; + 4374AF6B17F1D85F00401ACE /* BoundingBoxAttachment.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = BoundingBoxAttachment.c; path = "../spine-c/src/spine/BoundingBoxAttachment.c"; sourceTree = ""; }; + 4374AF6C17F1D85F00401ACE /* SkeletonBounds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkeletonBounds.c; path = "../spine-c/src/spine/SkeletonBounds.c"; sourceTree = ""; }; 43BFBDA1170A703E00ECBACB /* Animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Animation.h; path = "../spine-c/include/spine/Animation.h"; sourceTree = ""; }; 43BFBDA2170A703E00ECBACB /* AnimationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationState.h; path = "../spine-c/include/spine/AnimationState.h"; sourceTree = ""; }; 43BFBDA3170A703E00ECBACB /* AnimationStateData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationStateData.h; path = "../spine-c/include/spine/AnimationStateData.h"; sourceTree = ""; }; @@ -929,6 +935,8 @@ 43BFBDA8170A703E00ECBACB /* Bone.h */, 43BFBDBB170A705100ECBACB /* BoneData.c */, 43BFBDA9170A703E00ECBACB /* BoneData.h */, + 4374AF6B17F1D85F00401ACE /* BoundingBoxAttachment.c */, + 4374AF6817F1D84300401ACE /* BoundingBoxAttachment.h */, 43BFBDBC170A705100ECBACB /* extension.c */, 43BFBDAA170A703E00ECBACB /* extension.h */, 43BFBDBD170A705100ECBACB /* Json.c */, @@ -937,6 +945,8 @@ 43BFBDAB170A703E00ECBACB /* RegionAttachment.h */, 43BFBDC0170A705100ECBACB /* Skeleton.c */, 43BFBDAC170A703E00ECBACB /* Skeleton.h */, + 4374AF6C17F1D85F00401ACE /* SkeletonBounds.c */, + 4374AF6917F1D84300401ACE /* SkeletonBounds.h */, 43BFBDC1170A705100ECBACB /* SkeletonData.c */, 43BFBDAD170A703E00ECBACB /* SkeletonData.h */, 43BFBDC2170A705100ECBACB /* SkeletonJson.c */, @@ -1195,6 +1205,8 @@ 43C32A20170B1295004A9460 /* main.m in Sources */, 43D3163A173ACAE00028AA22 /* CCSkeleton.m in Sources */, 43D3163B173ACAE00028AA22 /* CCSkeletonAnimation.m in Sources */, + 4374AF6D17F1D85F00401ACE /* BoundingBoxAttachment.c in Sources */, + 4374AF6E17F1D85F00401ACE /* SkeletonBounds.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/spine-cocos2d-iphone/src/spine/CCSkeleton.m b/spine-cocos2d-iphone/src/spine/CCSkeleton.m index e99307bfc..9ab930c58 100644 --- a/spine-cocos2d-iphone/src/spine/CCSkeleton.m +++ b/spine-cocos2d-iphone/src/spine/CCSkeleton.m @@ -227,7 +227,7 @@ Slot* slot = _skeleton->slots[i]; if (!slot->attachment || slot->attachment->type != ATTACHMENT_REGION) continue; RegionAttachment* attachment = (RegionAttachment*)slot->attachment; - RegionAttachment_computeVertices(attachment, slot->skeleton->x, slot->skeleton->y, slot->bone, vertices); + RegionAttachment_computeWorldVertices(attachment, slot->skeleton->x, slot->skeleton->y, slot->bone, vertices); minX = fmin(minX, vertices[VERTEX_X1] * scaleX); minY = fmin(minY, vertices[VERTEX_Y1] * scaleY); maxX = fmax(maxX, vertices[VERTEX_X1] * scaleX); diff --git a/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m b/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m index 6c0ef17f9..755a498bd 100644 --- a/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m +++ b/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m @@ -55,7 +55,7 @@ char* _Util_readFile (const char* path, int* length) { void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, ccV3F_C4B_T2F_Quad* quad, bool premultipliedAlpha) { float vertices[8]; - RegionAttachment_computeVertices(self, slot->skeleton->x, slot->skeleton->y, slot->bone, vertices); + RegionAttachment_computeWorldVertices(self, slot->skeleton->x, slot->skeleton->y, slot->bone, vertices); GLubyte r = slot->skeleton->r * slot->r * 255; GLubyte g = slot->skeleton->g * slot->g * 255;