From cdadffc156da33f173fb73c10cbae197c923586d Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Wed, 8 May 2013 20:09:10 +0200 Subject: [PATCH] Removed spine namespace from spine-c. Didn't make any sense for a C API and complicated integration with ObjC. --- spine-c/include/spine/Animation.h | 2 -- spine-c/include/spine/AnimationState.h | 2 -- spine-c/include/spine/AnimationStateData.h | 2 -- spine-c/include/spine/Atlas.h | 2 -- spine-c/include/spine/AtlasAttachmentLoader.h | 2 -- spine-c/include/spine/Attachment.h | 2 -- spine-c/include/spine/AttachmentLoader.h | 2 -- spine-c/include/spine/Bone.h | 2 -- spine-c/include/spine/BoneData.h | 2 -- spine-c/include/spine/RegionAttachment.h | 2 -- spine-c/include/spine/Skeleton.h | 2 -- spine-c/include/spine/SkeletonData.h | 4 ++-- spine-c/include/spine/SkeletonJson.h | 2 -- spine-c/include/spine/Skin.h | 2 -- spine-c/include/spine/Slot.h | 2 -- spine-c/include/spine/SlotData.h | 2 -- spine-c/include/spine/extension.h | 2 -- spine-c/src/spine/Animation.c | 8 -------- spine-c/src/spine/AnimationState.c | 8 -------- spine-c/src/spine/AnimationStateData.c | 8 -------- spine-c/src/spine/Atlas.c | 8 -------- spine-c/src/spine/AtlasAttachmentLoader.c | 8 -------- spine-c/src/spine/Attachment.c | 8 -------- spine-c/src/spine/AttachmentLoader.c | 8 -------- spine-c/src/spine/Bone.c | 8 -------- spine-c/src/spine/BoneData.c | 8 -------- spine-c/src/spine/Json.c | 8 -------- spine-c/src/spine/Json.h | 2 -- spine-c/src/spine/RegionAttachment.c | 8 -------- spine-c/src/spine/Skeleton.c | 8 -------- spine-c/src/spine/SkeletonData.c | 8 -------- spine-c/src/spine/SkeletonJson.c | 8 -------- spine-c/src/spine/Skin.c | 8 -------- spine-c/src/spine/Slot.c | 8 -------- spine-c/src/spine/SlotData.c | 8 -------- spine-c/src/spine/extension.c | 8 -------- spine-cocos2d-iphone/example/ExampleLayer.m | 2 +- .../project.pbxproj | 12 ++++++++++++ spine-cocos2d-iphone/src/spine/CCSkeleton.h | 4 ---- spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h | 4 ---- .../src/spine/spine-cocos2d-iphone.m | 4 ---- spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp | 6 +++--- spine-cocos2dx/src/spine/CCSkeletonAnimation.h | 6 +++--- spine-cocos2dx/src/spine/spine-cocos2dx.cpp | 4 ---- spine-cocos2dx/src/spine/spine-cocos2dx.h | 4 ---- spine-sfml/src/spine/spine-sfml.cpp | 4 ++-- 46 files changed, 23 insertions(+), 209 deletions(-) diff --git a/spine-c/include/spine/Animation.h b/spine-c/include/spine/Animation.h index 47c43fe46..9f7c038f5 100644 --- a/spine-c/include/spine/Animation.h +++ b/spine-c/include/spine/Animation.h @@ -27,7 +27,6 @@ #define SPINE_ANIMATION_H_ #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -132,7 +131,6 @@ void AttachmentTimeline_setFrame (AttachmentTimeline* self, int frameIndex, floa #ifdef __cplusplus } -} #endif #endif /* SPINE_ANIMATION_H_ */ diff --git a/spine-c/include/spine/AnimationState.h b/spine-c/include/spine/AnimationState.h index 6880afc50..5afc7b640 100644 --- a/spine-c/include/spine/AnimationState.h +++ b/spine-c/include/spine/AnimationState.h @@ -29,7 +29,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -66,7 +65,6 @@ int/*bool*/AnimationState_isComplete (AnimationState* self); #ifdef __cplusplus } -} #endif #endif /* SPINE_ANIMATIONSTATE_H_ */ diff --git a/spine-c/include/spine/AnimationStateData.h b/spine-c/include/spine/AnimationStateData.h index 538ab25f0..bcd33a705 100644 --- a/spine-c/include/spine/AnimationStateData.h +++ b/spine-c/include/spine/AnimationStateData.h @@ -30,7 +30,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -49,7 +48,6 @@ float AnimationStateData_getMix (AnimationStateData* self, Animation* from, Anim #ifdef __cplusplus } -} #endif #endif /* SPINE_ANIMATIONSTATEDATA_H_ */ diff --git a/spine-c/include/spine/Atlas.h b/spine-c/include/spine/Atlas.h index 31ead2d7d..f6c0133f5 100644 --- a/spine-c/include/spine/Atlas.h +++ b/spine-c/include/spine/Atlas.h @@ -27,7 +27,6 @@ #define SPINE_ATLAS_H_ #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -106,7 +105,6 @@ AtlasRegion* Atlas_findRegion (const Atlas* self, const char* name); #ifdef __cplusplus } -} #endif #endif /* SPINE_ATLAS_H_ */ diff --git a/spine-c/include/spine/AtlasAttachmentLoader.h b/spine-c/include/spine/AtlasAttachmentLoader.h index 8f5956f05..e72a83b7f 100644 --- a/spine-c/include/spine/AtlasAttachmentLoader.h +++ b/spine-c/include/spine/AtlasAttachmentLoader.h @@ -30,7 +30,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -43,7 +42,6 @@ AtlasAttachmentLoader* AtlasAttachmentLoader_create (Atlas* atlas); #ifdef __cplusplus } -} #endif #endif /* SPINE_ATLASATTACHMENTLOADER_H_ */ diff --git a/spine-c/include/spine/Attachment.h b/spine-c/include/spine/Attachment.h index c8b41c51c..8d4a6008b 100644 --- a/spine-c/include/spine/Attachment.h +++ b/spine-c/include/spine/Attachment.h @@ -27,7 +27,6 @@ #define SPINE_ATTACHMENT_H_ #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -49,7 +48,6 @@ void Attachment_dispose (Attachment* self); #ifdef __cplusplus } -} #endif #endif /* SPINE_ATTACHMENT_H_ */ diff --git a/spine-c/include/spine/AttachmentLoader.h b/spine-c/include/spine/AttachmentLoader.h index b02556174..84de343cc 100644 --- a/spine-c/include/spine/AttachmentLoader.h +++ b/spine-c/include/spine/AttachmentLoader.h @@ -30,7 +30,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -52,7 +51,6 @@ Attachment* AttachmentLoader_newAttachment (AttachmentLoader* self, Skin* skin, #ifdef __cplusplus } -} #endif #endif /* SPINE_ATTACHMENTLOADER_H_ */ diff --git a/spine-c/include/spine/Bone.h b/spine-c/include/spine/Bone.h index bb81d18f0..cb391018d 100644 --- a/spine-c/include/spine/Bone.h +++ b/spine-c/include/spine/Bone.h @@ -29,7 +29,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -59,7 +58,6 @@ void Bone_updateWorldTransform (Bone* self, int/*bool*/flipX, int/*bool*/flipY); #ifdef __cplusplus } -} #endif #endif /* SPINE_BONE_H_ */ diff --git a/spine-c/include/spine/BoneData.h b/spine-c/include/spine/BoneData.h index 7a0bc92e2..35c3633ed 100644 --- a/spine-c/include/spine/BoneData.h +++ b/spine-c/include/spine/BoneData.h @@ -27,7 +27,6 @@ #define SPINE_BONEDATA_H_ #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -46,7 +45,6 @@ void BoneData_dispose (BoneData* self); #ifdef __cplusplus } -} #endif #endif /* SPINE_BONEDATA_H_ */ diff --git a/spine-c/include/spine/RegionAttachment.h b/spine-c/include/spine/RegionAttachment.h index e796a5e72..93850b684 100644 --- a/spine-c/include/spine/RegionAttachment.h +++ b/spine-c/include/spine/RegionAttachment.h @@ -31,7 +31,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -60,7 +59,6 @@ void RegionAttachment_computeVertices (RegionAttachment* self, Slot* slot, float #ifdef __cplusplus } -} #endif #endif /* SPINE_REGIONATTACHMENT_H_ */ diff --git a/spine-c/include/spine/Skeleton.h b/spine-c/include/spine/Skeleton.h index bb565d844..76b053ef3 100644 --- a/spine-c/include/spine/Skeleton.h +++ b/spine-c/include/spine/Skeleton.h @@ -31,7 +31,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -91,7 +90,6 @@ void Skeleton_update (Skeleton* self, float deltaTime); #ifdef __cplusplus } -} #endif #endif /* SPINE_SKELETON_H_*/ diff --git a/spine-c/include/spine/SkeletonData.h b/spine-c/include/spine/SkeletonData.h index b51229c1f..8be9adf52 100644 --- a/spine-c/include/spine/SkeletonData.h +++ b/spine-c/include/spine/SkeletonData.h @@ -32,7 +32,7 @@ #include #ifdef __cplusplus -namespace spine {extern "C" { +extern "C" { #endif typedef struct { @@ -64,7 +64,7 @@ Skin* SkeletonData_findSkin (const SkeletonData* self, const char* skinName); Animation* SkeletonData_findAnimation (const SkeletonData* self, const char* animationName); #ifdef __cplusplus -}} +} #endif #endif /* SPINE_SKELETONDATA_H_ */ diff --git a/spine-c/include/spine/SkeletonJson.h b/spine-c/include/spine/SkeletonJson.h index ca39dbe4e..f2e5a4dab 100644 --- a/spine-c/include/spine/SkeletonJson.h +++ b/spine-c/include/spine/SkeletonJson.h @@ -33,7 +33,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -52,7 +51,6 @@ SkeletonData* SkeletonJson_readSkeletonDataFile (SkeletonJson* self, const char* #ifdef __cplusplus } -} #endif #endif /* SPINE_SKELETONJSON_H_ */ diff --git a/spine-c/include/spine/Skin.h b/spine-c/include/spine/Skin.h index f6939081c..649b15574 100644 --- a/spine-c/include/spine/Skin.h +++ b/spine-c/include/spine/Skin.h @@ -29,7 +29,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -52,7 +51,6 @@ void Skin_attachAll (const Skin* self, struct Skeleton* skeleton, const Skin* ol #ifdef __cplusplus } -} #endif #endif /* SPINE_SKIN_H_ */ diff --git a/spine-c/include/spine/Slot.h b/spine-c/include/spine/Slot.h index 95afd3f05..ff7f5275f 100644 --- a/spine-c/include/spine/Slot.h +++ b/spine-c/include/spine/Slot.h @@ -31,7 +31,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -58,7 +57,6 @@ void Slot_setToSetupPose (Slot* self); #ifdef __cplusplus } -} #endif #endif /* SPINE_SLOT_H_ */ diff --git a/spine-c/include/spine/SlotData.h b/spine-c/include/spine/SlotData.h index 756076776..7cdbef17d 100644 --- a/spine-c/include/spine/SlotData.h +++ b/spine-c/include/spine/SlotData.h @@ -29,7 +29,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -48,7 +47,6 @@ void SlotData_setAttachmentName (SlotData* self, const char* attachmentName); #ifdef __cplusplus } -} #endif #endif /* SPINE_SLOTDATA_H_ */ diff --git a/spine-c/include/spine/extension.h b/spine-c/include/spine/extension.h index 7642f4603..c12a0a8f3 100644 --- a/spine-c/include/spine/extension.h +++ b/spine-c/include/spine/extension.h @@ -89,7 +89,6 @@ #include #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -145,7 +144,6 @@ void _CurveTimeline_deinit (CurveTimeline* self); #ifdef __cplusplus } -} #endif #endif /* SPINE_EXTENSION_H_ */ diff --git a/spine-c/src/spine/Animation.c b/spine-c/src/spine/Animation.c index f5be9ecd5..1de2d33b0 100644 --- a/spine-c/src/spine/Animation.c +++ b/spine-c/src/spine/Animation.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - Animation* Animation_create (const char* name, int timelineCount) { Animation* self = NEW(Animation); MALLOC_STR(self->name, name); @@ -497,7 +493,3 @@ void AttachmentTimeline_setFrame (AttachmentTimeline* self, int frameIndex, floa else self->attachmentNames[frameIndex] = 0; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/AnimationState.c b/spine-c/src/spine/AnimationState.c index 327b8be47..dbb0189c5 100644 --- a/spine-c/src/spine/AnimationState.c +++ b/spine-c/src/spine/AnimationState.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct _Entry _Entry; struct _Entry { Animation* animation; @@ -177,7 +173,3 @@ void AnimationState_apply (AnimationState* self, Skeleton* skeleton) { int/*bool*/AnimationState_isComplete (AnimationState* self) { return !self->animation || self->time >= self->animation->duration; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/AnimationStateData.c b/spine-c/src/spine/AnimationStateData.c index 905639f7f..06c019fcb 100644 --- a/spine-c/src/spine/AnimationStateData.c +++ b/spine-c/src/spine/AnimationStateData.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct _ToEntry _ToEntry; struct _ToEntry { Animation* animation; @@ -148,7 +144,3 @@ float AnimationStateData_getMix (AnimationStateData* self, Animation* from, Anim } return 0; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Atlas.c b/spine-c/src/spine/Atlas.c index 676f1481d..b2b29d4f8 100644 --- a/spine-c/src/spine/Atlas.c +++ b/spine-c/src/spine/Atlas.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - AtlasPage* AtlasPage_create (const char* name) { AtlasPage* self = NEW(AtlasPage); MALLOC_STR(self->name, name); @@ -337,7 +333,3 @@ AtlasRegion* Atlas_findRegion (const Atlas* self, const char* name) { } return 0; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/AtlasAttachmentLoader.c b/spine-c/src/spine/AtlasAttachmentLoader.c index e0e96c299..455c31a81 100644 --- a/spine-c/src/spine/AtlasAttachmentLoader.c +++ b/spine-c/src/spine/AtlasAttachmentLoader.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - Attachment* _AtlasAttachmentLoader_newAttachment (AttachmentLoader* loader, Skin* skin, AttachmentType type, const char* name) { AtlasAttachmentLoader* self = SUB_CAST(AtlasAttachmentLoader, loader); switch (type) { @@ -63,7 +59,3 @@ AtlasAttachmentLoader* AtlasAttachmentLoader_create (Atlas* atlas) { self->atlas = atlas; return self; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Attachment.c b/spine-c/src/spine/Attachment.c index 0b57fe583..7e4a851dd 100644 --- a/spine-c/src/spine/Attachment.c +++ b/spine-c/src/spine/Attachment.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct _AttachmentVtable { void (*dispose) (Attachment* self); } _AttachmentVtable; @@ -54,7 +50,3 @@ void Attachment_dispose (Attachment* self) { VTABLE(Attachment, self) ->dispose(self); FREE(self); } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/AttachmentLoader.c b/spine-c/src/spine/AttachmentLoader.c index 9af1505a1..faa6fc4b4 100644 --- a/spine-c/src/spine/AttachmentLoader.c +++ b/spine-c/src/spine/AttachmentLoader.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct _AttachmentLoaderVtable { Attachment* (*newAttachment) (AttachmentLoader* self, Skin* skin, AttachmentType type, const char* name); void (*dispose) (AttachmentLoader* self); @@ -75,7 +71,3 @@ void _AttachmentLoader_setUnknownTypeError (AttachmentLoader* self, AttachmentTy sprintf(buffer, "%d", type); _AttachmentLoader_setError(self, "Unknown attachment type: ", buffer); } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Bone.c b/spine-c/src/spine/Bone.c index d4d24d0a7..fa6f0a441 100644 --- a/spine-c/src/spine/Bone.c +++ b/spine-c/src/spine/Bone.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - static int yDown; void Bone_setYDown (int value) { @@ -97,7 +93,3 @@ void Bone_updateWorldTransform (Bone* self, int flipX, int flipY) { CONST_CAST(float, self->m11) = -self->m11; } } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/BoneData.c b/spine-c/src/spine/BoneData.c index 37f8e44d7..8b3250731 100644 --- a/spine-c/src/spine/BoneData.c +++ b/spine-c/src/spine/BoneData.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - BoneData* BoneData_create (const char* name, BoneData* parent) { BoneData* self = NEW(BoneData); MALLOC_STR(self->name, name); @@ -43,7 +39,3 @@ void BoneData_dispose (BoneData* self) { FREE(self->name); FREE(self); } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Json.c b/spine-c/src/spine/Json.c index 1d04ecc15..91f498341 100644 --- a/spine-c/src/spine/Json.c +++ b/spine-c/src/spine/Json.c @@ -29,10 +29,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - static const char* ep; const char* Json_getError (void) { @@ -373,7 +369,3 @@ int Json_getInt (Json* value, const char* name, int defaultValue) { value = Json_getItem(value, name); return value ? (int)value->valuefloat : defaultValue; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Json.h b/spine-c/src/spine/Json.h index 905f48ce8..0c5d9b3f3 100644 --- a/spine-c/src/spine/Json.h +++ b/spine-c/src/spine/Json.h @@ -26,7 +26,6 @@ #define SPINE_JSON_H_ #ifdef __cplusplus -namespace spine { extern "C" { #endif @@ -77,7 +76,6 @@ const char* Json_getError (void); #ifdef __cplusplus } -} #endif #endif /* SPINE_JSON_H_ */ diff --git a/spine-c/src/spine/RegionAttachment.c b/spine-c/src/spine/RegionAttachment.c index 312a922b0..be8bffa1e 100644 --- a/spine-c/src/spine/RegionAttachment.c +++ b/spine-c/src/spine/RegionAttachment.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - RegionAttachment* RegionAttachment_create (const char* name) { RegionAttachment* self = NEW(RegionAttachment); self->scaleX = 1; @@ -106,7 +102,3 @@ void RegionAttachment_computeVertices (RegionAttachment* self, Slot* slot, float vertices[VERTEX_X4] = offset[VERTEX_X4] * bone->m00 + offset[VERTEX_Y4] * bone->m01 + bone->worldX; vertices[VERTEX_Y4] = offset[VERTEX_X4] * bone->m10 + offset[VERTEX_Y4] * bone->m11 + bone->worldY; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Skeleton.c b/spine-c/src/spine/Skeleton.c index 6d3349412..7d661c8f1 100644 --- a/spine-c/src/spine/Skeleton.c +++ b/spine-c/src/spine/Skeleton.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - Skeleton* Skeleton_create (SkeletonData* data) { int i, ii; @@ -201,7 +197,3 @@ int Skeleton_setAttachment (Skeleton* self, const char* slotName, const char* at void Skeleton_update (Skeleton* self, float deltaTime) { self->time += deltaTime; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/SkeletonData.c b/spine-c/src/spine/SkeletonData.c index b8773e251..f64f0f229 100644 --- a/spine-c/src/spine/SkeletonData.c +++ b/spine-c/src/spine/SkeletonData.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - SkeletonData* SkeletonData_create () { return NEW(SkeletonData); } @@ -97,7 +93,3 @@ Animation* SkeletonData_findAnimation (const SkeletonData* self, const char* ani if (strcmp(self->animations[i]->name, animationName) == 0) return self->animations[i]; return 0; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/SkeletonJson.c b/spine-c/src/spine/SkeletonJson.c index ad3256aa8..d980fbb62 100644 --- a/spine-c/src/spine/SkeletonJson.c +++ b/spine-c/src/spine/SkeletonJson.c @@ -32,10 +32,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct { SkeletonJson super; int ownsLoader; @@ -415,7 +411,3 @@ SkeletonData* SkeletonJson_readSkeletonData (SkeletonJson* self, const char* jso Json_dispose(root); return skeletonData; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Skin.c b/spine-c/src/spine/Skin.c index dace58cc9..58f035cff 100644 --- a/spine-c/src/spine/Skin.c +++ b/spine-c/src/spine/Skin.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct _Entry _Entry; struct _Entry { int slotIndex; @@ -103,7 +99,3 @@ void Skin_attachAll (const Skin* self, Skeleton* skeleton, const Skin* oldSkin) entry = entry->next; } } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/Slot.c b/spine-c/src/spine/Slot.c index f82dd38ad..6417a27a4 100644 --- a/spine-c/src/spine/Slot.c +++ b/spine-c/src/spine/Slot.c @@ -27,10 +27,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - typedef struct { Slot super; float attachmentTime; @@ -81,7 +77,3 @@ void Slot_setToSetupPose (Slot* self) { } Slot_setAttachment(self, attachment); } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/SlotData.c b/spine-c/src/spine/SlotData.c index 425596f11..8b8f51d0b 100644 --- a/spine-c/src/spine/SlotData.c +++ b/spine-c/src/spine/SlotData.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - SlotData* SlotData_create (const char* name, BoneData* boneData) { SlotData* self = NEW(SlotData); MALLOC_STR(self->name, name); @@ -54,7 +50,3 @@ void SlotData_setAttachmentName (SlotData* self, const char* attachmentName) { else CONST_CAST(char*, self->attachmentName) = 0; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-c/src/spine/extension.c b/spine-c/src/spine/extension.c index 7cb633476..693604880 100644 --- a/spine-c/src/spine/extension.c +++ b/spine-c/src/spine/extension.c @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - static void* (*mallocFunc) (size_t size) = malloc; static void (*freeFunc) (void* ptr) = free; @@ -67,7 +63,3 @@ char* _readFile (const char* path, int* length) { return data; } - -#ifdef __cplusplus -} -#endif diff --git a/spine-cocos2d-iphone/example/ExampleLayer.m b/spine-cocos2d-iphone/example/ExampleLayer.m index 2a86f3730..08f3617a0 100644 --- a/spine-cocos2d-iphone/example/ExampleLayer.m +++ b/spine-cocos2d-iphone/example/ExampleLayer.m @@ -65,7 +65,7 @@ location.y -= [[director runningScene]position].y; location.x -= animationNode.position.x; location.y -= animationNode.position.y; - if (CGRectContainsPoint(skeletonNode.boundingBox, location)) NSLog(@"Clicked!"); + if (CGRectContainsPoint(animationNode.boundingBox, location)) NSLog(@"Clicked!"); return YES; } #endif 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 83dccbd60..c78f3434e 100644 --- a/spine-cocos2d-iphone/spine-cocos2d-iphone-mac.xcodeproj/project.pbxproj +++ b/spine-cocos2d-iphone/spine-cocos2d-iphone-mac.xcodeproj/project.pbxproj @@ -157,6 +157,8 @@ 43C32A36170D0A4D004A9460 /* spineboy.atlas in Resources */ = {isa = PBXBuildFile; fileRef = 43C32A30170D0A4D004A9460 /* spineboy.atlas */; }; 43C32A37170D0A4D004A9460 /* spineboy.json in Resources */ = {isa = PBXBuildFile; fileRef = 43C32A31170D0A4D004A9460 /* spineboy.json */; }; 43C32A38170D0A4D004A9460 /* spineboy.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C32A32170D0A4D004A9460 /* spineboy.png */; }; + 43D3163A173ACAE00028AA22 /* CCSkeleton.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D31637173ACAE00028AA22 /* CCSkeleton.m */; }; + 43D3163B173ACAE00028AA22 /* CCSkeletonAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D31639173ACAE00028AA22 /* CCSkeletonAnimation.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -470,6 +472,10 @@ 43C32A30170D0A4D004A9460 /* spineboy.atlas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = spineboy.atlas; sourceTree = ""; }; 43C32A31170D0A4D004A9460 /* spineboy.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = spineboy.json; sourceTree = ""; }; 43C32A32170D0A4D004A9460 /* spineboy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spineboy.png; sourceTree = ""; }; + 43D31636173ACAE00028AA22 /* CCSkeleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCSkeleton.h; path = src/spine/CCSkeleton.h; sourceTree = ""; }; + 43D31637173ACAE00028AA22 /* CCSkeleton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSkeleton.m; path = src/spine/CCSkeleton.m; sourceTree = ""; }; + 43D31638173ACAE00028AA22 /* CCSkeletonAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCSkeletonAnimation.h; path = src/spine/CCSkeletonAnimation.h; sourceTree = ""; }; + 43D31639173ACAE00028AA22 /* CCSkeletonAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSkeletonAnimation.m; path = src/spine/CCSkeletonAnimation.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -952,6 +958,10 @@ children = ( 43BFBE0D170A778A00ECBACB /* spine-cocos2d-iphone.m */, 43BFBE0E170A778A00ECBACB /* spine-cocos2d-iphone.h */, + 43D31636173ACAE00028AA22 /* CCSkeleton.h */, + 43D31637173ACAE00028AA22 /* CCSkeleton.m */, + 43D31638173ACAE00028AA22 /* CCSkeletonAnimation.h */, + 43D31639173ACAE00028AA22 /* CCSkeletonAnimation.m */, ); name = "spine-cocos2d-iphone"; path = ..; @@ -1183,6 +1193,8 @@ 43BFBE0F170A778A00ECBACB /* spine-cocos2d-iphone.m in Sources */, 43C32A1B170B1295004A9460 /* AppDelegate.m in Sources */, 43C32A20170B1295004A9460 /* main.m in Sources */, + 43D3163A173ACAE00028AA22 /* CCSkeleton.m in Sources */, + 43D3163B173ACAE00028AA22 /* CCSkeletonAnimation.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/spine-cocos2d-iphone/src/spine/CCSkeleton.h b/spine-cocos2d-iphone/src/spine/CCSkeleton.h index e17a94436..1ae782cb8 100644 --- a/spine-cocos2d-iphone/src/spine/CCSkeleton.h +++ b/spine-cocos2d-iphone/src/spine/CCSkeleton.h @@ -26,10 +26,6 @@ #import #import "cocos2d.h" -#ifdef __cplusplus -using namespace spine; -#endif - /** Draws a skeleton. */ diff --git a/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h b/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h index 9fa4766a0..8c4f2a6fd 100644 --- a/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h +++ b/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h @@ -27,10 +27,6 @@ #import #import "cocos2d.h" -#ifdef __cplusplus -using namespace spine; -#endif - /** Draws an animated skeleton, providing a simple API for applying one or more animations and queuing animations to be played later. */ diff --git a/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m b/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m index 20e5e1e7b..a614f6287 100644 --- a/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m +++ b/spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -namespace spine { -#endif - void _AtlasPage_createTexture (AtlasPage* self, const char* path) { CCTexture2D* texture = [[CCTextureCache sharedTextureCache] addImage:@(path)]; CCTextureAtlas* textureAtlas = [[CCTextureAtlas alloc] initWithTexture:texture capacity:4]; diff --git a/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp b/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp index ddeb24230..5eddd7f38 100644 --- a/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp +++ b/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp @@ -119,17 +119,17 @@ void CCSkeletonAnimation::setAnimationStateData (AnimationStateData* stateData, states[stateIndex] = state; } -void CCSkeletonAnimation::setMix (char* fromAnimation, char* toAnimation, float duration, int stateIndex) { +void CCSkeletonAnimation::setMix (const char* fromAnimation, const char* toAnimation, float duration, int stateIndex) { CCAssert(stateIndex >= 0 && stateIndex < (int)states.size(), "stateIndex out of range."); AnimationStateData_setMixByName(states[stateIndex]->data, fromAnimation, toAnimation, duration); } -void CCSkeletonAnimation::setAnimation (char* name, bool loop, int stateIndex) { +void CCSkeletonAnimation::setAnimation (const char* name, bool loop, int stateIndex) { CCAssert(stateIndex >= 0 && stateIndex < (int)states.size(), "stateIndex out of range."); AnimationState_setAnimationByName(states[stateIndex], name, loop); } -void CCSkeletonAnimation::addAnimation (char* name, bool loop, float delay, int stateIndex) { +void CCSkeletonAnimation::addAnimation (const char* name, bool loop, float delay, int stateIndex) { CCAssert(stateIndex >= 0 && stateIndex < (int)states.size(), "stateIndex out of range."); AnimationState_addAnimationByName(states[stateIndex], name, loop, delay); } diff --git a/spine-cocos2dx/src/spine/CCSkeletonAnimation.h b/spine-cocos2dx/src/spine/CCSkeletonAnimation.h index db88e8555..e48645943 100644 --- a/spine-cocos2dx/src/spine/CCSkeletonAnimation.h +++ b/spine-cocos2dx/src/spine/CCSkeletonAnimation.h @@ -53,9 +53,9 @@ public: void addAnimationState (AnimationStateData* stateData = 0); void setAnimationStateData (AnimationStateData* stateData, int stateIndex = 0); - void setMix (char* fromAnimation, char* toAnimation, float duration, int stateIndex = 0); - void setAnimation (char* name, bool loop, int stateIndex = 0); - void addAnimation (char* name, bool loop, float delay = 0, int stateIndex = 0); + void setMix (const char* fromAnimation, const char* toAnimation, float duration, int stateIndex = 0); + void setAnimation (const char* name, bool loop, int stateIndex = 0); + void addAnimation (const char* name, bool loop, float delay = 0, int stateIndex = 0); void clearAnimation (int stateIndex = 0); protected: diff --git a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp index c902414ea..b6638294c 100644 --- a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp +++ b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp @@ -28,8 +28,6 @@ USING_NS_CC; -namespace spine { - void _AtlasPage_createTexture (AtlasPage* self, const char* path) { CCTexture2D* texture = CCTextureCache::sharedTextureCache()->addImage(path); CCTextureAtlas* textureAtlas = CCTextureAtlas::createWithTexture(texture, 4); @@ -96,5 +94,3 @@ void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, ccV3F_C4B_ quad->br.texCoords.u = self->uvs[VERTEX_X4]; quad->br.texCoords.v = self->uvs[VERTEX_Y4]; } - -} diff --git a/spine-cocos2dx/src/spine/spine-cocos2dx.h b/spine-cocos2dx/src/spine/spine-cocos2dx.h index cadf3ab03..44e5f3367 100644 --- a/spine-cocos2dx/src/spine/spine-cocos2dx.h +++ b/spine-cocos2dx/src/spine/spine-cocos2dx.h @@ -31,10 +31,6 @@ #include #include -namespace spine { - void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, cocos2d::ccV3F_C4B_T2F_Quad* quad); -} - #endif /* SPINE_COCOS2DX_H_ */ diff --git a/spine-sfml/src/spine/spine-sfml.cpp b/spine-sfml/src/spine/spine-sfml.cpp index ecc8cbc04..1758626af 100644 --- a/spine-sfml/src/spine/spine-sfml.cpp +++ b/spine-sfml/src/spine/spine-sfml.cpp @@ -33,8 +33,6 @@ using namespace sf; -namespace spine { - void _AtlasPage_createTexture (AtlasPage* self, const char* path) { Texture* texture = new Texture(); if (!texture->loadFromFile(path)) return; @@ -54,6 +52,8 @@ char* _Util_readFile (const char* path, int* length) { /**/ +namespace spine { + SkeletonDrawable::SkeletonDrawable (SkeletonData* skeletonData, AnimationStateData* stateData) : timeScale(1), vertexArray(new VertexArray(Quads, skeletonData->boneCount * 4)) {