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 additive always being used.

Browse Source
This commit is contained in:
NathanSweet 2013-12-05 11:12:52 +01:00
parent 99fd4c34a4
commit dff7b5ee77
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-js/spine.js
View File

@ -85,7 +85,7 @@ spine.Bone.prototype = {
this.worldRotation = this.data.inheritRotation ? parent.worldRotation + this.rotation : this.rotation; this.worldRotation = this.data.inheritRotation ? parent.worldRotation + this.rotation : this.rotation;
} else { } else {
this.worldX = flipX ? -this.x : this.x; this.worldX = flipX ? -this.x : this.x;
this.worldY = (flipY != spine.Bone.yDown) ? -this.y : this.y; this.worldY = (flipY && spine.Bone.yDown != flipY) ? -this.y : this.y;
this.worldScaleX = this.scaleX; this.worldScaleX = this.scaleX;
this.worldScaleY = this.scaleY; this.worldScaleY = this.scaleY;
this.worldRotation = this.rotation; this.worldRotation = this.rotation;
@ -540,7 +540,7 @@ spine.EventTimeline.prototype = {
var frameCount = frames.length; var frameCount = frames.length;
if (lastTime > time) { // Fire events after last time for looped animations. if (lastTime > time) { // Fire events after last time for looped animations.
apply(skeleton, lastTime, Number.MAX_VALUE, firedEvents, alpha); this.apply(skeleton, lastTime, Number.MAX_VALUE, firedEvents, alpha);
lastTime = -1; lastTime = -1;
} else if (lastTime >= frames[frameCount - 1]) // Last time is after last frame. } else if (lastTime >= frames[frameCount - 1]) // Last time is after last frame.
return; return;
@ -1150,8 +1150,8 @@ spine.SkeletonJson.prototype = {
boneData.rotation = (boneMap["rotation"] || 0); boneData.rotation = (boneMap["rotation"] || 0);
boneData.scaleX = boneMap["scaleX"] || 1; boneData.scaleX = boneMap["scaleX"] || 1;
boneData.scaleY = boneMap["scaleY"] || 1; boneData.scaleY = boneMap["scaleY"] || 1;
boneData.inheritScale = boneMap["inheritScale"] == "false" ? false : true; boneData.inheritScale = !boneMap["inheritScale"] || boneMap["inheritScale"] == "true";
boneData.inheritRotation = boneMap["inheritRotation"] == "false" ? false : true; boneData.inheritRotation = !boneMap["inheritRotation"] || boneMap["inheritRotation"] == "true";
skeletonData.bones.push(boneData); skeletonData.bones.push(boneData);
} }
@ -1172,7 +1172,7 @@ spine.SkeletonJson.prototype = {
} }
slotData.attachmentName = slotMap["attachment"]; slotData.attachmentName = slotMap["attachment"];
slotData.additiveBlending = slotMap["additive"] == "false" ? false : true; slotData.additiveBlending = slotMap["additive"] && slotMap["additive"] == "true";
skeletonData.slots.push(slotData); skeletonData.slots.push(slotData);
} }