UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added missing bool ownsSkeletonData.

Browse Source
This commit is contained in:
NathanSweet 2015-04-28 16:42:30 +02:00
parent 27270a5781
commit 2bc909850b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-cocos2dx/3/src/spine/SkeletonAnimation.cpp
View File

@ -71,8 +71,8 @@ void disposeTrackEntry (spTrackEntry* entry) {
// //
SkeletonAnimation* SkeletonAnimation::createWithData (spSkeletonData* skeletonData) { SkeletonAnimation* SkeletonAnimation::createWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) {
SkeletonAnimation* node = new SkeletonAnimation(skeletonData); SkeletonAnimation* node = new SkeletonAnimation(skeletonData, ownsSkeletonData);
node->autorelease(); node->autorelease();
return node; return node;
} }
@ -103,8 +103,8 @@ SkeletonAnimation::SkeletonAnimation ()
: SkeletonRenderer() { : SkeletonRenderer() {
} }
SkeletonAnimation::SkeletonAnimation (spSkeletonData *skeletonData) SkeletonAnimation::SkeletonAnimation (spSkeletonData *skeletonData, bool ownsSkeletonData)
: SkeletonRenderer(skeletonData) { : SkeletonRenderer(skeletonData, ownsSkeletonData) {
initialize(); initialize();
} }

4
spine-cocos2dx/3/src/spine/SkeletonAnimation.h
View File

@ -47,7 +47,7 @@ typedef std::function<void(int trackIndex, spEvent* event)> EventListener;
* played later. */ * played later. */
class SkeletonAnimation: public SkeletonRenderer { class SkeletonAnimation: public SkeletonRenderer {
public: public:
static SkeletonAnimation* createWithData (spSkeletonData* skeletonData); static SkeletonAnimation* createWithData (spSkeletonData* skeletonData, bool ownsSkeletonData = false);
static SkeletonAnimation* createWithFile (const std::string& skeletonDataFile, spAtlas* atlas, float scale = 1); static SkeletonAnimation* createWithFile (const std::string& skeletonDataFile, spAtlas* atlas, float scale = 1);
static SkeletonAnimation* createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); static SkeletonAnimation* createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
@ -79,7 +79,7 @@ public:
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
SkeletonAnimation (); SkeletonAnimation ();
SkeletonAnimation (spSkeletonData* skeletonData); SkeletonAnimation (spSkeletonData* skeletonData, bool ownsSkeletonData = false);
SkeletonAnimation (const std::string&skeletonDataFile, spAtlas* atlas, float scale = 1); SkeletonAnimation (const std::string&skeletonDataFile, spAtlas* atlas, float scale = 1);
SkeletonAnimation (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); SkeletonAnimation (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
virtual ~SkeletonAnimation (); virtual ~SkeletonAnimation ();