UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 17:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[runtime] Revert changes to owl-pro.spine

Browse Source 
Conversion to 4.0.31 and export breaks additive blending even more.
This commit is contained in:
Mario Zechner 2021-09-14 00:21:12 +02:00
parent 67c0d39eab
commit c41cc94008
12 changed files with 7 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/owl/export/owl-pro.json
View File

@ -1,6 +1,6 @@
{ {
"skeleton": { "skeleton": {
"hash": "5OTv2PhCedw", "hash": "D48YMP6TYgI",
"spine": "4.0.31", "spine": "4.0.31",
"x": -644, "x": -644,
"y": -274, "y": -274,
@ -696,17 +696,6 @@
{ "time": 6, "value": -4.1 }, { "time": 6, "value": -4.1 },
{ "time": 6.6667 } { "time": 6.6667 }
] ]
},
"control": {
"rotate": [
{}
],
"translate": [
{}
],
"scale": [
{}
]
} }
} }
}, },

BIN
examples/owl/export/owl-pro.skel
View File

Binary file not shown.

BIN
examples/owl/owl-pro.spine
View File

Binary file not shown.

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

@ -349,7 +349,7 @@ void Skeleton::setSkin(Skin *newSkin) {
} }
Attachment *Skeleton::getAttachment(const String &slotName, const String &attachmentName) { Attachment *Skeleton::getAttachment(const String &slotName, const String &attachmentName) {
return getAttachment(_data->findSlot(slotName)->index, attachmentName); return getAttachment(_data->findSlot(slotName)->getIndex(), attachmentName);
} }
Attachment *Skeleton::getAttachment(int slotIndex, const String &attachmentName) { Attachment *Skeleton::getAttachment(int slotIndex, const String &attachmentName) {

13
spine-sfml/c/data/owl-pro.json
View File

@ -1,6 +1,6 @@
{ {
"skeleton": { "skeleton": {
"hash": "5OTv2PhCedw", "hash": "D48YMP6TYgI",
"spine": "4.0.31", "spine": "4.0.31",
"x": -644, "x": -644,
"y": -274, "y": -274,
@ -696,17 +696,6 @@
{ "time": 6, "value": -4.1 }, { "time": 6, "value": -4.1 },
{ "time": 6.6667 } { "time": 6.6667 }
] ]
},
"control": {
"rotate": [
{}
],
"translate": [
{}
],
"scale": [
{}
]
} }
} }
}, },

BIN
spine-sfml/c/data/owl-pro.skel
View File

Binary file not shown.

13
spine-sfml/cpp/data/owl-pro.json
View File

@ -1,6 +1,6 @@
{ {
"skeleton": { "skeleton": {
"hash": "5OTv2PhCedw", "hash": "D48YMP6TYgI",
"spine": "4.0.31", "spine": "4.0.31",
"x": -644, "x": -644,
"y": -274, "y": -274,
@ -696,17 +696,6 @@
{ "time": 6, "value": -4.1 }, { "time": 6, "value": -4.1 },
{ "time": 6.6667 } { "time": 6.6667 }
] ]
},
"control": {
"rotate": [
{}
],
"translate": [
{}
],
"scale": [
{}
]
} }
} }
}, },

BIN
spine-sfml/cpp/data/owl-pro.skel
View File

Binary file not shown.

13
spine-solar2d/data/owl-pro.json
View File

@ -1,6 +1,6 @@
{ {
"skeleton": { "skeleton": {
"hash": "5OTv2PhCedw", "hash": "D48YMP6TYgI",
"spine": "4.0.31", "spine": "4.0.31",
"x": -644, "x": -644,
"y": -274, "y": -274,
@ -696,17 +696,6 @@
{ "time": 6, "value": -4.1 }, { "time": 6, "value": -4.1 },
{ "time": 6.6667 } { "time": 6.6667 }
] ]
},
"control": {
"rotate": [
{}
],
"translate": [
{}
],
"scale": [
{}
]
} }
} }
}, },

13
spine-starling/spine-starling-example/src/owl-pro.json
View File

@ -1,6 +1,6 @@
{ {
"skeleton": { "skeleton": {
"hash": "5OTv2PhCedw", "hash": "D48YMP6TYgI",
"spine": "4.0.31", "spine": "4.0.31",
"x": -644, "x": -644,
"y": -274, "y": -274,
@ -696,17 +696,6 @@
{ "time": 6, "value": -4.1 }, { "time": 6, "value": -4.1 },
{ "time": 6.6667 } { "time": 6.6667 }
] ]
},
"control": {
"rotate": [
{}
],
"translate": [
{}
],
"scale": [
{}
]
} }
} }
}, },

13
spine-ts/spine-webgl/example/assets/owl-pro.json
View File

@ -1,6 +1,6 @@
{ {
"skeleton": { "skeleton": {
"hash": "5OTv2PhCedw", "hash": "D48YMP6TYgI",
"spine": "4.0.31", "spine": "4.0.31",
"x": -644, "x": -644,
"y": -274, "y": -274,
@ -696,17 +696,6 @@
{ "time": 6, "value": -4.1 }, { "time": 6, "value": -4.1 },
{ "time": 6.6667 } { "time": 6.6667 }
] ]
},
"control": {
"rotate": [
{}
],
"translate": [
{}
],
"scale": [
{}
]
} }
} }
}, },

BIN
spine-ts/spine-webgl/example/assets/owl-pro.skel
View File

Binary file not shown.