@esotericsoftware/spine-webgl 4.2.11 → 4.2.14

package/dist/iife/spine-webgl.js

@@ -4815,12 +4815,15 @@ var spine = (() => {
       this.width = 0;
       this.height = 0;
       this.pma = false;
+      this.regions = new Array();
       this.name = name;
     }
     setTexture(texture) {
       this.texture = texture;
       texture.setFilters(this.minFilter, this.magFilter);
       texture.setWraps(this.uWrap, this.vWrap);
+      for (let region of this.regions)
+        region.texture = texture;
     }
   };
   var TextureAtlasRegion = class extends TextureRegion {
@@ -4838,6 +4841,7 @@ var spine = (() => {
       this.values = null;
       this.page = page;
       this.name = name;
+      page.regions.push(this);
     }
   };
 
@@ -4882,8 +4886,8 @@ var spine = (() => {
       let n = this.uvs.length;
       let u = this.region.u, v = this.region.v, width = 0, height = 0;
       if (this.region instanceof TextureAtlasRegion) {
-        let region = this.region, image = region.page.texture.getImage();
-        let textureWidth = image.width, textureHeight = image.height;
+        let region = this.region, page = region.page;
+        let textureWidth = page.width, textureHeight = page.height;
         switch (region.degrees) {
           case 90:
             u -= (region.originalHeight - region.offsetY - region.height) / textureWidth;
@@ -5071,7 +5075,6 @@ var spine = (() => {
       this.height = 0;
       /** The color to tint the region attachment. */
       this.color = new Color(1, 1, 1, 1);
-      this.rendererObject = null;
       this.region = null;
       this.sequence = null;
       /** For each of the 4 vertices, a pair of <code>x,y</code> values that is the local position of the vertex.
@@ -5185,7 +5188,6 @@ var spine = (() => {
     copy() {
       let copy = new _RegionAttachment(this.name, this.path);
       copy.region = this.region;
-      copy.rendererObject = this.rendererObject;
       copy.x = this.x;
       copy.y = this.y;
       copy.scaleX = this.scaleX;
@@ -5247,7 +5249,6 @@ var spine = (() => {
         if (region == null)
           throw new Error("Region not found in atlas: " + path + " (sequence: " + name + ")");
         regions[i] = region;
-        regions[i].renderObject = regions[i];
       }
     }
     newRegionAttachment(skin, name, path, sequence) {
@@ -5258,7 +5259,6 @@ var spine = (() => {
         let region = this.atlas.findRegion(path);
         if (!region)
           throw new Error("Region not found in atlas: " + path + " (region attachment: " + name + ")");
-        region.renderObject = region;
         attachment.region = region;
       }
       return attachment;
@@ -5271,7 +5271,6 @@ var spine = (() => {
         let region = this.atlas.findRegion(path);
         if (!region)
           throw new Error("Region not found in atlas: " + path + " (mesh attachment: " + name + ")");
-        region.renderObject = region;
         attachment.region = region;
       }
       return attachment;
@@ -6083,7 +6082,7 @@ var spine = (() => {
           ty = targetY - bone.worldY;
           break;
         case 2 /* NoRotationOrReflection */:
-          let s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
+          let s = Math.abs(pa * pd - pb * pc) / Math.max(1e-4, pa * pa + pc * pc);
           let sa = pa / bone.skeleton.scaleX;
           let sc = pc / bone.skeleton.scaleY;
           pb = -sc * s * bone.skeleton.scaleX;
@@ -6092,8 +6091,13 @@ var spine = (() => {
         default:
           let x = targetX - p.worldX, y = targetY - p.worldY;
           let d = pa * pd - pb * pc;
-          tx = (x * pd - y * pb) / d - bone.ax;
-          ty = (y * pa - x * pc) / d - bone.ay;
+          if (Math.abs(d) <= 1e-4) {
+            tx = 0;
+            ty = 0;
+          } else {
+            tx = (x * pd - y * pb) / d - bone.ax;
+            ty = (y * pa - x * pc) / d - bone.ay;
+          }
       }
       rotationIK += Math.atan2(ty, tx) * MathUtils.radDeg;
       if (bone.ascaleX < 0)
@@ -6168,7 +6172,8 @@ var spine = (() => {
       b = pp.b;
       c = pp.c;
       d = pp.d;
-      let id = 1 / (a * d - b * c), x = cwx - pp.worldX, y = cwy - pp.worldY;
+      let id = a * d - b * c, x = cwx - pp.worldX, y = cwy - pp.worldY;
+      id = Math.abs(id) <= 1e-4 ? 0 : 1 / id;
       let dx = (x * d - y * b) * id - px, dy = (y * a - x * c) * id - py;
       let l1 = Math.sqrt(dx * dx + dy * dy), l2 = child.data.length * csx, a1, a2;
       if (l1 < 1e-4) {
@@ -10891,7 +10896,6 @@ var spine = (() => {
     }
     static validateMagFilter(magFilter) {
       switch (magFilter) {
-        case 9987 /* MipMap */:
         case 9987 /* MipMapLinearLinear */:
         case 9985 /* MipMapLinearNearest */:
         case 9986 /* MipMapNearestLinear */:
@@ -10903,7 +10907,6 @@ var spine = (() => {
     }
     static usesMipMaps(filter) {
       switch (filter) {
-        case 9987 /* MipMap */:
         case 9987 /* MipMapLinearLinear */:
         case 9985 /* MipMapLinearNearest */:
         case 9986 /* MipMapNearestLinear */:
@@ -11787,99 +11790,99 @@ var spine = (() => {
     }
     static newColoredTextured(context) {
       let vs = `
-				attribute vec4 ${_Shader.POSITION};
-				attribute vec4 ${_Shader.COLOR};
-				attribute vec2 ${_Shader.TEXCOORDS};
-				uniform mat4 ${_Shader.MVP_MATRIX};
-				varying vec4 v_color;
-				varying vec2 v_texCoords;
+attribute vec4 ${_Shader.POSITION};
+attribute vec4 ${_Shader.COLOR};
+attribute vec2 ${_Shader.TEXCOORDS};
+uniform mat4 ${_Shader.MVP_MATRIX};
+varying vec4 v_color;
+varying vec2 v_texCoords;
 
-				void main () {
-					v_color = ${_Shader.COLOR};
-					v_texCoords = ${_Shader.TEXCOORDS};
-					gl_Position = ${_Shader.MVP_MATRIX} * ${_Shader.POSITION};
-				}
-			`;
+void main () {
+	v_color = ${_Shader.COLOR};
+	v_texCoords = ${_Shader.TEXCOORDS};
+	gl_Position = ${_Shader.MVP_MATRIX} * ${_Shader.POSITION};
+}
+`;
       let fs = `
-				#ifdef GL_ES
-					#define LOWP lowp
-					precision mediump float;
-				#else
-					#define LOWP
-				#endif
-				varying LOWP vec4 v_color;
-				varying vec2 v_texCoords;
-				uniform sampler2D u_texture;
+#ifdef GL_ES
+	#define LOWP lowp
+	precision mediump float;
+#else
+	#define LOWP
+#endif
+varying LOWP vec4 v_color;
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
 
-				void main () {
-					gl_FragColor = v_color * texture2D(u_texture, v_texCoords);
-				}
-			`;
+void main () {
+	gl_FragColor = v_color * texture2D(u_texture, v_texCoords);
+}
+`;
       return new _Shader(context, vs, fs);
     }
     static newTwoColoredTextured(context) {
       let vs = `
-				attribute vec4 ${_Shader.POSITION};
-				attribute vec4 ${_Shader.COLOR};
-				attribute vec4 ${_Shader.COLOR2};
-				attribute vec2 ${_Shader.TEXCOORDS};
-				uniform mat4 ${_Shader.MVP_MATRIX};
-				varying vec4 v_light;
-				varying vec4 v_dark;
-				varying vec2 v_texCoords;
+attribute vec4 ${_Shader.POSITION};
+attribute vec4 ${_Shader.COLOR};
+attribute vec4 ${_Shader.COLOR2};
+attribute vec2 ${_Shader.TEXCOORDS};
+uniform mat4 ${_Shader.MVP_MATRIX};
+varying vec4 v_light;
+varying vec4 v_dark;
+varying vec2 v_texCoords;
 
-				void main () {
-					v_light = ${_Shader.COLOR};
-					v_dark = ${_Shader.COLOR2};
-					v_texCoords = ${_Shader.TEXCOORDS};
-					gl_Position = ${_Shader.MVP_MATRIX} * ${_Shader.POSITION};
-				}
-			`;
+void main () {
+	v_light = ${_Shader.COLOR};
+	v_dark = ${_Shader.COLOR2};
+	v_texCoords = ${_Shader.TEXCOORDS};
+	gl_Position = ${_Shader.MVP_MATRIX} * ${_Shader.POSITION};
+}
+`;
       let fs = `
-				#ifdef GL_ES
-					#define LOWP lowp
-					precision mediump float;
-				#else
-					#define LOWP
-				#endif
-				varying LOWP vec4 v_light;
-				varying LOWP vec4 v_dark;
-				varying vec2 v_texCoords;
-				uniform sampler2D u_texture;
+#ifdef GL_ES
+	#define LOWP lowp
+	precision mediump float;
+#else
+	#define LOWP
+#endif
+varying LOWP vec4 v_light;
+varying LOWP vec4 v_dark;
+varying vec2 v_texCoords;
+uniform sampler2D u_texture;
 
-				void main () {
-					vec4 texColor = texture2D(u_texture, v_texCoords);
-					gl_FragColor.a = texColor.a * v_light.a;
-					gl_FragColor.rgb = ((texColor.a - 1.0) * v_dark.a + 1.0 - texColor.rgb) * v_dark.rgb + texColor.rgb * v_light.rgb;
-				}
-			`;
+void main () {
+	vec4 texColor = texture2D(u_texture, v_texCoords);
+	gl_FragColor.a = texColor.a * v_light.a;
+	gl_FragColor.rgb = ((texColor.a - 1.0) * v_dark.a + 1.0 - texColor.rgb) * v_dark.rgb + texColor.rgb * v_light.rgb;
+}
+`;
       return new _Shader(context, vs, fs);
     }
     static newColored(context) {
       let vs = `
-				attribute vec4 ${_Shader.POSITION};
-				attribute vec4 ${_Shader.COLOR};
-				uniform mat4 ${_Shader.MVP_MATRIX};
-				varying vec4 v_color;
+attribute vec4 ${_Shader.POSITION};
+attribute vec4 ${_Shader.COLOR};
+uniform mat4 ${_Shader.MVP_MATRIX};
+varying vec4 v_color;
 
-				void main () {
-					v_color = ${_Shader.COLOR};
-					gl_Position = ${_Shader.MVP_MATRIX} * ${_Shader.POSITION};
-				}
-			`;
+void main () {
+	v_color = ${_Shader.COLOR};
+	gl_Position = ${_Shader.MVP_MATRIX} * ${_Shader.POSITION};
+}
+`;
       let fs = `
-				#ifdef GL_ES
-					#define LOWP lowp
-					precision mediump float;
-				#else
-					#define LOWP
-				#endif
-				varying LOWP vec4 v_color;
+#ifdef GL_ES
+	#define LOWP lowp
+	precision mediump float;
+#else
+	#define LOWP
+#endif
+varying LOWP vec4 v_color;
 
-				void main () {
-					gl_FragColor = v_color;
-				}
-			`;
+void main () {
+	gl_FragColor = v_color;
+}
+`;
       return new _Shader(context, vs, fs);
     }
   };
@@ -12760,7 +12763,7 @@ var spine = (() => {
           region.computeWorldVertices(slot, renderable.vertices, 0, clippedVertexSize);
           triangles = _SkeletonRenderer.QUAD_TRIANGLES;
           uvs = region.uvs;
-          texture = region.region.renderObject.page.texture;
+          texture = region.region.texture;
           attachmentColor = region.color;
         } else if (attachment instanceof MeshAttachment) {
           let mesh = attachment;
@@ -12772,7 +12775,7 @@ var spine = (() => {
           }
           mesh.computeWorldVertices(slot, 0, mesh.worldVerticesLength, renderable.vertices, 0, clippedVertexSize);
           triangles = mesh.triangles;
-          texture = mesh.region.renderObject.page.texture;
+          texture = mesh.region.texture;
           uvs = mesh.uvs;
           attachmentColor = mesh.color;
         } else if (attachment instanceof ClippingAttachment) {
@@ -12822,7 +12825,7 @@ var spine = (() => {
             let clippedVertices = new Float32Array(clipper.clippedVertices);
             let clippedTriangles = clipper.clippedTriangles;
             if (transformer)
-              transformer(renderable.vertices, renderable.numFloats, vertexSize);
+              transformer(clippedVertices, clippedVertices.length, vertexSize);
             batcher.draw(texture, clippedVertices, clippedTriangles);
           } else {
             let verts = renderable.vertices;