@galacean/effects-plugin-spine 2.3.4 → 2.3.6

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player spine plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 十弦
- * Version: v2.3.4
+ * Version: v2.3.6
  */
 
 import * as EFFECTS from '@galacean/effects';
@@ -10489,7 +10489,7 @@ function decodeText(array) {
     return decodeURIComponent(encodeURIComponent(s));
 }
 
-function setBlending(material, mode, pma) {
+function setBlending(material, mode) {
     material.blendEquation = [
         glContext.FUNC_ADD,
         glContext.FUNC_ADD
@@ -10499,7 +10499,7 @@ function setBlending(material, mode, pma) {
             material.blendFunction = [
                 glContext.DST_COLOR,
                 glContext.ONE_MINUS_SRC_ALPHA,
-                glContext.ONE_MINUS_SRC_ALPHA,
+                glContext.DST_COLOR,
                 glContext.ONE_MINUS_SRC_ALPHA
             ];
             break;
@@ -10513,7 +10513,7 @@ function setBlending(material, mode, pma) {
             break;
         case BlendMode.Additive:
             material.blendFunction = [
-                pma ? glContext.ONE : glContext.SRC_ALPHA,
+                glContext.ONE,
                 glContext.ONE,
                 glContext.ONE,
                 glContext.ONE
@@ -10521,7 +10521,7 @@ function setBlending(material, mode, pma) {
             break;
         case BlendMode.Normal:
             material.blendFunction = [
-                pma ? glContext.ONE : glContext.SRC_ALPHA,
+                glContext.ONE,
                 glContext.ONE_MINUS_SRC_ALPHA,
                 glContext.ONE,
                 glContext.ONE_MINUS_SRC_ALPHA
@@ -10676,7 +10676,7 @@ typeof SuppressedError === "function" ? SuppressedError : function _SuppressedEr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var fs = "precision mediump float;varying mediump vec4 vLight;varying mediump vec4 vDark;varying vec2 vTexCoords;uniform sampler2D uTexture;void main(){vec4 texColor=texture2D(uTexture,vTexCoords);gl_FragColor.a=texColor.a*vLight.a;gl_FragColor.rgb=((texColor.a-1.0)*vDark.a+1.0-texColor.rgb)*vDark.rgb+texColor.rgb*vLight.rgb;}";
+var fs = "precision mediump float;varying mediump vec4 vLight;varying mediump vec4 vDark;varying vec2 vTexCoords;uniform sampler2D uTexture;void main(){vec4 texColor=texture2D(uTexture,vTexCoords);gl_FragColor.a=texColor.a*vLight.a;gl_FragColor.rgb=((texColor.a-1.0)*vDark.a+1.0-texColor.rgb)*vDark.rgb+texColor.rgb*vLight.rgb;gl_FragColor.rgb*=gl_FragColor.a;}";
 
 var vs = "attribute vec2 aPosition;attribute vec4 aColor;attribute vec4 aColor2;attribute vec2 aTexCoords;uniform mat4 effects_ObjectToWorld;uniform mat4 effects_MatrixVP;\n#ifdef ENV_EDITOR\nuniform vec4 uEditorTransform;\n#endif\nvarying vec4 vLight;varying vec4 vDark;varying vec2 vTexCoords;void main(){vLight=aColor;vDark=aColor2;vTexCoords=aTexCoords;gl_Position=effects_MatrixVP*effects_ObjectToWorld*vec4(aPosition,0.0,1.0);\n#ifdef ENV_EDITOR\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
 
@@ -10685,14 +10685,14 @@ var SpineMesh = /*#__PURE__*/ function() {
     function SpineMesh(renderInfo) {
         this.verticesLength = 0;
         this.indicesLength = 0;
-        var blendMode = renderInfo.blendMode, texture = renderInfo.texture, priority = renderInfo.priority, _renderInfo_renderOptions = renderInfo.renderOptions, renderOptions = _renderInfo_renderOptions === void 0 ? {} : _renderInfo_renderOptions, pma = renderInfo.pma, _renderInfo_name = renderInfo.name, name = _renderInfo_name === void 0 ? "MSpine" : _renderInfo_name, engine = renderInfo.engine;
+        var blendMode = renderInfo.blendMode, texture = renderInfo.texture, priority = renderInfo.priority, _renderInfo_renderOptions = renderInfo.renderOptions, renderOptions = _renderInfo_renderOptions === void 0 ? {} : _renderInfo_renderOptions, _renderInfo_name = renderInfo.name, name = _renderInfo_name === void 0 ? "MSpine" : _renderInfo_name, engine = renderInfo.engine;
         var _renderOptions_mask = renderOptions.mask, mask = _renderOptions_mask === void 0 ? 0 : _renderOptions_mask, _renderOptions_maskMode = renderOptions.maskMode, maskMode = _renderOptions_maskMode === void 0 ? 0 : _renderOptions_maskMode;
         this.blendMode = blendMode;
         this.lastTexture = texture;
         this.priority = priority;
         this.engine = engine;
         this.geometry = this.createGeometry();
-        this.material = this.createMaterial(pma, maskMode, mask);
+        this.material = this.createMaterial(maskMode, mask);
         this.mesh = Mesh.create(engine, {
             name: name + seed++,
             priority: this.priority,
@@ -10742,7 +10742,7 @@ var SpineMesh = /*#__PURE__*/ function() {
             maxVertex: SlotGroup.MAX_VERTICES
         });
     };
-    _proto.createMaterial = function createMaterial(pma, maskMode, maskOrder) {
+    _proto.createMaterial = function createMaterial(maskMode, maskOrder) {
         var material = Material.create(this.engine, {
             shader: createShader(this.engine),
             uniformSemantics: {
@@ -10760,7 +10760,7 @@ var SpineMesh = /*#__PURE__*/ function() {
             maskOrder,
             maskOrder
         ] : undefined;
-        setBlending(material, this.blendMode, pma);
+        setBlending(material, this.blendMode);
         setMaskMode(material, maskMode);
         return material;
     };
@@ -10999,7 +10999,6 @@ var SlotGroup = /*#__PURE__*/ function() {
                         texture: texture,
                         name: this.meshName,
                         priority: this.listIndex += 0.01,
-                        pma: pma,
                         renderOptions: this.renderOptions,
                         engine: this.engine
                     });
@@ -11493,7 +11492,7 @@ registerPlugin("spine", /*#__PURE__*/ function(AbstractPlugin) {
 }(AbstractPlugin), VFXItem);
 /**
  * 插件版本号
- */ var version = "2.3.4";
+ */ var version = "2.3.6";
 logger.info("Plugin spine version: " + version + ".");
 if (version !== EFFECTS.version) {
     console.error("注意：请统一 Spine 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Spine plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");