@galacean/effects-plugin-spine 2.0.0-alpha.27 → 2.0.0-alpha.29

package/dist/alipay.js

@@ -11080,9 +11080,9 @@ var SlotGroup = /*#__PURE__*/ function() {
 var Vector2 = EFFECTS.math.Vector2, Vector3 = EFFECTS.math.Vector3;
 exports.SpineComponent = /*#__PURE__*/ function(RendererComponent) {
     _inherits(SpineComponent, RendererComponent);
-    function SpineComponent() {
+    function SpineComponent(engine) {
         var _this;
-        _this = RendererComponent.apply(this, arguments) || this;
+        _this = RendererComponent.call(this, engine) || this;
         /**
    * aabb 包围盒与 skeleton 原点的距离
    */ _this.offset = new Vector2();
@@ -11092,9 +11092,21 @@ exports.SpineComponent = /*#__PURE__*/ function(RendererComponent) {
         return _this;
     }
     var _proto = SpineComponent.prototype;
+    // TODO 发包后修改
+    // override fromData (data: spec.SpineComponent<TextureAtlas, SkeletonData>)
     _proto.fromData = function fromData(data) {
         RendererComponent.prototype.fromData.call(this, data);
-        var _this_resource = this.resource, textures = _this_resource.images, skeletonType = _this_resource.skeletonType, atlasOptions = _this_resource.atlas, skeletonOptions = _this_resource.skeleton;
+        this.options = data.options;
+        this.item.getHitTestParams = this.getHitTestParams.bind(this);
+        // 兼容编辑器逻辑
+        if (!this.resource || !Object.keys(this.resource).length) {
+            return;
+        }
+        var _this_resource = this.resource, textures = _this_resource.images, skeletonType = _this_resource.skeletonType, atlasOptions = _this_resource.atlas, skeletonOptions = _this_resource.skeleton, editorResourceID = _this_resource.editorResourceID;
+        // 编辑器缓存解析资源，不再解析
+        if (this.cache) {
+            return;
+        }
         var _atlasOptions_source = atlasOptions.source, start = _atlasOptions_source[0], bufferLength = _atlasOptions_source[1];
         var atlasBuffer = bufferLength ? new Uint8Array(atlasOptions.bins.buffer, start, bufferLength) : new Uint8Array(atlasOptions.bins.buffer, start);
         var atlas = readAtlasData(atlasBuffer, textures);
@@ -11103,21 +11115,25 @@ exports.SpineComponent = /*#__PURE__*/ function(RendererComponent) {
         var skeletonBuffer = skelBufferLength ? skBuffer.slice(skelStart, skelStart + skelBufferLength) : skBuffer.slice(skelStart);
         var skeletonFile = getSkeletonFromBuffer(skeletonBuffer, skeletonType);
         var skeletonData = createSkeletonData(atlas, skeletonFile, skeletonType);
-        this.spineDataCache = {
+        this.cache = {
             atlas: atlas,
             skeletonData: skeletonData
         };
-        this.options = data.options;
-        this.item.getHitTestParams = this.getHitTestParams.bind(this);
+        if (editorResourceID) {
+            this.cache.editorResourceID = editorResourceID;
+        }
     };
     _proto.start = function start() {
         RendererComponent.prototype.start.call(this);
-        this.initContent(this.spineDataCache.atlas, this.spineDataCache.skeletonData, this.options);
+        if (!this.cache) {
+            return;
+        }
+        this.initContent(this.cache.atlas, this.cache.skeletonData, this.options);
         // @ts-expect-error
         this.startSize = this.options.startSize;
         // @ts-expect-error
         this.renderer = this.options.renderer;
-        if (!this.state) {
+        if (!(this.state && this.skeleton)) {
             return;
         }
         this.state.apply(this.skeleton);
@@ -11170,8 +11186,7 @@ exports.SpineComponent = /*#__PURE__*/ function(RendererComponent) {
         } else {
             this.setAnimationList(activeAnimation, spineOptions.speed);
         }
-        this.spineDataCache = _extends({}, this.spineDataCache, {
-            skeletonInstance: this.skeleton,
+        this.cache = _extends({}, this.cache, {
             skinList: this.skinList,
             animationList: this.animationList
         });
@@ -11436,15 +11451,30 @@ exports.SpineComponent = /*#__PURE__*/ function(RendererComponent) {
         var scale = this.transform.scale;
         var scaleFactor;
         if (this.resizeRule) {
+            var camera = this.item.composition.camera;
             var z = this.transform.getWorldPosition().z;
-            var _this_item_composition_camera_getInverseVPRatio = this.item.composition.camera.getInverseVPRatio(z), rx = _this_item_composition_camera_getInverseVPRatio.x;
-            scaleFactor = rx / 1500;
+            var _camera_getInverseVPRatio = camera.getInverseVPRatio(z), rx = _camera_getInverseVPRatio.x, ry = _camera_getInverseVPRatio.y;
+            if (camera.clipMode === EFFECTS.spec.CameraClipMode.portrait) {
+                scaleFactor = rx / 1500;
+            } else {
+                scaleFactor = ry / 3248;
+            }
         } else {
             scaleFactor = 1 / width;
         }
         this.scaleFactor = scaleFactor;
         this.transform.setScale(this.startSize * scaleFactor, this.startSize * scaleFactor, scale.z);
     };
+    // 转换当前大小为旧缩放规则下的大小
+    _proto.convertSizeToOldRule = function convertSizeToOldRule() {
+        var res = this.getBounds();
+        if (!res || !this.item.composition || !this.resizeRule) {
+            return 1;
+        }
+        var width = res.width;
+        var scaleFactor = this.scaleFactor;
+        return this.startSize * scaleFactor * width;
+    };
     _proto.getBounds = function getBounds() {
         if (!(this.state && this.skeleton)) {
             return;
@@ -11463,6 +11493,9 @@ exports.SpineComponent = /*#__PURE__*/ function(RendererComponent) {
 __decorate([
     EFFECTS.serialize()
 ], exports.SpineComponent.prototype, "resource", void 0);
+__decorate([
+    EFFECTS.serialize()
+], exports.SpineComponent.prototype, "cache", void 0);
 exports.SpineComponent = __decorate([
     EFFECTS.effectsClass("SpineComponent")
 ], exports.SpineComponent);
@@ -11474,7 +11507,7 @@ EFFECTS.registerPlugin("spine", /*#__PURE__*/ function(AbstractPlugin) {
     }
     return SpineLoader;
 }(EFFECTS.AbstractPlugin), EFFECTS.VFXItem);
-var version = "2.0.0-alpha.27";
+var version = "2.0.0-alpha.29";
 EFFECTS.logger.info("Plugin spine version: " + version + ".");
 if (version !== EFFECTS__namespace.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!");