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

[libgdx] Fixes for JsonRollback (to 3.7).

Browse Source
This commit is contained in:
NathanSweet 2019-08-20 18:59:44 +02:00
parent 47dbc797ef
commit c167d8bc52
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,8 +135,14 @@ public class JsonRollback {
if (map.isObject() && map.parent.isArray()) { // Probably a key. if (map.isObject() && map.parent.isArray()) { // Probably a key.
if (!map.has("time")) map.addChild("time", new JsonValue(0f)); if (!map.has("time")) map.addChild("time", new JsonValue(0f));
if (map.parent.name != null && map.parent.name.equals("rotate") && !map.has("angle")) if (map.parent.name != null) {
map.addChild("angle", new JsonValue(0f)); if (map.parent.name.equals("rotate") && !map.has("angle"))
map.addChild("angle", new JsonValue(0f));
else if (map.parent.name.equals("scale")) {
if (!map.has("x")) map.addChild("x", new JsonValue(1f));
if (!map.has("y")) map.addChild("y", new JsonValue(1f));
}
}
} }
JsonValue curve = map.get("curve"); JsonValue curve = map.get("curve");
@ -149,8 +155,8 @@ public class JsonRollback {
curve.addChild(new JsonValue(curve.asFloat())); curve.addChild(new JsonValue(curve.asFloat()));
curve.setType(ValueType.array); curve.setType(ValueType.array);
curve.addChild(new JsonValue(map.getFloat("c2", 0))); curve.addChild(new JsonValue(map.getFloat("c2", 0)));
curve.addChild(new JsonValue(map.getFloat("c3", 0))); curve.addChild(new JsonValue(map.getFloat("c3", 1)));
curve.addChild(new JsonValue(map.getFloat("c4", 0))); curve.addChild(new JsonValue(map.getFloat("c4", 1)));
map.remove("c2"); map.remove("c2");
map.remove("c3"); map.remove("c3");
map.remove("c4"); map.remove("c4");