UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inherit scale/rotation and additive blending for spine-js.

Browse Source
This commit is contained in:
NathanSweet 2013-09-24 16:58:29 +02:00
parent 1caa8eaadd
commit 72f8f98a54
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spine-js/spine.js
View File

@ -41,7 +41,9 @@ spine.BoneData.prototype = {
length: 0,
x: 0, y: 0,
rotation: 0,
scaleX: 1, scaleY: 1
scaleX: 1, scaleY: 1,
inheritScale: true,
inheritRotation: true
};
spine.SlotData = function (name, boneData) {
@ -50,7 +52,8 @@ spine.SlotData = function (name, boneData) {
};
spine.SlotData.prototype = {
r: 1, g: 1, b: 1, a: 1,
attachmentName: null
attachmentName: null,
additiveBlending: false
};
spine.Bone = function (boneData, parent) {
@ -72,9 +75,14 @@ spine.Bone.prototype = {
if (parent != null) {
this.worldX = this.x * parent.m00 + this.y * parent.m01 + parent.worldX;
this.worldY = this.x * parent.m10 + this.y * parent.m11 + parent.worldY;
this.worldScaleX = parent.worldScaleX * this.scaleX;
this.worldScaleY = parent.worldScaleY * this.scaleY;
this.worldRotation = parent.worldRotation + this.rotation;
if (this.data.inheritScale) {
this.worldScaleX = parent.worldScaleX * this.scaleX;
this.worldScaleY = parent.worldScaleY * this.scaleY;
} else {
this.worldScaleX = this.scaleX;
this.worldScaleY = this.scaleY;
}
this.worldRotation = this.data.inheritRotation ? parent.worldRotation + this.rotation : this.rotation;
} else {
this.worldX = this.x;
this.worldY = this.y;
@ -920,6 +928,8 @@ spine.SkeletonJson.prototype = {
boneData.rotation = (boneMap["rotation"] || 0);
boneData.scaleX = boneMap["scaleX"] || 1;
boneData.scaleY = boneMap["scaleY"] || 1;
boneData.inheritScale = boneMap["inheritScale"] || true;
boneData.inheritRotation = boneMap["inheritRotation"] || true;
skeletonData.bones.push(boneData);
}
@ -940,6 +950,7 @@ spine.SkeletonJson.prototype = {
}
slotData.attachmentName = slotMap["attachment"];
slotData.additiveBlending = slotMap["additive"];
skeletonData.slots.push(slotData);
}