From 3b9dc8fd20d8f7407bebb15401d8df7e457fdd5f Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 7 Oct 2014 20:08:55 +0200 Subject: [PATCH] Skeleton data is optional. --- .../src/com/esotericsoftware/spine/SkeletonBinary.java | 6 ++++-- .../src/com/esotericsoftware/spine/SkeletonJson.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java index a5c343166..a7834d50a 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java @@ -108,15 +108,17 @@ public class SkeletonBinary { DataInput input = new DataInput(file.read(512)); try { skeletonData.hash = input.readString(); + if (skeletonData.hash.isEmpty()) skeletonData.hash = null; skeletonData.version = input.readString(); + if (skeletonData.version.isEmpty()) skeletonData.version = null; skeletonData.width = input.readFloat(); skeletonData.height = input.readFloat(); boolean nonessential = input.readBoolean(); if (nonessential) { - String imagesPath = input.readString(); - if (imagesPath.length() > 0) skeletonData.imagesPath = imagesPath; + skeletonData.imagesPath = input.readString(); + if (skeletonData.imagesPath.isEmpty()) skeletonData.imagesPath = null; } // Bones. diff --git a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index e18a7be94..1bf073fae 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -95,10 +95,10 @@ public class SkeletonJson { // Skeleton. JsonValue skeletonMap = root.get("skeleton"); if (skeletonMap != null) { - skeletonData.hash = skeletonMap.getString("hash"); - skeletonData.version = skeletonMap.getString("spine"); - skeletonData.width = skeletonMap.getFloat("width"); - skeletonData.height = skeletonMap.getFloat("height"); + skeletonData.hash = skeletonMap.getString("hash", null); + skeletonData.version = skeletonMap.getString("spine", null); + skeletonData.width = skeletonMap.getFloat("width", 0); + skeletonData.height = skeletonMap.getFloat("height", 0); skeletonData.imagesPath = skeletonMap.getString("images", null); }