Permalink
Browse files

new spine runtime applied

  • Loading branch information...
1 parent bdcadc7 commit c3b84f1c9452287c7abbec418bcc7958202f3ab7 @seobyeongky seobyeongky committed Dec 19, 2013
Showing with 3,465 additions and 1,759 deletions.
  1. +48 −0 build/cocos2d_libs.xcodeproj/project.pbxproj
  2. +4 −0 cocos/editor-support/spine/Android.mk
  3. +255 −115 cocos/editor-support/spine/Animation.cpp
  4. +169 −47 cocos/editor-support/spine/Animation.h
  5. +227 −123 cocos/editor-support/spine/AnimationState.cpp
  6. +87 −32 cocos/editor-support/spine/AnimationState.h
  7. +33 −29 cocos/editor-support/spine/AnimationStateData.cpp
  8. +40 −18 cocos/editor-support/spine/AnimationStateData.h
  9. +56 −52 cocos/editor-support/spine/Atlas.cpp
  10. +71 −36 cocos/editor-support/spine/Atlas.h
  11. +31 −24 cocos/editor-support/spine/AtlasAttachmentLoader.cpp
  12. +32 −15 cocos/editor-support/spine/AtlasAttachmentLoader.h
  13. +27 −24 cocos/editor-support/spine/Attachment.cpp
  14. +36 −18 cocos/editor-support/spine/Attachment.h
  15. +35 −31 cocos/editor-support/spine/AttachmentLoader.cpp
  16. +39 −17 cocos/editor-support/spine/AttachmentLoader.h
  17. +37 −32 cocos/editor-support/spine/Bone.cpp
  18. +41 −20 cocos/editor-support/spine/Bone.h
  19. +23 −17 cocos/editor-support/spine/BoneData.cpp
  20. +35 −16 cocos/editor-support/spine/BoneData.h
  21. +65 −0 cocos/editor-support/spine/BoundingBoxAttachment.cpp
  22. +65 −0 cocos/editor-support/spine/BoundingBoxAttachment.h
  23. +209 −208 cocos/editor-support/spine/CCSkeleton.cpp
  24. +49 −54 cocos/editor-support/spine/CCSkeleton.h
  25. +84 −65 cocos/editor-support/spine/CCSkeletonAnimation.cpp
  26. +48 −41 cocos/editor-support/spine/CCSkeletonAnimation.h
  27. +6 −0 cocos/editor-support/spine/CMakeLists.txt
  28. +46 −0 cocos/editor-support/spine/Event.cpp
  29. +64 −0 cocos/editor-support/spine/Event.h
  30. +47 −0 cocos/editor-support/spine/EventData.cpp
  31. +62 −0 cocos/editor-support/spine/EventData.h
  32. +16 −33 cocos/editor-support/spine/Json.cpp
  33. +11 −12 cocos/editor-support/spine/Json.h
  34. +30 −19 cocos/editor-support/spine/RegionAttachment.cpp
  35. +40 −19 cocos/editor-support/spine/RegionAttachment.h
  36. +72 −63 cocos/editor-support/spine/Skeleton.cpp
  37. +70 −38 cocos/editor-support/spine/Skeleton.h
  38. +208 −0 cocos/editor-support/spine/SkeletonBounds.cpp
  39. +115 −0 cocos/editor-support/spine/SkeletonBounds.h
  40. +43 −28 cocos/editor-support/spine/SkeletonData.cpp
  41. +56 −25 cocos/editor-support/spine/SkeletonData.h
  42. +277 −189 cocos/editor-support/spine/SkeletonJson.cpp
  43. +39 −18 cocos/editor-support/spine/SkeletonJson.h
  44. +38 −34 cocos/editor-support/spine/Skin.cpp
  45. +41 −19 cocos/editor-support/spine/Skin.h
  46. +37 −33 cocos/editor-support/spine/Slot.cpp
  47. +46 −24 cocos/editor-support/spine/Slot.h
  48. +22 −18 cocos/editor-support/spine/SlotData.cpp
  49. +36 −16 cocos/editor-support/spine/SlotData.h
  50. +22 −23 cocos/editor-support/spine/extension.cpp
  51. +72 −58 cocos/editor-support/spine/extension.h
  52. +8 −0 cocos/editor-support/spine/proj.win32/libSpine.vcxproj
  53. +22 −1 cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters
  54. +34 −32 cocos/editor-support/spine/spine-cocos2dx.cpp
  55. +18 −14 cocos/editor-support/spine/spine-cocos2dx.h
  56. +21 −9 cocos/editor-support/spine/spine.h
@@ -1466,6 +1466,22 @@
1AE3C845184F14F700CF29B5 /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE3C842184F14F700CF29B5 /* CCValue.cpp */; };
1AE3C846184F14F700CF29B5 /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE3C843184F14F700CF29B5 /* CCValue.h */; };
1AE3C847184F14F700CF29B5 /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE3C843184F14F700CF29B5 /* CCValue.h */; };
+ 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; };
+ 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; };
+ 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; };
+ 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; };
+ 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; };
+ 2AC795E018628723005EC8E1 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; };
+ 2AC795E118628723005EC8E1 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; };
+ 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; };
+ 2AC795E318628746005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; };
+ 2AC795E418628746005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; };
+ 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; };
+ 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; };
+ 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; };
+ 2AC795E81862875D005EC8E1 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; };
+ 2AC795E91862875D005EC8E1 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; };
+ 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; };
3EEF8BD31839FFAF005E8A6C /* jsb_cocos2dx_gui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EEF8BCB1839F390005E8A6C /* jsb_cocos2dx_gui_auto.cpp */; };
3EEF8BD41839FFAF005E8A6C /* jsb_cocos2dx_gui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EEF8BD11839F5C5005E8A6C /* jsb_cocos2dx_gui_manual.cpp */; };
3EEF8BD5183A001B005E8A6C /* jsb_cocos2dx_gui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EEF8BCB1839F390005E8A6C /* jsb_cocos2dx_gui_auto.cpp */; };
@@ -2704,6 +2720,14 @@
1AD71F08180E28C400808F54 /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
1AE3C842184F14F700CF29B5 /* CCValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCValue.cpp; path = ../base/CCValue.cpp; sourceTree = "<group>"; };
1AE3C843184F14F700CF29B5 /* CCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCValue.h; path = ../base/CCValue.h; sourceTree = "<group>"; };
+ 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoundingBoxAttachment.cpp; sourceTree = "<group>"; };
+ 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BoundingBoxAttachment.h; sourceTree = "<group>"; };
+ 2AC795D51862867D005EC8E1 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = "<group>"; };
+ 2AC795D61862867D005EC8E1 /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = "<group>"; };
+ 2AC795D71862867D005EC8E1 /* EventData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventData.cpp; sourceTree = "<group>"; };
+ 2AC795D81862867D005EC8E1 /* EventData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventData.h; sourceTree = "<group>"; };
+ 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkeletonBounds.cpp; sourceTree = "<group>"; };
+ 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkeletonBounds.h; sourceTree = "<group>"; };
3EEF8BCB1839F390005E8A6C /* jsb_cocos2dx_gui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsb_cocos2dx_gui_auto.cpp; sourceTree = "<group>"; };
3EEF8BCC1839F390005E8A6C /* jsb_cocos2dx_gui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_gui_auto.hpp; sourceTree = "<group>"; };
3EEF8BD11839F5C5005E8A6C /* jsb_cocos2dx_gui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsb_cocos2dx_gui_manual.cpp; path = gui/jsb_cocos2dx_gui_manual.cpp; sourceTree = "<group>"; };
@@ -4550,6 +4574,14 @@
1AD71D7C180E26E600808F54 /* spine */ = {
isa = PBXGroup;
children = (
+ 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */,
+ 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */,
+ 2AC795D51862867D005EC8E1 /* Event.cpp */,
+ 2AC795D61862867D005EC8E1 /* Event.h */,
+ 2AC795D71862867D005EC8E1 /* EventData.cpp */,
+ 2AC795D81862867D005EC8E1 /* EventData.h */,
+ 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */,
+ 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */,
1AD71D7E180E26E600808F54 /* Animation.cpp */,
1AD71D7F180E26E600808F54 /* Animation.h */,
1AD71D80180E26E600808F54 /* AnimationState.cpp */,
@@ -5385,6 +5417,10 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */,
+ 2AC795E018628723005EC8E1 /* Event.h in Headers */,
+ 2AC795E118628723005EC8E1 /* EventData.h in Headers */,
+ 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */,
46A170B01807CEA3005B8026 /* neon_matrix_impl.h in Headers */,
1AA2063F1848437900053418 /* CCMap.h in Headers */,
46A170191807CBFC005B8026 /* CCCommon.h in Headers */,
@@ -5962,6 +5998,10 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */,
+ 2AC795E81862875D005EC8E1 /* Event.h in Headers */,
+ 2AC795E91862875D005EC8E1 /* EventData.h in Headers */,
+ 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */,
46A1702D1807CBFE005B8026 /* CCCommon.h in Headers */,
46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */,
593BDCF9184D0A6E00C21E48 /* CCGroupCommand.h in Headers */,
@@ -6767,6 +6807,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */,
+ 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */,
+ 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */,
+ 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */,
46A170501807CC1C005B8026 /* CCApplication.mm in Sources */,
46A1705A1807CC1C005B8026 /* CCImage.mm in Sources */,
46A170CC1807CEBB005B8026 /* ray2.c in Sources */,
@@ -7288,6 +7332,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2AC795E318628746005EC8E1 /* SkeletonBounds.cpp in Sources */,
+ 2AC795E418628746005EC8E1 /* Event.cpp in Sources */,
+ 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */,
+ 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */,
46A1703C1807CC07005B8026 /* CCApplication.mm in Sources */,
46A170471807CC07005B8026 /* CCImage.mm in Sources */,
46A170D61807CEBC005B8026 /* ray2.c in Sources */,
@@ -24,6 +24,10 @@ SkeletonJson.cpp \
Skin.cpp \
Slot.cpp \
SlotData.cpp \
+BoundingBoxAttachment.cpp \
+Event.cpp \
+EventData.cpp \
+SkeletonBounds.cpp \
extension.cpp \
spine-cocos2dx.cpp
Oops, something went wrong.

0 comments on commit c3b84f1

Please sign in to comment.