@esotericsoftware/spine-canvas 4.1.26 → 4.1.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
package/dist/SkeletonRenderer.js
CHANGED
|
@@ -59,7 +59,7 @@ export class SkeletonRenderer {
|
|
|
59
59
|
continue;
|
|
60
60
|
attachment.computeWorldVertices(slot, worldVertices, 0, 2);
|
|
61
61
|
let region = attachment.region;
|
|
62
|
-
let image = region.
|
|
62
|
+
let image = region.texture.getImage();
|
|
63
63
|
let slotColor = slot.color;
|
|
64
64
|
let regionColor = attachment.color;
|
|
65
65
|
color.set(skeletonColor.r * slotColor.r * regionColor.r, skeletonColor.g * slotColor.g * regionColor.g, skeletonColor.b * slotColor.b * regionColor.b, skeletonColor.a * slotColor.a * regionColor.a);
|
|
@@ -80,7 +80,7 @@ export class SkeletonRenderer {
|
|
|
80
80
|
ctx.scale(1, -1);
|
|
81
81
|
ctx.translate(-w / 2, -h / 2);
|
|
82
82
|
ctx.globalAlpha = color.a;
|
|
83
|
-
ctx.drawImage(image, region.
|
|
83
|
+
ctx.drawImage(image, image.width * region.u, image.height * region.v, w, h, 0, 0, w, h);
|
|
84
84
|
if (this.debugRendering)
|
|
85
85
|
ctx.strokeRect(0, 0, w, h);
|
|
86
86
|
ctx.restore();
|
|
@@ -103,15 +103,13 @@ export class SkeletonRenderer {
|
|
|
103
103
|
let regionAttachment = attachment;
|
|
104
104
|
vertices = this.computeRegionVertices(slot, regionAttachment, false);
|
|
105
105
|
triangles = SkeletonRenderer.QUAD_TRIANGLES;
|
|
106
|
-
|
|
107
|
-
texture = region.page.texture.getImage();
|
|
106
|
+
texture = regionAttachment.region.texture.getImage();
|
|
108
107
|
}
|
|
109
108
|
else if (attachment instanceof MeshAttachment) {
|
|
110
109
|
let mesh = attachment;
|
|
111
110
|
vertices = this.computeMeshVertices(slot, mesh, false);
|
|
112
111
|
triangles = mesh.triangles;
|
|
113
|
-
|
|
114
|
-
texture = region.page.texture.getImage();
|
|
112
|
+
texture = mesh.region.texture.getImage();
|
|
115
113
|
}
|
|
116
114
|
else
|
|
117
115
|
continue;
|
|
@@ -241,4 +239,4 @@ export class SkeletonRenderer {
|
|
|
241
239
|
}
|
|
242
240
|
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
|
|
243
241
|
SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4;
|
|
244
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"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"}
|
|
242
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"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,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACvC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACvC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACvC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,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"}
|
|
@@ -4769,12 +4769,15 @@ var spine = (() => {
|
|
|
4769
4769
|
this.width = 0;
|
|
4770
4770
|
this.height = 0;
|
|
4771
4771
|
this.pma = false;
|
|
4772
|
+
this.regions = new Array();
|
|
4772
4773
|
this.name = name;
|
|
4773
4774
|
}
|
|
4774
4775
|
setTexture(texture) {
|
|
4775
4776
|
this.texture = texture;
|
|
4776
4777
|
texture.setFilters(this.minFilter, this.magFilter);
|
|
4777
4778
|
texture.setWraps(this.uWrap, this.vWrap);
|
|
4779
|
+
for (let region of this.regions)
|
|
4780
|
+
region.texture = texture;
|
|
4778
4781
|
}
|
|
4779
4782
|
};
|
|
4780
4783
|
var TextureAtlasRegion = class extends TextureRegion {
|
|
@@ -4792,6 +4795,7 @@ var spine = (() => {
|
|
|
4792
4795
|
this.values = null;
|
|
4793
4796
|
this.page = page;
|
|
4794
4797
|
this.name = name;
|
|
4798
|
+
page.regions.push(this);
|
|
4795
4799
|
}
|
|
4796
4800
|
};
|
|
4797
4801
|
|
|
@@ -5025,7 +5029,6 @@ var spine = (() => {
|
|
|
5025
5029
|
this.height = 0;
|
|
5026
5030
|
/** The color to tint the region attachment. */
|
|
5027
5031
|
this.color = new Color(1, 1, 1, 1);
|
|
5028
|
-
this.rendererObject = null;
|
|
5029
5032
|
this.region = null;
|
|
5030
5033
|
this.sequence = null;
|
|
5031
5034
|
/** For each of the 4 vertices, a pair of <code>x,y</code> values that is the local position of the vertex.
|
|
@@ -5139,7 +5142,6 @@ var spine = (() => {
|
|
|
5139
5142
|
copy() {
|
|
5140
5143
|
let copy = new _RegionAttachment(this.name, this.path);
|
|
5141
5144
|
copy.region = this.region;
|
|
5142
|
-
copy.rendererObject = this.rendererObject;
|
|
5143
5145
|
copy.x = this.x;
|
|
5144
5146
|
copy.y = this.y;
|
|
5145
5147
|
copy.scaleX = this.scaleX;
|
|
@@ -5201,7 +5203,6 @@ var spine = (() => {
|
|
|
5201
5203
|
if (region == null)
|
|
5202
5204
|
throw new Error("Region not found in atlas: " + path + " (sequence: " + name + ")");
|
|
5203
5205
|
regions[i] = region;
|
|
5204
|
-
regions[i].renderObject = regions[i];
|
|
5205
5206
|
}
|
|
5206
5207
|
}
|
|
5207
5208
|
newRegionAttachment(skin, name, path, sequence) {
|
|
@@ -5212,7 +5213,6 @@ var spine = (() => {
|
|
|
5212
5213
|
let region = this.atlas.findRegion(path);
|
|
5213
5214
|
if (!region)
|
|
5214
5215
|
throw new Error("Region not found in atlas: " + path + " (region attachment: " + name + ")");
|
|
5215
|
-
region.renderObject = region;
|
|
5216
5216
|
attachment.region = region;
|
|
5217
5217
|
}
|
|
5218
5218
|
return attachment;
|
|
@@ -5225,7 +5225,6 @@ var spine = (() => {
|
|
|
5225
5225
|
let region = this.atlas.findRegion(path);
|
|
5226
5226
|
if (!region)
|
|
5227
5227
|
throw new Error("Region not found in atlas: " + path + " (mesh attachment: " + name + ")");
|
|
5228
|
-
region.renderObject = region;
|
|
5229
5228
|
attachment.region = region;
|
|
5230
5229
|
}
|
|
5231
5230
|
return attachment;
|
|
@@ -5998,7 +5997,7 @@ var spine = (() => {
|
|
|
5998
5997
|
ty = targetY - bone.worldY;
|
|
5999
5998
|
break;
|
|
6000
5999
|
case 2 /* NoRotationOrReflection */:
|
|
6001
|
-
let s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
|
|
6000
|
+
let s = Math.abs(pa * pd - pb * pc) / Math.max(1e-4, pa * pa + pc * pc);
|
|
6002
6001
|
let sa = pa / bone.skeleton.scaleX;
|
|
6003
6002
|
let sc = pc / bone.skeleton.scaleY;
|
|
6004
6003
|
pb = -sc * s * bone.skeleton.scaleX;
|
|
@@ -6007,8 +6006,13 @@ var spine = (() => {
|
|
|
6007
6006
|
default:
|
|
6008
6007
|
let x = targetX - p.worldX, y = targetY - p.worldY;
|
|
6009
6008
|
let d = pa * pd - pb * pc;
|
|
6010
|
-
|
|
6011
|
-
|
|
6009
|
+
if (Math.abs(d) <= 1e-4) {
|
|
6010
|
+
tx = 0;
|
|
6011
|
+
ty = 0;
|
|
6012
|
+
} else {
|
|
6013
|
+
tx = (x * pd - y * pb) / d - bone.ax;
|
|
6014
|
+
ty = (y * pa - x * pc) / d - bone.ay;
|
|
6015
|
+
}
|
|
6012
6016
|
}
|
|
6013
6017
|
rotationIK += Math.atan2(ty, tx) * MathUtils.radDeg;
|
|
6014
6018
|
if (bone.ascaleX < 0)
|
|
@@ -6083,7 +6087,8 @@ var spine = (() => {
|
|
|
6083
6087
|
b = pp.b;
|
|
6084
6088
|
c = pp.c;
|
|
6085
6089
|
d = pp.d;
|
|
6086
|
-
let id =
|
|
6090
|
+
let id = a * d - b * c, x = cwx - pp.worldX, y = cwy - pp.worldY;
|
|
6091
|
+
id = Math.abs(id) <= 1e-4 ? 0 : 1 / id;
|
|
6087
6092
|
let dx = (x * d - y * b) * id - px, dy = (y * a - x * c) * id - py;
|
|
6088
6093
|
let l1 = Math.sqrt(dx * dx + dy * dy), l2 = child.data.length * csx, a1, a2;
|
|
6089
6094
|
if (l1 < 1e-4) {
|
|
@@ -10757,7 +10762,7 @@ var spine = (() => {
|
|
|
10757
10762
|
continue;
|
|
10758
10763
|
attachment.computeWorldVertices(slot, worldVertices, 0, 2);
|
|
10759
10764
|
let region = attachment.region;
|
|
10760
|
-
let image = region.
|
|
10765
|
+
let image = region.texture.getImage();
|
|
10761
10766
|
let slotColor = slot.color;
|
|
10762
10767
|
let regionColor = attachment.color;
|
|
10763
10768
|
color.set(
|
|
@@ -10783,7 +10788,7 @@ var spine = (() => {
|
|
|
10783
10788
|
ctx.scale(1, -1);
|
|
10784
10789
|
ctx.translate(-w / 2, -h / 2);
|
|
10785
10790
|
ctx.globalAlpha = color.a;
|
|
10786
|
-
ctx.drawImage(image, region.
|
|
10791
|
+
ctx.drawImage(image, image.width * region.u, image.height * region.v, w, h, 0, 0, w, h);
|
|
10787
10792
|
if (this.debugRendering)
|
|
10788
10793
|
ctx.strokeRect(0, 0, w, h);
|
|
10789
10794
|
ctx.restore();
|
|
@@ -10806,14 +10811,12 @@ var spine = (() => {
|
|
|
10806
10811
|
let regionAttachment = attachment;
|
|
10807
10812
|
vertices = this.computeRegionVertices(slot, regionAttachment, false);
|
|
10808
10813
|
triangles = _SkeletonRenderer.QUAD_TRIANGLES;
|
|
10809
|
-
|
|
10810
|
-
texture = region.page.texture.getImage();
|
|
10814
|
+
texture = regionAttachment.region.texture.getImage();
|
|
10811
10815
|
} else if (attachment instanceof MeshAttachment) {
|
|
10812
10816
|
let mesh = attachment;
|
|
10813
10817
|
vertices = this.computeMeshVertices(slot, mesh, false);
|
|
10814
10818
|
triangles = mesh.triangles;
|
|
10815
|
-
|
|
10816
|
-
texture = region2.page.texture.getImage();
|
|
10819
|
+
texture = mesh.region.texture.getImage();
|
|
10817
10820
|
} else
|
|
10818
10821
|
continue;
|
|
10819
10822
|
if (texture) {
|