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

Clean up.

Browse Source
This commit is contained in:
NathanSweet 2014-11-14 01:47:39 +01:00
parent fbd9a2057e
commit 9dcaeb6853
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-as3/spine-as3/src/spine/SkeletonJson.as
View File

@ -103,8 +103,8 @@ public class SkeletonJson {
boneData.rotation = (boneMap["rotation"] || 0); boneData.rotation = (boneMap["rotation"] || 0);
boneData.scaleX = boneMap.hasOwnProperty("scaleX") ? boneMap["scaleX"] : 1; boneData.scaleX = boneMap.hasOwnProperty("scaleX") ? boneMap["scaleX"] : 1;
boneData.scaleY = boneMap.hasOwnProperty("scaleY") ? boneMap["scaleY"] : 1; boneData.scaleY = boneMap.hasOwnProperty("scaleY") ? boneMap["scaleY"] : 1;
boneData.flipX = boneMap.hasOwnProperty("flipX") ? boneMap["flipX"] : false; boneData.flipX = boneMap["flipX"] || false;
boneData.flipY = boneMap.hasOwnProperty("flipY") ? boneMap["flipY"] : false; boneData.flipY = boneMap["flipY"] || false;
boneData.inheritScale = boneMap.hasOwnProperty("inheritScale") ? boneMap["inheritScale"] : true; boneData.inheritScale = boneMap.hasOwnProperty("inheritScale") ? boneMap["inheritScale"] : true;
boneData.inheritRotation = boneMap.hasOwnProperty("inheritRotation") ? boneMap["inheritRotation"] : true; boneData.inheritRotation = boneMap.hasOwnProperty("inheritRotation") ? boneMap["inheritRotation"] : true;
skeletonData.bones[skeletonData.bones.length] = boneData; skeletonData.bones[skeletonData.bones.length] = boneData;
@ -394,7 +394,7 @@ public class SkeletonJson {
var field:String = flipX ? "x" : "y"; var field:String = flipX ? "x" : "y";
frameIndex = 0; frameIndex = 0;
for each (valueMap in values) { for each (valueMap in values) {
flipTimeline.setFrame(frameIndex, valueMap["time"], valueMap.hasOwnProperty(field) ? valueMap[field] : false); flipTimeline.setFrame(frameIndex, valueMap["time"], valueMap[field] || false);
frameIndex++; frameIndex++;
} }
timelines[timelines.length] = flipTimeline; timelines[timelines.length] = flipTimeline;