UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-09 16:48:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

spine-cocos2dx now compiles with latest spine-c.

Browse Source
This commit is contained in:
NathanSweet 2013-09-24 16:12:51 +02:00
parent c96bdac26f
commit 0cc7258580
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-cocos2dx/example/proj.win32/spine-cocos2dx.vcxproj
View File

@ -133,9 +133,11 @@
<ClInclude Include="..\..\..\spine-c\include\spine\AttachmentLoader.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\Bone.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\BoneData.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\BoundingBoxAttachment.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\extension.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\RegionAttachment.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\Skeleton.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\SkeletonBounds.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\SkeletonData.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\SkeletonJson.h" />
<ClInclude Include="..\..\..\spine-c\include\spine\Skin.h" />
@ -161,10 +163,12 @@
<ClCompile Include="..\..\..\spine-c\src\spine\AttachmentLoader.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\Bone.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\BoneData.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\BoundingBoxAttachment.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\extension.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\Json.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\RegionAttachment.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\Skeleton.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\SkeletonBounds.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\SkeletonData.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\SkeletonJson.c" />
<ClCompile Include="..\..\..\spine-c\src\spine\Skin.c" />

12
spine-cocos2dx/example/proj.win32/spine-cocos2dx.vcxproj.filters
View File

@ -93,6 +93,12 @@
<ClInclude Include="..\..\src\spine\CCSkeletonAnimation.h">
<Filter>Classes\spine-cocos2dx</Filter>
</ClInclude>
<ClInclude Include="..\..\..\spine-c\include\spine\BoundingBoxAttachment.h">
<Filter>Classes\spine-c</Filter>
</ClInclude>
<ClInclude Include="..\..\..\spine-c\include\spine\SkeletonBounds.h">
<Filter>Classes\spine-c</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@ -167,5 +173,11 @@
<ClCompile Include="..\..\src\spine\CCSkeletonAnimation.cpp">
<Filter>Classes\spine-cocos2dx</Filter>
</ClCompile>
<ClCompile Include="..\..\..\spine-c\src\spine\BoundingBoxAttachment.c">
<Filter>Classes\spine-c</Filter>
</ClCompile>
<ClCompile Include="..\..\..\spine-c\src\spine\SkeletonBounds.c">
<Filter>Classes\spine-c</Filter>
</ClCompile>
</ItemGroup>
</Project>

2
spine-cocos2dx/src/spine/CCSkeleton.cpp
View File

@ -220,7 +220,7 @@ CCRect CCSkeleton::boundingBox () {
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 = min(minX, vertices[VERTEX_X1] * scaleX);
minY = min(minY, vertices[VERTEX_Y1] * scaleY);
maxX = max(maxX, vertices[VERTEX_X1] * scaleX);

2
spine-cocos2dx/src/spine/spine-cocos2dx.cpp
View File

@ -61,7 +61,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;