diff --git a/spine-cocos2dx/README.md b/spine-cocos2dx/README.md index 5146f61fe..b29897750 100644 --- a/spine-cocos2dx/README.md +++ b/spine-cocos2dx/README.md @@ -1,6 +1,6 @@ # spine-cocos2dx v3.x -The spine-cocos2dx runtime provides functionality to load, manipulate and render [Spine](http://esotericsoftware.com) skeletal animation data using [cocos2d-x](http://www.cocos2d-x.org/). spine-cocos2dx is based on [spine-c](https://github.com/EsotericSoftware/spine-runtimes/tree/master/spine-c). +The spine-cocos2dx runtime provides functionality to load, manipulate and render [Spine](http://esotericsoftware.com) skeletal animation data using [cocos2d-x](http://www.cocos2d-x.org/). spine-cocos2dx is based on [spine-cpp](https://github.com/EsotericSoftware/spine-runtimes/tree/master/spine-cpp). ## Licensing @@ -22,8 +22,8 @@ The setup for cocos2d-x differs from most other Spine Runtimes because the cocos 2. Delete the folder `cocos2d/cocos/editor-support/spine`. This will remove the outdated Spine cocos2d-x runtime shipped by cocos2d-x. 3. Open your project in your IDE of choice, then open the cocos2d_libs sub project and delete the `editor-support/spine` group. This will remove the outdated Spine cocos2d-x runtime shipped by cocos2d-x from your build. 3. Download the Spine Runtimes source using git (`git clone https://github.com/esotericsoftware/spine-runtimes`) or download it as a zip via the download button above. -4. Add the sources from `spine-c/spine-c/src/spine` and `spine-cocos2dx/src/spine` to your project -4. Add the folders `spine-c/spine-c/include` and `spine-cocos2dx/src` to your header search path. Note that includes are specified as `#inclue `, so the `spine` directory cannot be omitted when copying the source files. +4. Add the sources from `spine-cpp/spine-cpp/src/spine` and `spine-cocos2dx/src/spine` to your project +4. Add the folders `spine-cpp/spine-cpp/include` and `spine-cocos2dx/src` to your header search path. Note that includes are specified as `#inclue `, so the `spine` directory cannot be omitted when copying the source files. ## Example The Spine cocos2d-x example works on Windows and Mac OS X. diff --git a/spine-cocos2dx/example/proj.android/jni/Android.mk b/spine-cocos2dx/example/proj.android/jni/Android.mk index 28e4d5739..9f94d6cf9 100755 --- a/spine-cocos2dx/example/proj.android/jni/Android.mk +++ b/spine-cocos2dx/example/proj.android/jni/Android.mk @@ -12,64 +12,84 @@ LOCAL_MODULE := MyGame_shared LOCAL_MODULE_FILENAME := libMyGame LOCAL_SRC_FILES := hellocpp/main.cpp \ - ../../Classes/AppDelegate.cpp \ - ../../Classes/BatchingExample.cpp \ - ../../Classes/GoblinsExample.cpp \ - ../../Classes/RaptorExample.cpp \ - ../../Classes/SimpleCommand.cpp \ - ../../Classes/SpineboyExample.cpp \ - ../../Classes/CoinExample.cpp \ - ../../Classes/TankExample.cpp \ - ../../../src/spine/AttachmentVertices.cpp \ - ../../../src/spine/Cocos2dAttachmentLoader.cpp \ - ../../../src/spine/SkeletonAnimation.cpp \ - ../../../src/spine/SkeletonBatch.cpp \ - ../../../src/spine/SkeletonTwoColorBatch.cpp \ - ../../../src/spine/SkeletonRenderer.cpp \ - ../../../src/spine/spine-cocos2dx.cpp \ - ../../../../spine-c/spine-c/src/spine/Animation.c \ - ../../../../spine-c/spine-c/src/spine/ClippingAttachment.c \ - ../../../../spine-c/spine-c/src/spine/SkeletonClipping.c \ - ../../../../spine-c/spine-c/src/spine/Triangulator.c \ - ../../../../spine-c/spine-c/src/spine/Array.c \ - ../../../../spine-c/spine-c/src/spine/AnimationState.c \ - ../../../../spine-c/spine-c/src/spine/AnimationStateData.c \ - ../../../../spine-c/spine-c/src/spine/Atlas.c \ - ../../../../spine-c/spine-c/src/spine/AtlasAttachmentLoader.c \ - ../../../../spine-c/spine-c/src/spine/Attachment.c \ - ../../../../spine-c/spine-c/src/spine/AttachmentLoader.c \ - ../../../../spine-c/spine-c/src/spine/Bone.c \ - ../../../../spine-c/spine-c/src/spine/BoneData.c \ - ../../../../spine-c/spine-c/src/spine/BoundingBoxAttachment.c \ - ../../../../spine-c/spine-c/src/spine/Color.c \ - ../../../../spine-c/spine-c/src/spine/Event.c \ - ../../../../spine-c/spine-c/src/spine/EventData.c \ - ../../../../spine-c/spine-c/src/spine/IkConstraint.c \ - ../../../../spine-c/spine-c/src/spine/IkConstraintData.c \ - ../../../../spine-c/spine-c/src/spine/Json.c \ - ../../../../spine-c/spine-c/src/spine/MeshAttachment.c \ - ../../../../spine-c/spine-c/src/spine/PathAttachment.c \ - ../../../../spine-c/spine-c/src/spine/PointAttachment.c \ - ../../../../spine-c/spine-c/src/spine/PathConstraint.c \ - ../../../../spine-c/spine-c/src/spine/PathConstraintData.c \ - ../../../../spine-c/spine-c/src/spine/RegionAttachment.c \ - ../../../../spine-c/spine-c/src/spine/Skeleton.c \ - ../../../../spine-c/spine-c/src/spine/SkeletonBinary.c \ - ../../../../spine-c/spine-c/src/spine/SkeletonBounds.c \ - ../../../../spine-c/spine-c/src/spine/SkeletonData.c \ - ../../../../spine-c/spine-c/src/spine/SkeletonJson.c \ - ../../../../spine-c/spine-c/src/spine/Skin.c \ - ../../../../spine-c/spine-c/src/spine/Slot.c \ - ../../../../spine-c/spine-c/src/spine/SlotData.c \ - ../../../../spine-c/spine-c/src/spine/TransformConstraint.c \ - ../../../../spine-c/spine-c/src/spine/TransformConstraintData.c \ - ../../../../spine-c/spine-c/src/spine/VertexAttachment.c \ - ../../../../spine-c/spine-c/src/spine/VertexEffect.c \ - ../../../../spine-c/spine-c/src/spine/extension.c - +../../Classes//AppDelegate.cpp \ +../../Classes//BatchingExample.cpp \ +../../Classes//CoinExample.cpp \ +../../Classes//GoblinsExample.cpp \ +../../Classes//RaptorExample.cpp \ +../../Classes//SkeletonRendererSeparatorExample.cpp \ +../../Classes//SpineboyExample.cpp \ +../../Classes//TankExample.cpp \ +../../../src/spine/AttachmentVertices.cpp \ +../../../src/spine/SkeletonAnimation.cpp \ +../../../src/spine/SkeletonBatch.cpp \ +../../../src/spine/SkeletonRenderer.cpp \ +../../../src/spine/SkeletonTwoColorBatch.cpp \ +../../../src/spine/spine-cocos2dx.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Animation.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/AnimationState.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/AnimationStateData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Atlas.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/AtlasAttachmentLoader.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Attachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/AttachmentLoader.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/AttachmentTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Bone.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/BoneData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/BoundingBoxAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/ClippingAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/ColorTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Constraint.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/CurveTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/DeformTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/DrawOrderTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Event.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/EventData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/EventTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Extension.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/IkConstraint.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/IkConstraintData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/IkConstraintTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Json.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/LinkedMesh.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/MathUtil.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/MeshAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PathAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PathConstraint.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PathConstraintData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PathConstraintMixTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PathConstraintPositionTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PathConstraintSpacingTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/PointAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/RegionAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/RotateTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/RTTI.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/ScaleTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/ShearTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Skeleton.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SkeletonBinary.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SkeletonBounds.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SkeletonClipping.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SkeletonData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SkeletonJson.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Skin.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Slot.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SlotData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/SpineObject.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/TextureLoader.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Timeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/TransformConstraint.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/TransformConstraintData.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/TransformConstraintTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/TranslateTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Triangulator.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/TwoColorTimeline.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/Updatable.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/VertexAttachment.cpp \ +../../../../spine-cpp/spine-cpp//src/spine/VertexEffect.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ - $(LOCAL_PATH)/../../../../spine-c/spine-c/include \ + $(LOCAL_PATH)/../../../../spine-cpp/spine-cpp/include \ $(LOCAL_PATH)/../../../../spine-cocos2dx/src # _COCOS_HEADER_ANDROID_BEGIN diff --git a/spine-cpp/spine-cpp/include/spine/SpineObject.h b/spine-cpp/spine-cpp/include/spine/SpineObject.h index 1b5928dba..53c9b72d2 100644 --- a/spine-cpp/spine-cpp/include/spine/SpineObject.h +++ b/spine-cpp/spine-cpp/include/spine/SpineObject.h @@ -32,6 +32,7 @@ #define Spine_Object_h #include +#include namespace spine { class String; diff --git a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp b/spine-cpp/spine-cpp/src/spine/MathUtil.cpp index 18d64fbde..3a3136ef4 100644 --- a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp +++ b/spine-cpp/spine-cpp/src/spine/MathUtil.cpp @@ -30,6 +30,8 @@ #include #include +#include +#include using namespace spine;