Merge pull request #240 from matulkum/master

enable SkeletonJson to load Objects (not just Strings)
This commit is contained in:
Nathan Sweet 2014-07-25 22:31:10 +02:00
commit 0a640b4432

View File

@ -69,18 +69,19 @@ public class SkeletonJson {
if (object == null) if (object == null)
throw new ArgumentError("object cannot be null."); throw new ArgumentError("object cannot be null.");
var json:String; var root:Object
if (object is String) if (object is String)
json = String(object); root = JSON.parse(String(object));
else if (object is ByteArray) else if (object is ByteArray)
json = object.readUTFBytes(object.length); root = JSON.parse(object.readUTFBytes(object.length));
else if (object is Object)
root = object;
else else
throw new ArgumentError("object must be a String or ByteArray."); throw new ArgumentError("object must be a String, ByteArray or Object.");
var skeletonData:SkeletonData = new SkeletonData(); var skeletonData:SkeletonData = new SkeletonData();
skeletonData.name = name; skeletonData.name = name;
var root:Object = JSON.parse(json);
// Bones. // Bones.
var boneData:BoneData; var boneData:BoneData;