From 305aabfc8a8471595a4cb8f39724b83961277357 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 19 May 2014 21:19:33 +0200 Subject: [PATCH] Always apply content scale. --- spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp | 4 ++-- spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp | 4 ++-- spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp index 651a17a90..3fea750eb 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 == 0 ? (1 / CCDirector::sharedDirector()->getContentScaleFactor()) : scale; + json->scale = scale / CCDirector::sharedDirector()->getContentScaleFactor(); 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 == 0 ? (1 / CCDirector::sharedDirector()->getContentScaleFactor()) : scale; + json->scale = scale / CCDirector::sharedDirector()->getContentScaleFactor(); 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 a1495695a..abe749522 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 == 0 ? (1 / Director::getInstance()->getContentScaleFactor()) : scale; + json->scale = scale / Director::getInstance()->getContentScaleFactor(); 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 == 0 ? (1 / Director::getInstance()->getContentScaleFactor()) : scale; + json->scale = scale / Director::getInstance()->getContentScaleFactor(); 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 0a57f1549..0765b8928 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 == 0 ? (1 / Director::getInstance()->getContentScaleFactor()) : scale; + json->scale = scale / Director::getInstance()->getContentScaleFactor(); 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 == 0 ? (1 / Director::getInstance()->getContentScaleFactor()) : scale; + json->scale = scale / Director::getInstance()->getContentScaleFactor(); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file."); spSkeletonJson_dispose(json);