diff --git a/spine-cocos2dx/3/src/spine/SkeletonAnimation.cpp b/spine-cocos2dx/3/src/spine/SkeletonAnimation.cpp index 66d64a6ed..bdaccddd4 100644 --- a/spine-cocos2dx/3/src/spine/SkeletonAnimation.cpp +++ b/spine-cocos2dx/3/src/spine/SkeletonAnimation.cpp @@ -100,7 +100,6 @@ void SkeletonAnimation::initialize () { SkeletonAnimation::SkeletonAnimation () : SkeletonRenderer() { - initialize(); } SkeletonAnimation::SkeletonAnimation (spSkeletonData *skeletonData) diff --git a/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp index a11df22d4..b1d4b6c3b 100644 --- a/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp @@ -83,7 +83,6 @@ void SkeletonRenderer::setSkeletonData (spSkeletonData *skeletonData, bool ownsS } SkeletonRenderer::SkeletonRenderer () { - initialize(); } SkeletonRenderer::SkeletonRenderer (spSkeletonData *skeletonData, bool ownsSkeletonData) { @@ -106,15 +105,13 @@ SkeletonRenderer::~SkeletonRenderer () { FREE(_worldVertices); } -void SkeletonRenderer::initWithData (spSkeletonData* skeletonData, bool ownsSkeletonData = false) { - initialize(); - +void SkeletonRenderer::initWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) { setSkeletonData(skeletonData, ownsSkeletonData); + + initialize(); } -void SkeletonRenderer::initWithFile (const std::string& skeletonDataFile, spAtlas* atlas, float scale = 1) { - initialize(); - +void SkeletonRenderer::initWithFile (const std::string& skeletonDataFile, spAtlas* atlas, float scale) { spSkeletonJson* json = spSkeletonJson_create(atlas); json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile.c_str()); @@ -122,11 +119,11 @@ void SkeletonRenderer::initWithFile (const std::string& skeletonDataFile, spAtla spSkeletonJson_dispose(json); setSkeletonData(skeletonData, true); + + initialize(); } -void SkeletonRenderer::initWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1) { - initialize(); - +void SkeletonRenderer::initWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) { _atlas = spAtlas_createFromFile(atlasFile.c_str(), 0); CCASSERT(_atlas, "Error reading atlas file."); @@ -137,6 +134,8 @@ void SkeletonRenderer::initWithFile (const std::string& skeletonDataFile, const spSkeletonJson_dispose(json); setSkeletonData(skeletonData, true); + + initialize(); }