UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cocos2d-objc] Fix example project for latest Xcode.

Browse Source
This commit is contained in:
Mario Zechner 2022-03-25 14:34:32 +01:00
parent 58c950c6be
commit 8761f44aa7
16 changed files with 507 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -157,3 +157,4 @@ spine-monogame/spine-monogame-example/bin
spine-monogame/spine-monogame-example/obj
spine-libgdx/spine-libgdx/out
spine-libgdx/spine-skeletonviewer/out
spine-cocos2d-objc/cocos2d/

23
examples/export/runtimes.sh
View File

@ -35,6 +35,29 @@ cp -f ../mix-and-match/export/*.json "$ROOT/spine-libgdx/spine-libgdx-tests/asse
cp -f ../mix-and-match/export/*.skel "$ROOT/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/"
cp -f ../mix-and-match/export/*-pma.* "$ROOT/spine-libgdx/spine-libgdx-tests/assets/mix-and-match/"
echo "spine-cocos2d-objc"
rm "$ROOT/spine-cocos2d-objc/Resources/"*
cp -f ../coin/export/coin-pro.json "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../coin/export/coin.atlas "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../coin/export/coin.png "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../goblins/export/goblins-pro.json "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../goblins/export/goblins.atlas "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../goblins/export/goblins.png "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../raptor/export/raptor-pro.json "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../raptor/export/raptor.atlas "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../raptor/export/raptor.png "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../spineboy/export/spineboy-pro.json "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../spineboy/export/spineboy.atlas "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../spineboy/export/spineboy.png "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../tank/export/tank-pro.json "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../tank/export/tank.atlas "$ROOT/spine-cocos2d-objc/Resources/"
cp -f ../tank/export/tank.png "$ROOT/spine-cocos2d-objc/Resources/"
echo "spine-cocos2dx"
rm -rf "$ROOT/spine-cocos2dx/example/Resources/common/"*

4
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -953,8 +953,8 @@ spSkeletonData *spSkeletonJson_readSkeletonDataFile(spSkeletonJson *self, const
static int string_starts_with(const char *str, const char *needle) {
int lenStr, lenNeedle, i;
if (!str) return 0;
lenStr = strlen(str);
lenNeedle = strlen(needle);
lenStr = (int)strlen(str);
lenNeedle = (int)strlen(needle);
if (lenStr < lenNeedle) return 0;
for (i = 0; i < lenNeedle; i++) {
if (str[i] != needle[i]) return 0;

1
spine-cocos2d-objc/README.md
View File

@ -45,6 +45,7 @@ The Spine cocos2d-objc example works on iOS simulators and devices.
4. Open a terminal, and `cd` into the `spine-runtimes/spine-cocos2d-objc` folder
5. Type `mkdir build && cd build && cmake ../..`, this will download the cocos2d-objc dependency
6. Open the Xcode project in `spine-runtimes/spine-cocos2d-objc/spine-cocos2d-objc.xcodeproj/`
7. In the file `spine-runtimes/spine-cocos2d-objc/cocos2d/cocos2d/CCRendererBasicTypes.m`, change line 56 from `-(id)objectForKey:(id<NSCopying>)options` to `-(id)objectForKey:(id)options`. This will allow building cocos2d-objc with the latest Xcode version.
7. In Xcode, click the `Run` button or type `CMD+R` to run the example on the simulator
## Links

4
spine-cocos2d-objc/Resources/coin-pro.json
View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "svidebPqqeg",
"spine": "4.0.31",
"hash": "oo0dBSCqNHM",
"spine": "4.1.23-beta",
"x": -152.5,
"y": -151,
"width": 305,

52
spine-cocos2d-objc/Resources/goblins-pro.json
View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "PtTAK+zF95I",
"spine": "4.0.31",
"hash": "CdaHvXeCMjE",
"spine": "4.1.23-beta",
"x": -134.12,
"y": -3.28,
"width": 266.94,
@ -571,7 +571,7 @@
"eyes": {
"attachment": [
{ "time": 0.7, "name": "eyes-closed" },
{ "time": 0.8, "name": null }
{ "time": 0.8 }
]
}
},
@ -899,10 +899,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"right-hand-item": {
"dagger": [
"dagger": {
"deform": [
{
"offset": 26,
"vertices": [ 2.34755, 0.1447 ],
@ -921,10 +922,12 @@
}
]
}
}
},
"goblin": {
"head": {
"head": [
"head": {
"deform": [
{
"curve": [ 0.127, 0, 0.15, 1 ]
},
@ -950,9 +953,11 @@
},
{ "time": 1 }
]
}
},
"left-foot": {
"left-foot": [
"left-foot": {
"deform": [
{
"offset": 8,
"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
@ -986,9 +991,11 @@
"vertices": [ 3.69298, 2.37573, -7.16969, 18.79733, -12.78162, 14.7778, -12.75776, 6.50514, -3.13476, 1.98906, -0.44402, 0.36629, 0, 0, -3.80085, 2.98474 ]
}
]
}
},
"pelvis": {
"pelvis": [
"pelvis": {
"deform": [
{},
{
"time": 0.1333,
@ -1012,9 +1019,11 @@
},
{ "time": 1 }
]
}
},
"right-foot": {
"right-foot": [
"right-foot": {
"deform": [
{},
{
"time": 0.1333,
@ -1054,9 +1063,11 @@
},
{ "time": 0.8667 }
]
}
},
"right-hand": {
"right-hand": [
"right-hand": {
"deform": [
{
"offset": 4,
"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
@ -1068,9 +1079,11 @@
"vertices": [ -1.48417, 0.34736, 0, 0, 1.31152, 0.08085, 1.60296, 0.09882, 0.13673, 0.15471, 0, 0, 0, 0, -0.72862, -0.0449 ]
}
]
}
},
"right-lower-leg": {
"right-lower-leg": [
"right-lower-leg": {
"deform": [
{},
{
"time": 0.6,
@ -1079,9 +1092,11 @@
},
{ "time": 1 }
]
}
},
"right-upper-leg": {
"right-upper-leg": [
"right-upper-leg": {
"deform": [
{
"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
},
@ -1096,9 +1111,11 @@
"vertices": [ -6.03857, -1.46325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.34685, -1.93102, -1.86047, -5.05266, -2.5014, -3.09985 ]
}
]
}
},
"torso": {
"torso": [
"torso": {
"deform": [
{
"offset": 2,
"vertices": [ 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, 0.24821, 2.86673, -1.24131, 2.62652, -2.47492, 0.71183, -0.26363, -0.5308, 0.24821, 2.86673, 0.24821, 2.86673, 0, 0, 0, 0, 0, 0, 0, 0, 1.34461, 0.25215, 0.24821, 2.86673, 0.82507, 1.61798, 0.24821, 2.86673, 0, 0, -1.86431, -0.4326, 0.24821, 2.86673 ]
@ -1134,9 +1151,11 @@
"vertices": [ 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, 0.32802, 3.78826, -1.1615, 3.54805, -2.39511, 1.63336, -0.18382, 0.39073, 0.32802, 3.78826, 0.32802, 3.78826, 0, 0, 0, 0, 0, 0, 0, 0, 1.42442, 1.17368, 0.32802, 3.78826, 0.90488, 2.53951, 0.32802, 3.78826, 0, 0, -1.7845, 0.48894, 0.32802, 3.78826 ]
}
]
}
},
"undie-straps": {
"undie-straps": [
"undie-straps": {
"deform": [
{
"offset": 2,
"vertices": [ -1.77697, 0.5476, -0.96145, -1.03793, -0.39148, -0.24072, -1.77697, 0.5476 ]
@ -1167,9 +1186,11 @@
"vertices": [ -1.77697, 0.5476, -0.80128, 0.53413, -0.80128, 0.53413, -1.77697, 0.5476 ]
}
]
}
},
"undies": {
"undies": [
"undies": {
"deform": [
{
"vertices": [ 0.43099, 0.722, 10.60295, -0.117, 2.29599, 0, 2.29599, 0, 2.29599, 0, 0.58799, 0.244, -2.40018, -0.65335, -2.2782, -0.77534, 2.29599, 0, 0.58799, -0.488, 4.98698, -0.117, 6.50797, -0.23399 ]
},
@ -1206,5 +1227,6 @@
}
}
}
}
}
}

45
spine-cocos2d-objc/Resources/raptor-pro.json
View File

File diff suppressed because one or more lines are too long

BIN
spine-cocos2d-objc/Resources/raptor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 KiB

After

Width:  |  Height:  |  Size: 411 KiB

66
spine-cocos2d-objc/Resources/spineboy-pro.json
View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "IQgkYFQG8ng",
"spine": "4.0.31",
"hash": "itfFESDjM1c",
"spine": "4.1.23-beta",
"x": -188.63,
"y": -7.94,
"width": 418.45,
@ -2427,19 +2427,19 @@
"side-glow1": {
"attachment": [
{ "name": "hoverglow-small" },
{ "time": 0.9667, "name": null }
{ "time": 0.9667 }
]
},
"side-glow2": {
"attachment": [
{ "time": 0.0667, "name": "hoverglow-small" },
{ "time": 1, "name": null }
{ "time": 1 }
]
},
"side-glow3": {
"attachment": [
{ "name": "hoverglow-small" },
{ "time": 0.9667, "name": null }
{ "time": 0.9667 }
]
}
},
@ -3479,18 +3479,21 @@
{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
]
},
"deform": {
"attachments": {
"default": {
"front-foot": {
"front-foot": [
"front-foot": {
"deform": [
{
"offset": 26,
"vertices": [ -0.02832, -5.37024, -0.02832, -5.37024, 3.8188, -3.7757, -0.02832, -5.37024, -3.82159, 3.77847 ]
}
]
}
},
"front-shin": {
"front-shin": [
"front-shin": {
"deform": [
{
"offset": 14,
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
@ -3511,9 +3514,11 @@
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
}
]
}
},
"hoverboard-board": {
"hoverboard-board": [
"hoverboard-board": {
"deform": [
{
"curve": [ 0.067, 0, 0.2, 1 ]
},
@ -3525,9 +3530,11 @@
},
{ "time": 1 }
]
}
},
"rear-foot": {
"rear-foot": [
"rear-foot": {
"deform": [
{
"offset": 28,
"vertices": [ -1.93078, 1.34782, -0.31417, 2.33363, 3.05122, 0.33946, 2.31472, -2.01678, 2.17583, -2.05795, -0.04277, -2.99459, 1.15429, 0.26328, 0.97501, -0.67169 ]
@ -3536,6 +3543,7 @@
}
}
}
}
},
"idle": {
"slots": {
@ -5203,7 +5211,7 @@
"portal-bg": {
"attachment": [
{ "name": "portal-bg" },
{ "time": 3, "name": null }
{ "time": 3 }
]
},
"portal-flare1": {
@ -5214,7 +5222,7 @@
{ "time": 1.2, "name": "portal-flare1" },
{ "time": 1.2333, "name": "portal-flare2" },
{ "time": 1.2667, "name": "portal-flare1" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare2": {
@ -5224,14 +5232,14 @@
{ "time": 1.1667, "name": "portal-flare1" },
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare3" },
{ "time": 1.2667, "name": null }
{ "time": 1.2667 }
]
},
"portal-flare3": {
"attachment": [
{ "time": 1.2, "name": "portal-flare3" },
{ "time": 1.2333, "name": "portal-flare2" },
{ "time": 1.2667, "name": null }
{ "time": 1.2667 }
]
},
"portal-flare4": {
@ -5239,33 +5247,33 @@
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare1" },
{ "time": 1.2667, "name": "portal-flare2" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare5": {
"attachment": [
{ "time": 1.2333, "name": "portal-flare3" },
{ "time": 1.2667, "name": "portal-flare1" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare6": {
"attachment": [
{ "time": 1.2667, "name": "portal-flare3" },
{ "time": 1.3333, "name": null }
{ "time": 1.3333 }
]
},
"portal-flare7": {
"attachment": [
{ "time": 1.1333, "name": "portal-flare2" },
{ "time": 1.1667, "name": null }
{ "time": 1.1667 }
]
},
"portal-flare8": {
"attachment": [
{ "time": 1.2, "name": "portal-flare3" },
{ "time": 1.2333, "name": "portal-flare2" },
{ "time": 1.2667, "name": null }
{ "time": 1.2667 }
]
},
"portal-flare9": {
@ -5273,7 +5281,7 @@
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare3" },
{ "time": 1.2667, "name": "portal-flare1" },
{ "time": 1.3, "name": null }
{ "time": 1.3 }
]
},
"portal-flare10": {
@ -5281,25 +5289,25 @@
{ "time": 1.2, "name": "portal-flare2" },
{ "time": 1.2333, "name": "portal-flare1" },
{ "time": 1.2667, "name": "portal-flare3" },
{ "time": 1.3, "name": null }
{ "time": 1.3 }
]
},
"portal-shade": {
"attachment": [
{ "name": "portal-shade" },
{ "time": 3, "name": null }
{ "time": 3 }
]
},
"portal-streaks1": {
"attachment": [
{ "name": "portal-streaks1" },
{ "time": 3, "name": null }
{ "time": 3 }
]
},
"portal-streaks2": {
"attachment": [
{ "name": "portal-streaks2" },
{ "time": 3, "name": null }
{ "time": 3 }
]
}
},
@ -7696,7 +7704,7 @@
{ "time": 0.1, "name": "muzzle03" },
{ "time": 0.1333, "name": "muzzle04" },
{ "time": 0.1667, "name": "muzzle05" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
},
"muzzle-glow": {
@ -7725,7 +7733,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2333, "name": null }
{ "time": 0.2333 }
]
},
"muzzle-ring2": {
@ -7739,7 +7747,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
},
"muzzle-ring3": {
@ -7753,7 +7761,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
},
"muzzle-ring4": {
@ -7767,7 +7775,7 @@
],
"attachment": [
{ "time": 0.0333, "name": "muzzle-ring" },
{ "time": 0.2, "name": null }
{ "time": 0.2 }
]
}
},

BIN
spine-cocos2d-objc/Resources/spineboy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 238 KiB

20
spine-cocos2d-objc/Resources/tank-pro.json
View File

@ -1,7 +1,7 @@
{
"skeleton": {
"hash": "3P3VgYJ8Bxk",
"spine": "4.0.31",
"hash": "ulJOWXMG9PE",
"spine": "4.1.23-beta",
"x": -5852.65,
"y": -348.5,
"width": 7202.61,
@ -3420,7 +3420,7 @@
"slots": {
"rock": {
"attachment": [
{ "name": null }
{}
]
},
"smoke-glow": {
@ -3432,7 +3432,7 @@
],
"attachment": [
{ "time": 0.0667, "name": "smoke-glow" },
{ "time": 0.3, "name": null }
{ "time": 0.3 }
]
},
"smoke-puff1-bg": {
@ -4049,7 +4049,7 @@
],
"attachment": [
{ "time": 0.0667, "name": "smoke-glow" },
{ "time": 0.2667, "name": null }
{ "time": 0.2667 }
]
}
},
@ -4870,10 +4870,11 @@
]
}
},
"deform": {
"attachments": {
"default": {
"clipping": {
"clipping": [
"clipping": {
"deform": [
{
"time": 0.0667,
"offset": 54,
@ -4905,9 +4906,11 @@
"vertices": [ 4.59198, -4.59192 ]
}
]
}
},
"smoke-glow": {
"smoke-glow": [
"smoke-glow": {
"deform": [
{
"time": 0.1333,
"vertices": [ -14.17073, 19.14352, 0, 0, -10.97961, -15.09065, -5.79558, -24.82121, 0.68117, -17.78759, -1.1179, -5.4463, 0, 0, 0, 0, 17.52957, 6.89397, -0.33841, -2.21582, 5.51004, 18.88118, -6.80153, 20.91101 ]
@ -4931,6 +4934,7 @@
]
}
}
}
},
"drawOrder": [
{

BIN
spine-cocos2d-objc/Resources/tank.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 437 KiB

After

Width:  |  Height:  |  Size: 418 KiB

1
spine-cocos2d-objc/example/IKExample.m
View File

@ -92,7 +92,6 @@
spBone_worldToLocal(crosshair->parent, sceneStrong->position.x, sceneStrong->position.y, &localX, &localY);
crosshair->x = localX;
crosshair->y = localY;
crosshair->appliedValid = FALSE;
spBone_updateWorldTransform(crosshair);
}
};

4
spine-cocos2d-objc/spine-cocos2d-objc.xcodeproj/project.pbxproj
View File

@ -32,6 +32,7 @@
652107961895250000B1FF07 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 652107951895250000B1FF07 /* CoreText.framework */; };
765A2EF61D7D7A08003FB779 /* goblins.atlas in Resources */ = {isa = PBXBuildFile; fileRef = 765A2EF41D7D7A08003FB779 /* goblins.atlas */; };
765A2EF71D7D7A08003FB779 /* goblins.png in Resources */ = {isa = PBXBuildFile; fileRef = 765A2EF51D7D7A08003FB779 /* goblins.png */; };
766ECCEF27EDFC110074EA8B /* Sequence.c in Sources */ = {isa = PBXBuildFile; fileRef = 766ECCEA27EDFC110074EA8B /* Sequence.c */; };
76BF7E071E66ED9C00485998 /* GLUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = 76BF7E051E66ED9C00485998 /* GLUtils.c */; };
76C893BC23672757009D8DC8 /* IKExample.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C893B623672757009D8DC8 /* IKExample.m */; };
76C893BF236728A4009D8DC8 /* spineboy-pro.json in Resources */ = {isa = PBXBuildFile; fileRef = 76C893BE236728A4009D8DC8 /* spineboy-pro.json */; };
@ -169,6 +170,7 @@
652107951895250000B1FF07 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
765A2EF41D7D7A08003FB779 /* goblins.atlas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = goblins.atlas; path = Resources/goblins.atlas; sourceTree = "<group>"; };
765A2EF51D7D7A08003FB779 /* goblins.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = goblins.png; path = Resources/goblins.png; sourceTree = "<group>"; };
766ECCEA27EDFC110074EA8B /* Sequence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sequence.c; path = "../spine-c/spine-c/src/spine/Sequence.c"; sourceTree = "<group>"; };
76BF7E051E66ED9C00485998 /* GLUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GLUtils.c; path = src/spine/GLUtils.c; sourceTree = "<group>"; };
76BF7E061E66ED9C00485998 /* GLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLUtils.h; path = src/spine/GLUtils.h; sourceTree = "<group>"; };
76C893B623672757009D8DC8 /* IKExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IKExample.m; path = example/IKExample.m; sourceTree = "<group>"; };
@ -306,6 +308,7 @@
43C32822170B0BC2004A9460 /* spine-c */ = {
isa = PBXGroup;
children = (
766ECCEA27EDFC110074EA8B /* Sequence.c */,
76FB15191F01413B00C5377F /* VertexEffect.c */,
76EE4E421EB36DE6000254F4 /* Array.c */,
76EE4E431EB36DE6000254F4 /* ClippingAttachment.c */,
@ -580,6 +583,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
766ECCEF27EDFC110074EA8B /* Sequence.c in Sources */,
76F28D191DEC810300CDE54D /* Atlas.c in Sources */,
76F28D1D1DEC810300CDE54D /* Bone.c in Sources */,
76F28D201DEC810300CDE54D /* Event.c in Sources */,

1
spine-cocos2d-objc/src/spine/SkeletonAnimation.m
View File

@ -151,7 +151,6 @@ static _TrackEntryListeners* getListeners (spTrackEntry* entry) {
- (void) update:(CCTime)deltaTime {
deltaTime *= _timeScale;
spSkeleton_update(_skeleton, deltaTime);
spAnimationState_update(_state, deltaTime);
spAnimationState_apply(_state, _skeleton);
if (_preUpdateWorldTransformsListener) _preUpdateWorldTransformsListener(self);

2
spine-cocos2d-objc/src/spine/SkeletonRenderer.m
View File

@ -200,7 +200,7 @@ static bool handlerQueued = false;
switch (slot->attachment->type) {
case SP_ATTACHMENT_REGION: {
spRegionAttachment* attachment = (spRegionAttachment*)slot->attachment;
spRegionAttachment_computeWorldVertices(attachment, slot->bone, vertices, 0, 2);
spRegionAttachment_computeWorldVertices(attachment, slot, vertices, 0, 2);
texture = [self getTextureForRegion:attachment];
uvs = attachment->uvs;
verticesCount = 8;