@galacean/effects-plugin-spine 2.6.5 → 2.7.0-alpha.0

package/dist/index.mjs

@@ -3,11 +3,11 @@
  * Description: Galacean Effects player spine plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 十弦
- * Version: v2.6.5
+ * Version: v2.7.0-alpha.0
  */
 
 import * as EFFECTS from '@galacean/effects';
-import { assertExist, glContext, Mesh, Geometry, Material, math, setMaskMode, GLSLVersion, PLAYER_OPTIONS_ENV_EDITOR, serialize, effectsClass, spec, MaskProcessor, MaskMode, HitTestType, RendererComponent, registerPlugin, VFXItem, logger, AbstractPlugin } from '@galacean/effects';
+import { assertExist, glContext, Mesh, Geometry, Material, setMaskMode, GLSLVersion, PLAYER_OPTIONS_ENV_EDITOR, math, serialize, effectsClass, spec, MaskProcessor, MaskMode, HitTestType, RendererComponent, registerPlugin, VFXItem, logger, AbstractPlugin } from '@galacean/effects';
 
 function _set_prototype_of(o, p) {
     _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
@@ -10678,7 +10678,7 @@ 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;\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*_Size,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}";
+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 seed = 1;
 var SpineMesh = /*#__PURE__*/ function() {
@@ -10744,14 +10744,9 @@ var SpineMesh = /*#__PURE__*/ function() {
     };
     _proto.createMaterial = function createMaterial(maskMode, maskOrder) {
         var material = Material.create(this.engine, {
-            shader: createShader(this.engine),
-            uniformSemantics: {
-                effects_MatrixVP: "VIEWPROJECTION",
-                uEditorTransform: "EDITOR_TRANSFORM"
-            }
+            shader: createShader(this.engine)
         });
         material.setTexture("uTexture", this.lastTexture);
-        material.setMatrix("effects_ObjectToWorld", math.Matrix4.fromIdentity());
         material.blending = true;
         material.culling = false;
         material.depthTest = false;
@@ -10791,7 +10786,6 @@ var SpineMesh = /*#__PURE__*/ function() {
         this.geometry.setAttributeData("aPosition", this.vertices);
         this.geometry.setIndexData(this.indices);
         this.geometry.setDrawCount(this.indicesLength);
-        this.material.setMatrix("effects_ObjectToWorld", worldMatrix);
     };
     _proto.startUpdate = function startUpdate() {
         this.verticesLength = 0;
@@ -11240,6 +11234,12 @@ var SpineComponent = /*#__PURE__*/ function(RendererComponent) {
         var p1 = new Vector3(centerX + width / 2, centerY - height / 2, 0);
         var p2 = new Vector3(centerX + width / 2, centerY + height / 2, 0);
         var p3 = new Vector3(centerX - width / 2, centerY + height / 2, 0);
+        // TODO: 优化 Spine 初始大小逻辑
+        var startSizeScaleFactor = this.startSize * this.scaleFactor;
+        p0.multiply(startSizeScaleFactor);
+        p1.multiply(startSizeScaleFactor);
+        p2.multiply(startSizeScaleFactor);
+        p3.multiply(startSizeScaleFactor);
         wm.projectPoint(p0);
         wm.projectPoint(p1);
         wm.projectPoint(p2);
@@ -11535,7 +11535,7 @@ registerPlugin("spine", /*#__PURE__*/ function(AbstractPlugin) {
 }(AbstractPlugin), VFXItem);
 /**
  * 插件版本号
- */ var version = "2.6.5";
+ */ var version = "2.7.0-alpha.0";
 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!");