From 7073e262cd70ecd19aab242982ab5e6e9d9646d4 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Wed, 5 Aug 2015 14:48:00 +0200 Subject: [PATCH] Fixed atlas leak. --- spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp | 17 ++++++++--------- spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp index 0710616d3..2e0a4e2b4 100644 --- a/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp @@ -62,11 +62,6 @@ SkeletonRenderer* SkeletonRenderer::createWithFile (const char* skeletonDataFile } void SkeletonRenderer::initialize () { - atlas = 0; - debugSlots = false; - debugBones = false; - timeScale = 1; - worldVertices = MALLOC(float, 1000); // Max number of vertices per mesh. batch = PolygonBatch::createWithCapacity(2000); // Max number of vertices and triangles per batch. @@ -86,17 +81,20 @@ void SkeletonRenderer::setSkeletonData (spSkeletonData *skeletonData, bool ownsS this->ownsSkeletonData = ownsSkeletonData; } -SkeletonRenderer::SkeletonRenderer () { +SkeletonRenderer::SkeletonRenderer () + : atlas(0), debugSlots(false), debugBones(false), timeScale(1) { initialize(); } -SkeletonRenderer::SkeletonRenderer (spSkeletonData *skeletonData, bool ownsSkeletonData) { +SkeletonRenderer::SkeletonRenderer (spSkeletonData *skeletonData, bool ownsSkeletonData) + : atlas(0), debugSlots(false), debugBones(false), timeScale(1) { initialize(); setSkeletonData(skeletonData, ownsSkeletonData); } -SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas, float scale) { +SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas, float scale) + : atlas(0), debugSlots(false), debugBones(false), timeScale(1) { initialize(); spSkeletonJson* json = spSkeletonJson_create(atlas); @@ -108,7 +106,8 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas setSkeletonData(skeletonData, true); } -SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* atlasFile, float scale) { +SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* atlasFile, float scale) + : atlas(0), debugSlots(false), debugBones(false), timeScale(1) { initialize(); atlas = spAtlas_createFromFile(atlasFile, 0); diff --git a/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp index 3328bd2ec..c76d593e6 100644 --- a/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/3/src/spine/SkeletonRenderer.cpp @@ -62,11 +62,6 @@ SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonD } void SkeletonRenderer::initialize () { - _atlas = 0; - _debugSlots = false; - _debugBones = false; - _timeScale = 1; - _worldVertices = MALLOC(float, 1000); // Max number of vertices per mesh. _batch = PolygonBatch::createWithCapacity(2000); // Max number of vertices and triangles per batch. @@ -83,18 +78,22 @@ void SkeletonRenderer::setSkeletonData (spSkeletonData *skeletonData, bool ownsS _ownsSkeletonData = ownsSkeletonData; } -SkeletonRenderer::SkeletonRenderer () { +SkeletonRenderer::SkeletonRenderer () + : _atlas(0), _debugSlots(false), _debugBones(false), _timeScale(1) { } -SkeletonRenderer::SkeletonRenderer (spSkeletonData *skeletonData, bool ownsSkeletonData) { +SkeletonRenderer::SkeletonRenderer (spSkeletonData *skeletonData, bool ownsSkeletonData) + : _atlas(0), _debugSlots(false), _debugBones(false), _timeScale(1) { initWithData(skeletonData, ownsSkeletonData); } -SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, spAtlas* atlas, float scale) { +SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, spAtlas* atlas, float scale) + : _atlas(0), _debugSlots(false), _debugBones(false), _timeScale(1) { initWithFile(skeletonDataFile, atlas, scale); } -SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) { +SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) + : _atlas(0), _debugSlots(false), _debugBones(false), _timeScale(1) { initWithFile(skeletonDataFile, atlasFile, scale); }