diff --git a/spine-cocos2d-iphone/2/src/spine/SkeletonRenderer.m b/spine-cocos2d-iphone/2/src/spine/SkeletonRenderer.m index 2960abe04..32a4f3d61 100644 --- a/spine-cocos2d-iphone/2/src/spine/SkeletonRenderer.m +++ b/spine-cocos2d-iphone/2/src/spine/SkeletonRenderer.m @@ -92,7 +92,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0}; if (!self) return nil; spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / CC_CONTENT_SCALE_FACTOR(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]); NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error])); spSkeletonJson_dispose(json); @@ -112,7 +112,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0}; if (!_atlas) return 0; spSkeletonJson* json = spSkeletonJson_create(_atlas); - json->scale = scale / CC_CONTENT_SCALE_FACTOR(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]); NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error])); spSkeletonJson_dispose(json); diff --git a/spine-cocos2d-iphone/3.0/src/spine/SkeletonRenderer.m b/spine-cocos2d-iphone/3.0/src/spine/SkeletonRenderer.m index 27210e5cb..db0a1521a 100644 --- a/spine-cocos2d-iphone/3.0/src/spine/SkeletonRenderer.m +++ b/spine-cocos2d-iphone/3.0/src/spine/SkeletonRenderer.m @@ -93,7 +93,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0}; if (!self) return nil; spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale == 0 ? (1 / [CCDirector sharedDirector].contentScaleFactor) : scale; + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]); NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error])); spSkeletonJson_dispose(json); @@ -113,7 +113,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0}; if (!_atlas) return 0; spSkeletonJson* json = spSkeletonJson_create(_atlas); - json->scale = scale / [CCDirector sharedDirector].contentScaleFactor; + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]); NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error])); spSkeletonJson_dispose(json); diff --git a/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp index 704f6d6f9..8ff54fbd8 100644 --- a/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp @@ -99,7 +99,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas initialize(); spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / CCDirector::sharedDirector()->getContentScaleFactor(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCAssert(skeletonData, json->error ? json->error : "Error reading skeleton data."); spSkeletonJson_dispose(json); @@ -114,7 +114,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* at CCAssert(atlas, "Error reading atlas file."); spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / CCDirector::sharedDirector()->getContentScaleFactor(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCAssert(skeletonData, json->error ? json->error : "Error reading skeleton data file."); spSkeletonJson_dispose(json); diff --git a/spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp index a921bbb8b..0635a7a4b 100644 --- a/spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp @@ -98,7 +98,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas initialize(); spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / Director::getInstance()->getContentScaleFactor(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data."); spSkeletonJson_dispose(json); @@ -113,7 +113,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* at CCASSERT(atlas, "Error reading atlas file."); spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / Director::getInstance()->getContentScaleFactor(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file."); spSkeletonJson_dispose(json); diff --git a/spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp index e710de72c..784952983 100644 --- a/spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp @@ -98,7 +98,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas initialize(); spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / Director::getInstance()->getContentScaleFactor(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data."); spSkeletonJson_dispose(json); @@ -113,7 +113,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* at CCASSERT(atlas, "Error reading atlas file."); spSkeletonJson* json = spSkeletonJson_create(atlas); - json->scale = scale / Director::getInstance()->getContentScaleFactor(); + json->scale = scale; spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file."); spSkeletonJson_dispose(json);