@esotericsoftware/spine-canvas 4.1.5 → 4.2.1

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.
Files changed (5) hide show
  1. package/dist/SkeletonRenderer.js +3 -15
  2. package/dist/iife/spine-canvas.js +19 -17
  3. package/dist/iife/spine-canvas.js.map +2 -2
  4. package/dist/iife/spine-canvas.min.js +2 -2
  5. package/package.json +2 -2
package/dist/SkeletonRenderer.js CHANGED
@@ -77,13 +77,7 @@ export class SkeletonRenderer {
77
77
  }
78
78
  ctx.scale(1, -1);
79
79
  ctx.translate(-w / 2, -h / 2);
80
- if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
81
- ctx.globalAlpha = color.a;
82
- // experimental tinting via compositing, doesn't work
83
- // ctx.globalCompositeOperation = "source-atop";
84
- // ctx.fillStyle = "rgba(" + (color.r * 255 | 0) + ", " + (color.g * 255 | 0) + ", " + (color.b * 255 | 0) + ", " + color.a + ")";
85
- // ctx.fillRect(0, 0, w, h);
86
- }
80
+ ctx.globalAlpha = color.a;
87
81
  ctx.drawImage(image, region.x, region.y, w, h, 0, 0, w, h);
88
82
  if (this.debugRendering)
89
83
  ctx.strokeRect(0, 0, w, h);
@@ -124,13 +118,7 @@ export class SkeletonRenderer {
124
118
  let slotColor = slot.color;
125
119
  let attachmentColor = attachment.color;
126
120
  color.set(skeletonColor.r * slotColor.r * attachmentColor.r, skeletonColor.g * slotColor.g * attachmentColor.g, skeletonColor.b * slotColor.b * attachmentColor.b, skeletonColor.a * slotColor.a * attachmentColor.a);
127
- if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
128
- ctx.globalAlpha = color.a;
129
- // experimental tinting via compositing, doesn't work
130
- // ctx.globalCompositeOperation = "source-atop";
131
- // ctx.fillStyle = "rgba(" + (color.r * 255 | 0) + ", " + (color.g * 255 | 0) + ", " + (color.b * 255 | 0) + ", " + color.a + ")";
132
- // ctx.fillRect(0, 0, w, h);
133
- }
121
+ ctx.globalAlpha = color.a;
134
122
  for (var j = 0; j < triangles.length; j += 3) {
135
123
  let t1 = triangles[j] * 8, t2 = triangles[j + 1] * 8, t3 = triangles[j + 2] * 8;
136
124
  let x0 = vertices[t1], y0 = vertices[t1 + 1], u0 = vertices[t1 + 6], v0 = vertices[t1 + 7];
@@ -250,4 +238,4 @@ export class SkeletonRenderer {
250
238
  }
251
239
  SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
252
240
  SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4;
253
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"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"}
241
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"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C;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,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,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEO,mBAAmB,CAAE,IAAU,EAAE,IAAoB,EAAE,GAAY;QAC1E,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAC7C,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7B,IAAI,KAAK,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;QAC1D,IAAI,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3B,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,UAAU,EACnE,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,UAAU,EAC1D,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,UAAU,EAC1D,KAAK,CAAC,CAAC;QAER,IAAI,WAAW,GAAG,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;QAC/C,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB;YAAE,IAAI,CAAC,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACzH,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,EAAE,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAExG,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;YACnD,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACxB,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACxB,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACxB,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACxB,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;YACzB,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;YACzB,CAAC,IAAI,CAAC,CAAC;SACP;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;;AAvQM,+BAAc,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,4BAAW,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC"}
package/dist/iife/spine-canvas.js CHANGED
@@ -1103,8 +1103,8 @@ var spine = (() => {
1103
1103
  bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
1104
1104
  break;
1105
1105
  case 3:
1106
- bone.scaleX = (x - bone.data.scaleX) * alpha;
1107
- bone.scaleY = (y - bone.data.scaleY) * alpha;
1106
+ bone.scaleX += (x - bone.data.scaleX) * alpha;
1107
+ bone.scaleY += (y - bone.data.scaleY) * alpha;
1108
1108
  }
1109
1109
  } else {
1110
1110
  switch (blend) {
@@ -1170,7 +1170,7 @@ var spine = (() => {
1170
1170
  bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bx) * alpha;
1171
1171
  break;
1172
1172
  case 3:
1173
- bone.scaleX = (x - bone.data.scaleX) * alpha;
1173
+ bone.scaleX += (x - bone.data.scaleX) * alpha;
1174
1174
  }
1175
1175
  } else {
1176
1176
  switch (blend) {
@@ -1231,7 +1231,7 @@ var spine = (() => {
1231
1231
  bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
1232
1232
  break;
1233
1233
  case 3:
1234
- bone.scaleY = (y - bone.data.scaleY) * alpha;
1234
+ bone.scaleY += (y - bone.data.scaleY) * alpha;
1235
1235
  }
1236
1236
  } else {
1237
1237
  switch (blend) {
@@ -2653,13 +2653,14 @@ var spine = (() => {
2653
2653
  }
2654
2654
  } else {
2655
2655
  let timelineMode = current.timelineMode;
2656
- let firstFrame = current.timelinesRotation.length != timelineCount << 1;
2656
+ let shortestRotation = current.shortestRotation;
2657
+ let firstFrame = !shortestRotation && current.timelinesRotation.length != timelineCount << 1;
2657
2658
  if (firstFrame)
2658
2659
  current.timelinesRotation.length = timelineCount << 1;
2659
2660
  for (let ii = 0; ii < timelineCount; ii++) {
2660
2661
  let timeline2 = timelines[ii];
2661
2662
  let timelineBlend = timelineMode[ii] == SUBSEQUENT ? blend : MixBlend.setup;
2662
- if (timeline2 instanceof RotateTimeline) {
2663
+ if (!shortestRotation && timeline2 instanceof RotateTimeline) {
2663
2664
  this.applyRotateTimeline(timeline2, skeleton, applyTime, mix, timelineBlend, current.timelinesRotation, ii << 1, firstFrame);
2664
2665
  } else if (timeline2 instanceof AttachmentTimeline) {
2665
2666
  this.applyAttachmentTimeline(timeline2, skeleton, applyTime, blend, true);
@@ -2719,7 +2720,8 @@ var spine = (() => {
2719
2720
  } else {
2720
2721
  let timelineMode = from.timelineMode;
2721
2722
  let timelineHoldMix = from.timelineHoldMix;
2722
- let firstFrame = from.timelinesRotation.length != timelineCount << 1;
2723
+ let shortestRotation = from.shortestRotation;
2724
+ let firstFrame = !shortestRotation && from.timelinesRotation.length != timelineCount << 1;
2723
2725
  if (firstFrame)
2724
2726
  from.timelinesRotation.length = timelineCount << 1;
2725
2727
  from.totalAlpha = 0;
@@ -2754,7 +2756,7 @@ var spine = (() => {
2754
2756
  break;
2755
2757
  }
2756
2758
  from.totalAlpha += alpha;
2757
- if (timeline instanceof RotateTimeline)
2759
+ if (!shortestRotation && timeline instanceof RotateTimeline)
2758
2760
  this.applyRotateTimeline(timeline, skeleton, applyTime, alpha, timelineBlend, from.timelinesRotation, i << 1, firstFrame);
2759
2761
  else if (timeline instanceof AttachmentTimeline)
2760
2762
  this.applyAttachmentTimeline(timeline, skeleton, applyTime, timelineBlend, attachments);
@@ -3010,6 +3012,8 @@ var spine = (() => {
3010
3012
  entry.animation = animation;
3011
3013
  entry.loop = loop;
3012
3014
  entry.holdPrevious = false;
3015
+ entry.reverse = false;
3016
+ entry.shortestRotation = false;
3013
3017
  entry.eventThreshold = 0;
3014
3018
  entry.attachmentThreshold = 0;
3015
3019
  entry.drawOrderThreshold = 0;
@@ -3024,9 +3028,10 @@ var spine = (() => {
3024
3028
  entry.trackEnd = Number.MAX_VALUE;
3025
3029
  entry.timeScale = 1;
3026
3030
  entry.alpha = 1;
3027
- entry.interruptAlpha = 1;
3028
3031
  entry.mixTime = 0;
3029
3032
  entry.mixDuration = !last ? 0 : this.data.getMix(last.animation, animation);
3033
+ entry.interruptAlpha = 1;
3034
+ entry.totalAlpha = 0;
3030
3035
  entry.mixBlend = MixBlend.replace;
3031
3036
  return entry;
3032
3037
  }
@@ -3126,6 +3131,7 @@ var spine = (() => {
3126
3131
  this.loop = false;
3127
3132
  this.holdPrevious = false;
3128
3133
  this.reverse = false;
3134
+ this.shortestRotation = false;
3129
3135
  this.eventThreshold = 0;
3130
3136
  this.attachmentThreshold = 0;
3131
3137
  this.drawOrderThreshold = 0;
@@ -4430,7 +4436,7 @@ var spine = (() => {
4430
4436
  image.src = path;
4431
4437
  }
4432
4438
  }
4433
- loadTextureAtlas(path, success = null, error = null) {
4439
+ loadTextureAtlas(path, success = null, error = null, fileAlias = null) {
4434
4440
  let index = path.lastIndexOf("/");
4435
4441
  let parent = index >= 0 ? path.substring(0, index + 1) : "";
4436
4442
  path = this.start(path);
@@ -4439,7 +4445,7 @@ var spine = (() => {
4439
4445
  let atlas = new TextureAtlas(atlasText);
4440
4446
  let toLoad = atlas.pages.length, abort = false;
4441
4447
  for (let page of atlas.pages) {
4442
- this.loadTexture(parent + page.name, (imagePath, texture) => {
4448
+ this.loadTexture(fileAlias == null ? parent + page.name : fileAlias[page.name], (imagePath, texture) => {
4443
4449
  if (!abort) {
4444
4450
  page.setTexture(texture);
4445
4451
  if (--toLoad == 0)
@@ -9120,9 +9126,7 @@ var spine = (() => {
9120
9126
  }
9121
9127
  ctx.scale(1, -1);
9122
9128
  ctx.translate(-w / 2, -h / 2);
9123
- if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
9124
- ctx.globalAlpha = color.a;
9125
- }
9129
+ ctx.globalAlpha = color.a;
9126
9130
  ctx.drawImage(image, region.x, region.y, w, h, 0, 0, w, h);
9127
9131
  if (this.debugRendering)
9128
9132
  ctx.strokeRect(0, 0, w, h);
@@ -9161,9 +9165,7 @@ var spine = (() => {
9161
9165
  let slotColor = slot.color;
9162
9166
  let attachmentColor = attachment.color;
9163
9167
  color.set(skeletonColor.r * slotColor.r * attachmentColor.r, skeletonColor.g * slotColor.g * attachmentColor.g, skeletonColor.b * slotColor.b * attachmentColor.b, skeletonColor.a * slotColor.a * attachmentColor.a);
9164
- if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
9165
- ctx.globalAlpha = color.a;
9166
- }
9168
+ ctx.globalAlpha = color.a;
9167
9169
  for (var j = 0; j < triangles.length; j += 3) {
9168
9170
  let t1 = triangles[j] * 8, t2 = triangles[j + 1] * 8, t3 = triangles[j + 2] * 8;
9169
9171
  let x0 = vertices[t1], y0 = vertices[t1 + 1], u0 = vertices[t1 + 6], v0 = vertices[t1 + 7];