UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always apply content scale.

Browse Source
This commit is contained in:
NathanSweet 2014-05-19 21:19:33 +02:00
parent df78473cf7
commit 305aabfc8a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp
View File

@ -99,7 +99,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas
initialize(); initialize();
spSkeletonJson* json = spSkeletonJson_create(atlas); 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); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile);
CCAssert(skeletonData, json->error ? json->error : "Error reading skeleton data."); CCAssert(skeletonData, json->error ? json->error : "Error reading skeleton data.");
spSkeletonJson_dispose(json); spSkeletonJson_dispose(json);
@ -114,7 +114,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* at
CCAssert(atlas, "Error reading atlas file."); CCAssert(atlas, "Error reading atlas file.");
spSkeletonJson* json = spSkeletonJson_create(atlas); 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); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile);
CCAssert(skeletonData, json->error ? json->error : "Error reading skeleton data file."); CCAssert(skeletonData, json->error ? json->error : "Error reading skeleton data file.");
spSkeletonJson_dispose(json); spSkeletonJson_dispose(json);

4
spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp
View File

@ -98,7 +98,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas
initialize(); initialize();
spSkeletonJson* json = spSkeletonJson_create(atlas); 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); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile);
CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data."); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data.");
spSkeletonJson_dispose(json); spSkeletonJson_dispose(json);
@ -113,7 +113,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* at
CCASSERT(atlas, "Error reading atlas file."); CCASSERT(atlas, "Error reading atlas file.");
spSkeletonJson* json = spSkeletonJson_create(atlas); 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); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile);
CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file."); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file.");
spSkeletonJson_dispose(json); spSkeletonJson_dispose(json);

4
spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp
View File

@ -98,7 +98,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, spAtlas* atlas
initialize(); initialize();
spSkeletonJson* json = spSkeletonJson_create(atlas); 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); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile);
CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data."); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data.");
spSkeletonJson_dispose(json); spSkeletonJson_dispose(json);
@ -113,7 +113,7 @@ SkeletonRenderer::SkeletonRenderer (const char* skeletonDataFile, const char* at
CCASSERT(atlas, "Error reading atlas file."); CCASSERT(atlas, "Error reading atlas file.");
spSkeletonJson* json = spSkeletonJson_create(atlas); 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); spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile);
CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file."); CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file.");
spSkeletonJson_dispose(json); spSkeletonJson_dispose(json);