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

Merge branch '3.8-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.8-beta

Browse Source
This commit is contained in:
badlogic 2019-06-05 17:31:54 +02:00
commit 625f9b076a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java
View File

@ -332,8 +332,8 @@ public class SkeletonBinary {
Skin skin = new Skin(defaultSkin ? "default" : input.readStringRef()); Skin skin = new Skin(defaultSkin ? "default" : input.readStringRef());
if (!defaultSkin) { if (!defaultSkin) {
Object[] bones = skeletonData.bones.setSize(input.readInt(true)); Object[] bones = skin.bones.setSize(input.readInt(true));
for (int i = 0, n = skeletonData.bones.size; i < n; i++) for (int i = 0, n = skin.bones.size; i < n; i++)
bones[i] = skeletonData.bones.get(input.readInt(true)); bones[i] = skeletonData.bones.get(input.readInt(true));
for (int i = 0, n = input.readInt(true); i < n; i++) for (int i = 0, n = input.readInt(true); i < n; i++)

12
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
View File

@ -132,10 +132,18 @@ public class JsonRollback {
static private void rollbackCurves (JsonValue map) { static private void rollbackCurves (JsonValue map) {
if (map == null) return; if (map == null) return;
if (map.isObject() && map.parent.isArray()) { // Probably a key.
if (!map.has("time")) map.addChild("time", new JsonValue(0f));
if (map.parent.name != null && map.parent.name.equals("rotate") && !map.has("angle"))
map.addChild("angle", new JsonValue(0f));
}
JsonValue curve = map.get("curve"); JsonValue curve = map.get("curve");
if (curve == null) { if (curve == null) {
for (map = map.child; map != null; map = map.next) if (map.name != null && map.name.equals("color")) System.out.println();
rollbackCurves(map); for (JsonValue child = map.child; child != null; child = child.next)
rollbackCurves(child);
return; return;
} }
if (curve.isNumber()) { if (curve.isNumber()) {