UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c][cpp] Closes #2551, fix inherit transform timelines

Browse Source
This commit is contained in:
Mario Zechner 2024-06-13 18:02:32 +02:00
parent 314636aa07
commit ccac475c81
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -535,7 +535,7 @@ static spAnimation *_spSkeletonJson_readAnimation(spSkeletonJson *self, Json *ro
keyMap = timelineMap->child; keyMap = timelineMap->child;
for (frame = 0;; frame++) { for (frame = 0;; frame++) {
float time = Json_getFloat(keyMap, "time", 0); float time = Json_getFloat(keyMap, "time", 0);
const char *value = Json_getString(keyMap, "value", "normal"); const char *value = Json_getString(keyMap, "inherit", "normal");
spInherit inherit = SP_INHERIT_NORMAL; spInherit inherit = SP_INHERIT_NORMAL;
if (strcmp(value, "normal") == 0) inherit = SP_INHERIT_NORMAL; if (strcmp(value, "normal") == 0) inherit = SP_INHERIT_NORMAL;
else if (strcmp(value, "onlyTranslation") == 0) else if (strcmp(value, "onlyTranslation") == 0)

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

@ -1160,7 +1160,7 @@ Animation *SkeletonJson::readAnimation(Json *root, SkeletonData *skeletonData) {
keyMap = timelineMap->_child; keyMap = timelineMap->_child;
for (frame = 0;; frame++) { for (frame = 0;; frame++) {
float time = Json::getFloat(keyMap, "time", 0); float time = Json::getFloat(keyMap, "time", 0);
const char *value = Json::getString(keyMap, "value", "normal"); const char *value = Json::getString(keyMap, "inherit", "normal");
Inherit inherit = Inherit_Normal; Inherit inherit = Inherit_Normal;
if (strcmp(value, "normal") == 0) inherit = Inherit_Normal; if (strcmp(value, "normal") == 0) inherit = Inherit_Normal;
else if (strcmp(value, "onlyTranslation") == 0) else if (strcmp(value, "onlyTranslation") == 0)