UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-19 00:06:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cpp] 4.3 porting WIP

Browse Source
This commit is contained in:
Mario Zechner 2025-07-05 03:28:39 +02:00
parent 9deb524a70
commit 8ff8680035
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
View File

@ -346,7 +346,7 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
to->offset = Json::getFloat(toEntry, "offset", 0) * toScale;
to->max = Json::getFloat(toEntry, "max", 1) * toScale;
to->scale = Json::getFloat(toEntry, "scale", 0) * toScale / fromScale;
to->scale = Json::getFloat(toEntry, "scale", 1) * toScale / fromScale;
from->to.add(to);
}
}
@ -596,7 +596,7 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
const char *type = Json::getString(constraintMap, "type", 0);
if (strcmp(type, "slider") == 0) {
SliderData *data = skeletonData->findConstraint<SliderData>(Json::getString(constraintMap, "name", NULL));
const char *animationName = Json::getString(constraintMap, "animation", 0);
const char *animationName = Json::getString(constraintMap, "animation", NULL);
if (animationName) {
data->_animation = skeletonData->findAnimation(animationName);
if (!data->_animation) SKELETON_JSON_ERROR(root, "Slider animation not found: ", animationName);
@ -806,7 +806,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
timeline->setFrame(frame, time, color.r, color.g, color.b, color.a);
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
float time2 = Json::getFloat(nextMap, "time", 0);
@ -839,7 +838,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
timeline->setFrame(frame, time, color.r, color.g, color.b);
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
float time2 = Json::getFloat(nextMap, "time", 0);
@ -881,7 +879,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
timeline->setFrame(frame, time, color.r, color.g, color.b, color.a, color2.r, color2.g, color2.b);
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
float time2 = Json::getFloat(nextMap, "time", 0);
@ -930,7 +927,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
timeline->setFrame(frame, time, color.r, color.g, color.b, color2.r, color2.g, color2.b);
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
float time2 = Json::getFloat(nextMap, "time", 0);
@ -1038,7 +1034,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
Json::getBoolean(keyMap, "compress", false), Json::getBoolean(keyMap, "stretch", false));
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
@ -1080,7 +1075,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
timeline->setFrame(frame, time, mixRotate, mixX, mixY, mixScaleX, mixScaleY, mixShearY);
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
float time2 = Json::getFloat(nextMap, "time", 0);
@ -1148,7 +1142,6 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
timeline->setFrame(frame, time, mixRotate, mixX, mixY);
Json *nextMap = keyMap->_next;
if (!nextMap) {
// timeline.shrink(); // BOZO
break;
}
float time2 = Json::getFloat(nextMap, "time", 0);