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

Fixed zero bone scale.

Browse Source
This commit is contained in:
NathanSweet 2014-05-21 20:16:36 +02:00
parent da960ae935
commit 9512e56a3d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-js/spine.js
View File

@ -1157,8 +1157,8 @@ spine.SkeletonJson.prototype = {
boneData.x = (boneMap["x"] || 0) * this.scale; boneData.x = (boneMap["x"] || 0) * this.scale;
boneData.y = (boneMap["y"] || 0) * this.scale; boneData.y = (boneMap["y"] || 0) * this.scale;
boneData.rotation = (boneMap["rotation"] || 0); boneData.rotation = (boneMap["rotation"] || 0);
boneData.scaleX = boneMap["scaleX"] || 1; boneData.scaleX = boneMap.hasOwnProperty("scaleX") ? boneMap["scaleX"] : 1;
boneData.scaleY = boneMap["scaleY"] || 1; boneData.scaleY = boneMap.hasOwnProperty("scaleY") ? boneMap["scaleY"] : 1;
boneData.inheritScale = !boneMap["inheritScale"] || boneMap["inheritScale"] == "true"; boneData.inheritScale = !boneMap["inheritScale"] || boneMap["inheritScale"] == "true";
boneData.inheritRotation = !boneMap["inheritRotation"] || boneMap["inheritRotation"] == "true"; boneData.inheritRotation = !boneMap["inheritRotation"] || boneMap["inheritRotation"] == "true";
skeletonData.bones.push(boneData); skeletonData.bones.push(boneData);
@ -1236,11 +1236,11 @@ spine.SkeletonJson.prototype = {
if (type == spine.AttachmentType.region) { if (type == spine.AttachmentType.region) {
attachment.x = (map["x"] || 0) * this.scale; attachment.x = (map["x"] || 0) * this.scale;
attachment.y = (map["y"] || 0) * this.scale; attachment.y = (map["y"] || 0) * this.scale;
attachment.scaleX = map["scaleX"] || 1; attachment.scaleX = map.hasOwnProperty("scaleX") ? map["scaleX"] : 1;
attachment.scaleY = map["scaleY"] || 1; attachment.scaleY = map.hasOwnProperty("scaleY") ? map["scaleY"] : 1;
attachment.rotation = map["rotation"] || 0; attachment.rotation = map["rotation"] || 0;
attachment.width = (map["width"] || 32) * this.scale; attachment.width = (map["width"] || 0) * this.scale;
attachment.height = (map["height"] || 32) * this.scale; attachment.height = (map["height"] || 0) * this.scale;
attachment.updateOffset(); attachment.updateOffset();
} else if (type == spine.AttachmentType.boundingbox) { } else if (type == spine.AttachmentType.boundingbox) {
var vertices = map["vertices"]; var vertices = map["vertices"];