@galacean/effects-plugin-spine 2.10.0-alpha.0 → 2.10.0-alpha.2

package/dist/index.mjs

@@ -3,11 +3,11 @@
  * Description: Galacean Effects player spine plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 十弦
- * Version: v2.10.0-alpha.0
+ * Version: v2.10.0-alpha.2
  */
 
 import * as EFFECTS from '@galacean/effects';
-import { assertExist, glContext, Mesh, Geometry, Material, GLSLVersion, PLAYER_OPTIONS_ENV_EDITOR, math, serialize, effectsClass, spec, MaskMode, HitTestType, RendererComponent, Plugin, registerPlugin, logger } from '@galacean/effects';
+import { assertExist, glContext, Mesh, VertexBuffer, Geometry, Material, GLSLVersion, PLAYER_OPTIONS_ENV_EDITOR, math, serialize, effectsClass, spec, HitTestType, RendererComponent, Plugin, registerPlugin, logger } from '@galacean/effects';
 
 function _set_prototype_of(o, p) {
     _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
@@ -10746,21 +10746,20 @@ typeof SuppressedError === "function" ? SuppressedError : function _SuppressedEr
 
 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;uniform vec2 _Size;varying vec4 vLight;varying vec4 vDark;varying vec2 vTexCoords;void main(){vLight=aColor;vDark=aColor2;vTexCoords=aTexCoords;gl_Position=effects_MatrixVP*effects_ObjectToWorld*vec4(aPosition*_Size,0.0,1.0);}";
+var vs = "attribute vec2 aPos;attribute vec4 aColor;attribute vec4 aColor2;attribute vec2 aUV;uniform mat4 effects_ObjectToWorld;uniform mat4 effects_MatrixVP;uniform vec2 _Size;varying vec4 vLight;varying vec4 vDark;varying vec2 vTexCoords;void main(){vLight=aColor;vDark=aColor2;vTexCoords=aUV;gl_Position=effects_MatrixVP*effects_ObjectToWorld*vec4(aPos*_Size,0.0,1.0);}";
 
 var seed = 1;
 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, _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;
+        var blendMode = renderInfo.blendMode, texture = renderInfo.texture, priority = renderInfo.priority, _renderInfo_name = renderInfo.name, name = _renderInfo_name === void 0 ? "MSpine" : _renderInfo_name, engine = renderInfo.engine;
         this.blendMode = blendMode;
         this.lastTexture = texture;
         this.priority = priority;
         this.engine = engine;
         this.geometry = this.createGeometry();
-        this.material = this.createMaterial(maskMode, mask);
+        this.material = this.createMaterial();
         this.mesh = Mesh.create(engine, {
             name: name + seed++,
             priority: this.priority,
@@ -10774,43 +10773,39 @@ var SpineMesh = /*#__PURE__*/ function() {
     _proto.createGeometry = function createGeometry() {
         var BYTES_PER_ELEMENT = Float32Array.BYTES_PER_ELEMENT;
         var stride = BYTES_PER_ELEMENT * SlotGroup.VERTEX_SIZE;
-        var attributes = {
-            "aPosition": {
-                size: 2,
-                offset: 0,
-                stride: stride,
-                data: new Float32Array(0)
-            },
-            "aColor": {
-                size: 4,
-                offset: 2 * BYTES_PER_ELEMENT,
-                stride: stride,
-                dataSource: "aPosition"
-            },
-            "aTexCoords": {
-                size: 2,
-                offset: 6 * BYTES_PER_ELEMENT,
-                stride: stride,
-                dataSource: "aPosition"
-            },
-            "aColor2": {
-                size: 4,
-                offset: 8 * BYTES_PER_ELEMENT,
-                stride: stride,
-                dataSource: "aPosition"
-            }
-        };
+        var _obj;
+        var attributes = (_obj = {}, _obj[VertexBuffer.PositionKind] = {
+            size: 2,
+            offset: 0,
+            stride: stride,
+            data: new Float32Array(0)
+        }, _obj[VertexBuffer.ColorKind] = {
+            size: 4,
+            offset: 2 * BYTES_PER_ELEMENT,
+            stride: stride,
+            dataSource: VertexBuffer.PositionKind
+        }, _obj[VertexBuffer.UVKind] = {
+            size: 2,
+            offset: 6 * BYTES_PER_ELEMENT,
+            stride: stride,
+            dataSource: VertexBuffer.PositionKind
+        }, _obj.aColor2 = {
+            size: 4,
+            offset: 8 * BYTES_PER_ELEMENT,
+            stride: stride,
+            dataSource: VertexBuffer.PositionKind
+        }, _obj);
         return Geometry.create(this.engine, {
             attributes: attributes,
             indices: {
-                data: new Uint16Array(0),
-                releasable: true
+                data: new Uint16Array(0)
             },
             mode: glContext.TRIANGLES,
-            maxVertex: SlotGroup.MAX_VERTICES
+            maxVertex: SlotGroup.MAX_VERTICES,
+            bufferUsage: glContext.DYNAMIC_DRAW
         });
     };
-    _proto.createMaterial = function createMaterial(maskMode, maskOrder) {
+    _proto.createMaterial = function createMaterial() {
         var material = Material.create(this.engine, {
             shader: createShader(this.engine)
         });
@@ -10846,7 +10841,7 @@ var SpineMesh = /*#__PURE__*/ function() {
         for(var i1 = this.indicesLength; i1 < this.indices.length; i1++){
             this.indices[i1] = 0;
         }
-        this.geometry.setAttributeData("aPosition", this.vertices);
+        this.geometry.setAttributeData(VertexBuffer.PositionKind, this.vertices);
         this.geometry.setIndexData(this.indices);
         this.geometry.setDrawCount(this.indicesLength);
     };
@@ -10923,7 +10918,6 @@ var SlotGroup = /*#__PURE__*/ function() {
         this.transform = props.transform;
         this.listIndex = props.listIndex;
         this.pma = props.pma;
-        this.renderOptions = props.renderOptions;
         this.engine = props.engine;
     }
     var _proto = SlotGroup.prototype;
@@ -11056,7 +11050,6 @@ var SlotGroup = /*#__PURE__*/ function() {
                         texture: texture,
                         name: this.meshName,
                         priority: this.listIndex += 0.01,
-                        renderOptions: this.renderOptions,
                         engine: this.engine
                     });
                     currentIndex = this.meshGroups.length;
@@ -11140,16 +11133,11 @@ var SpineComponent = /*#__PURE__*/ function(RendererComponent) {
         this.options = data.options;
         this.rendererOptions = _extends({
             renderMode: spec.RenderMode.MESH
-        }, data.renderer || {}, {
-            mask: 0,
-            maskMode: MaskMode.NONE
-        });
+        }, data.renderer || {});
         this.item.getHitTestParams = this.getHitTestParams.bind(this);
         if (data.mask) {
             this.maskManager.setMaskOptions(this.engine, data.mask);
         }
-        this.rendererOptions.maskMode = this.maskManager.maskMode;
-        this.rendererOptions.mask = this.maskManager.getRefValue();
         // 兼容编辑器逻辑
         if (!this.resource || !Object.keys(this.resource).length) {
             return;
@@ -11273,7 +11261,6 @@ var SpineComponent = /*#__PURE__*/ function(RendererComponent) {
             meshName: this.name,
             transform: this.transform,
             pma: this.pma,
-            renderOptions: this.rendererOptions,
             engine: this.engine
         });
     };
@@ -11599,7 +11586,7 @@ var SpineLoader = /*#__PURE__*/ function(Plugin) {
 registerPlugin("spine", SpineLoader);
 /**
  * 插件版本号
- */ var version = "2.10.0-alpha.0";
+ */ var version = "2.10.0-alpha.2";
 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!");