@esotericsoftware/spine-webgl 4.1.37 → 4.1.38

package/dist/iife/spine-webgl.js

@@ -10799,6 +10799,34 @@ var spine = (() => {
           throw new Error("Unknown blend mode: " + blendMode);
       }
     }
+    static getDestColorGLBlendMode(blendMode) {
+      switch (blendMode) {
+        case 0 /* Normal */:
+          return ONE_MINUS_SRC_ALPHA;
+        case 1 /* Additive */:
+          return ONE;
+        case 2 /* Multiply */:
+          return ONE_MINUS_SRC_ALPHA;
+        case 3 /* Screen */:
+          return ONE_MINUS_SRC_COLOR;
+        default:
+          throw new Error("Unknown blend mode: " + blendMode);
+      }
+    }
+    static getDestAlphaGLBlendMode(blendMode, premultipliedAlpha = false) {
+      switch (blendMode) {
+        case 0 /* Normal */:
+          return ONE_MINUS_SRC_ALPHA;
+        case 1 /* Additive */:
+          return premultipliedAlpha ? ONE_MINUS_SRC_ALPHA : ONE;
+        case 2 /* Multiply */:
+          return ONE_MINUS_SRC_ALPHA;
+        case 3 /* Screen */:
+          return ONE_MINUS_SRC_ALPHA;
+        default:
+          throw new Error("Unknown blend mode: " + blendMode);
+      }
+    }
     static getSourceColorGLBlendMode(blendMode, premultipliedAlpha = false) {
       switch (blendMode) {
         case 0 /* Normal */:
@@ -10808,21 +10836,21 @@ var spine = (() => {
         case 2 /* Multiply */:
           return DST_COLOR;
         case 3 /* Screen */:
-          return ONE;
+          return premultipliedAlpha ? ONE : SRC_ALPHA;
         default:
           throw new Error("Unknown blend mode: " + blendMode);
       }
     }
-    static getSourceAlphaGLBlendMode(blendMode) {
+    static getSourceAlphaGLBlendMode(blendMode, premultipliedAlpha = false) {
       switch (blendMode) {
         case 0 /* Normal */:
-          return ONE;
+          return premultipliedAlpha ? SRC_ALPHA : ONE;
         case 1 /* Additive */:
-          return ONE;
+          return premultipliedAlpha ? SRC_ALPHA : ONE;
         case 2 /* Multiply */:
-          return ONE_MINUS_SRC_ALPHA;
+          return ONE;
         case 3 /* Screen */:
-          return ONE_MINUS_SRC_COLOR;
+          return ONE;
         default:
           throw new Error("Unknown blend mode: " + blendMode);
       }
@@ -12049,7 +12077,8 @@ void main () {
       let gl = this.context.gl;
       this.srcColorBlend = gl.SRC_ALPHA;
       this.srcAlphaBlend = gl.ONE;
-      this.dstBlend = gl.ONE_MINUS_SRC_ALPHA;
+      this.dstColorBlend = gl.ONE_MINUS_SRC_ALPHA;
+      this.dstAlphaBlend = gl.ONE_MINUS_SRC_ALPHA;
     }
     begin(shader) {
       if (this.isDrawing)
@@ -12060,23 +12089,24 @@ void main () {
       this.isDrawing = true;
       let gl = this.context.gl;
       gl.enable(gl.BLEND);
-      gl.blendFuncSeparate(this.srcColorBlend, this.dstBlend, this.srcAlphaBlend, this.dstBlend);
+      gl.blendFuncSeparate(this.srcColorBlend, this.dstColorBlend, this.srcAlphaBlend, this.dstAlphaBlend);
       if (_PolygonBatcher.disableCulling) {
         this.cullWasEnabled = gl.isEnabled(gl.CULL_FACE);
         if (this.cullWasEnabled)
           gl.disable(gl.CULL_FACE);
       }
     }
-    setBlendMode(srcColorBlend, srcAlphaBlend, dstBlend) {
-      if (this.srcColorBlend == srcColorBlend && this.srcAlphaBlend == srcAlphaBlend && this.dstBlend == dstBlend)
+    setBlendMode(srcColorBlend, srcAlphaBlend, dstColorBlend, dstAlphaBlend) {
+      if (this.srcColorBlend == srcColorBlend && this.srcAlphaBlend == srcAlphaBlend && this.dstColorBlend == dstColorBlend && this.dstAlphaBlend == dstAlphaBlend)
         return;
       this.srcColorBlend = srcColorBlend;
       this.srcAlphaBlend = srcAlphaBlend;
-      this.dstBlend = dstBlend;
+      this.dstColorBlend = dstColorBlend;
+      this.dstAlphaBlend = dstAlphaBlend;
       if (this.isDrawing) {
         this.flush();
         let gl = this.context.gl;
-        gl.blendFuncSeparate(srcColorBlend, dstBlend, srcAlphaBlend, dstBlend);
+        gl.blendFuncSeparate(srcColorBlend, dstColorBlend, srcAlphaBlend, dstAlphaBlend);
       }
     }
     draw(texture, vertices, indices) {
@@ -12159,7 +12189,8 @@ void main () {
       let gl = this.context.gl;
       this.srcColorBlend = gl.SRC_ALPHA;
       this.srcAlphaBlend = gl.ONE;
-      this.dstBlend = gl.ONE_MINUS_SRC_ALPHA;
+      this.dstColorBlend = gl.ONE_MINUS_SRC_ALPHA;
+      this.dstAlphaBlend = gl.ONE_MINUS_SRC_ALPHA;
     }
     begin(shader) {
       if (this.isDrawing)
@@ -12169,16 +12200,17 @@ void main () {
       this.isDrawing = true;
       let gl = this.context.gl;
       gl.enable(gl.BLEND);
-      gl.blendFuncSeparate(this.srcColorBlend, this.dstBlend, this.srcAlphaBlend, this.dstBlend);
+      gl.blendFuncSeparate(this.srcColorBlend, this.dstColorBlend, this.srcAlphaBlend, this.dstAlphaBlend);
     }
-    setBlendMode(srcColorBlend, srcAlphaBlend, dstBlend) {
+    setBlendMode(srcColorBlend, srcAlphaBlend, dstColorBlend, dstAlphaBlend) {
       this.srcColorBlend = srcColorBlend;
       this.srcAlphaBlend = srcAlphaBlend;
-      this.dstBlend = dstBlend;
+      this.dstColorBlend = dstColorBlend;
+      this.dstAlphaBlend = dstAlphaBlend;
       if (this.isDrawing) {
         this.flush();
         let gl = this.context.gl;
-        gl.blendFuncSeparate(srcColorBlend, dstBlend, srcAlphaBlend, dstBlend);
+        gl.blendFuncSeparate(srcColorBlend, dstColorBlend, srcAlphaBlend, dstAlphaBlend);
       }
     }
     setColor(color) {
@@ -12477,7 +12509,7 @@ void main () {
       let skeletonY = skeleton.y;
       let gl = this.context.gl;
       let srcFunc = this.premultipliedAlpha ? gl.ONE : gl.SRC_ALPHA;
-      shapes.setBlendMode(srcFunc, gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
+      shapes.setBlendMode(srcFunc, gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
       let bones = skeleton.bones;
       if (this.drawBones) {
         shapes.setColor(this.boneLineColor);
@@ -12774,8 +12806,9 @@ void main () {
             blendMode = slotBlendMode;
             batcher.setBlendMode(
               WebGLBlendModeConverter.getSourceColorGLBlendMode(blendMode, premultipliedAlpha),
-              WebGLBlendModeConverter.getSourceAlphaGLBlendMode(blendMode),
-              WebGLBlendModeConverter.getDestGLBlendMode(blendMode)
+              WebGLBlendModeConverter.getSourceAlphaGLBlendMode(blendMode, premultipliedAlpha),
+              WebGLBlendModeConverter.getDestColorGLBlendMode(blendMode),
+              WebGLBlendModeConverter.getDestAlphaGLBlendMode(blendMode, premultipliedAlpha)
             );
           }
           if (clipper.isClipping()) {
@@ -13340,7 +13373,7 @@ void main () {
       let gl = renderer.context.gl;
       renderer.resize(1 /* Expand */);
       renderer.camera.position.set(canvas.width / 2, canvas.height / 2, 0);
-      renderer.batcher.setBlendMode(gl.ONE, gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
+      renderer.batcher.setBlendMode(gl.ONE, gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
       if (complete) {
         this.fadeOut += this.timeKeeper.delta * (this.timeKeeper.totalTime < 1 ? 2 : 1);
         if (this.fadeOut > FADE_OUT)