Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: 1c05947474 7dd7422abd 

Merge branch 'adxeproject:dev' into dev
This commit is contained in:
aismann 2021-08-27 08:33:22 +02:00 committed by GitHub
parent fc1c901209
commit 74dfe14b16
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/spine/SkeletonRenderer.cpp
View File

@ -188,7 +188,7 @@ void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, At
SkeletonJson json(_attachmentLoader); SkeletonJson json(_attachmentLoader);
json.setScale(scale); json.setScale(scale);
SkeletonData* skeletonData = json.readSkeletonDataFile(skeletonDataFile.c_str()); SkeletonData* skeletonData = json.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data."); CCASSERT(skeletonData, (!json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true; _ownsSkeleton = true;
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);
@ -205,7 +205,7 @@ void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, co
SkeletonJson json(_attachmentLoader); SkeletonJson json(_attachmentLoader);
json.setScale(scale); json.setScale(scale);
SkeletonData* skeletonData = json.readSkeletonDataFile(skeletonDataFile.c_str()); SkeletonData* skeletonData = json.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data."); CCASSERT(skeletonData, (!json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true; _ownsSkeleton = true;
_ownsAtlas = true; _ownsAtlas = true;
@ -221,7 +221,7 @@ void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile,
SkeletonBinary binary(_attachmentLoader); SkeletonBinary binary(_attachmentLoader);
binary.setScale(scale); binary.setScale(scale);
SkeletonData* skeletonData = binary.readSkeletonDataFile(skeletonDataFile.c_str()); SkeletonData* skeletonData = binary.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data."); CCASSERT(skeletonData, (!binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true; _ownsSkeleton = true;
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);
@ -237,7 +237,7 @@ void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile,
SkeletonBinary binary(_attachmentLoader); SkeletonBinary binary(_attachmentLoader);
binary.setScale(scale); binary.setScale(scale);
SkeletonData* skeletonData = binary.readSkeletonDataFile(skeletonDataFile.c_str()); SkeletonData* skeletonData = binary.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data."); CCASSERT(skeletonData, (!binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true; _ownsSkeleton = true;
_ownsAtlas = true; _ownsAtlas = true;
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);

2
tests/cpp-tests/Classes/SpineTest/SpineTest.cpp
View File

@ -150,7 +150,7 @@ bool BatchingExample::init () {
SkeletonJson* json = new (__FILE__, __LINE__) SkeletonJson(_attachmentLoader); SkeletonJson* json = new (__FILE__, __LINE__) SkeletonJson(_attachmentLoader);
json->setScale(0.6f); // Resizes skeleton data to 60% of the size it was in Spine. json->setScale(0.6f); // Resizes skeleton data to 60% of the size it was in Spine.
_skeletonData = json->readSkeletonDataFile("spineboy-pro.json"); _skeletonData = json->readSkeletonDataFile("spineboy-pro.json");
CCASSERT(_skeletonData, json->getError().isEmpty() ? json->getError().buffer() : "Error reading skeleton data file."); CCASSERT(_skeletonData, (json->getError().isEmpty() ? json->getError().buffer() : "Error reading skeleton data file."));
delete json; delete json;
// Setup mix times. // Setup mix times.