@eva/plugin-renderer-lottie 2.0.1-beta.3 → 2.0.1-beta.5

package/dist/EVA.plugin.renderer.lottie.js

@@ -7092,7 +7092,6 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
       length: len
     });
   }
-  window.$commands = [];
   class MatrixHelper extends pixi_js.Matrix {
     reset() {
       this.a = 1;
@@ -7445,19 +7444,15 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
   class SpriteElement extends pixi_js.Sprite {
     constructor(lottieLayer, imageInfo) {
       const {
-        asset,
-        texture
+        texture: texturePromise
       } = imageInfo;
-      super(texture.baseTexture.texture);
+      super();
       this.label = lottieLayer.fullname;
-      if (texture.baseTexture.texture.valid) {
-        texture.baseTexture.texture.orig = new pixi_js.Rectangle(0, 0, asset.w, asset.h);
-      } else {
-        texture.baseTexture.on('loaded', () => {
-          this.texture = texture.baseTexture.texture;
-          texture.baseTexture.texture.orig = new pixi_js.Rectangle(0, 0, asset.w, asset.h);
-        });
-      }
+      texturePromise.then(texture => {
+        this.texture = texture;
+      }).catch(e => {
+        console.error(e);
+      });
       this.lottieLayer = lottieLayer;
       if (this.lottieLayer.masks) {
         this.mask = new LottieGraphicsMask(this.lottieLayer.session.local, this.lottieLayer);
@@ -7500,29 +7495,6 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
       this.mask.updateMasks(masks);
     }
   }
-  class BaseTexture extends pixi_js.EventEmitter {
-    constructor(url) {
-      super();
-      this.texture = pixi_js.Texture.EMPTY;
-      this.img = new Image();
-      this.img.src = url;
-      this.img.onload = () => {
-        this.texture = pixi_js.Texture.from(this.img);
-        this.emit('loaded');
-      };
-      this.img.onerror = () => {
-        this.emit('error');
-      };
-    }
-  }
-  class Texture {
-    constructor(url) {
-      this.baseTexture = new BaseTexture(url);
-    }
-    static from(url) {
-      return new Texture(url);
-    }
-  }
   const regHttp = /^(https?:)?\/\//;
   function createUrl(asset, prefix) {
     if (asset.e === 1) return asset.p;
@@ -7562,25 +7534,18 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
       this.assets.forEach(asset => {
         const id = asset.id;
         const url = createUrl(asset, this.prefix);
-        const texture = url ? Texture.from(url, this.textureOptions) : Texture.EMPTY;
-        this.textures[id] = texture;
+        const texturePromise = pixi_js.Assets.load(url);
+        this.textures[id] = texturePromise;
         this._total++;
-        if (texture.baseTexture.valid || texture === Texture.EMPTY) {
+        texturePromise.then(() => {
           this._received++;
           this.emit('update');
           if (this._received + this._failed >= this._total) this._onComplete();
-        } else {
-          texture.baseTexture.once('loaded', () => {
-            this._received++;
-            this.emit('update');
-            if (this._received + this._failed >= this._total) this._onComplete();
-          });
-          texture.baseTexture.once('error', () => {
-            this._failed++;
-            this.emit('update');
-            if (this._received + this._failed >= this._total) this._onComplete();
-          });
-        }
+        }).catch(e => {
+          this._failed++;
+          this.emit('update');
+          if (this._received + this._failed >= this._total) this._onComplete();
+        });
       });
     }
     _onComplete() {
@@ -7792,7 +7757,6 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
         }
       };
       session.fontManager.addChars(data.chars);
-      session.fontManager.addFonts(data.fonts, document.body);
       this._buildElements(session);
       if (this.textureLoader !== null && this._justDisplayOnImagesLoaded && !this.textureLoader.loaded && this._justDisplayNeedSet !== null) {
         this.group.visible = false;
@@ -8400,7 +8364,7 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
   var iOSVersion = iosVersion;
   const {
     major
-  } = iOSVersion(window.navigator.userAgent) || {};
+  } = iOSVersion(globalThis.navigator.userAgent) || {};
   function dataURL2blob(dataURL) {
     let binaryString = atob(dataURL.split(',')[1]);
     let arrayBuffer = new ArrayBuffer(binaryString.length);
@@ -8466,16 +8430,17 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
             resource: rn
           } = _a,
           otherOpts = __rest(_a, ["resource"]);
-        const {
-          data
-        } = yield eva_js.resource.getResource(rn);
+        const res = yield eva_js.resource.getResource(rn);
+        const data = res.data;
+        const url = res.src.json.url;
         const json = _extends({}, data.json || {});
         const assets = json.assets || [];
         assets.forEach(item => {
           if (item.p) item.p = imageHandle(item.p);
         });
         const anim = this.manager.parseAnimation(_extends({
-          keyframes: json
+          keyframes: json,
+          prefix: this.getDir(url)
         }, otherOpts));
         component.anim = anim;
         container.addChildAt(anim.group, 0);
@@ -8485,6 +8450,9 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
         if (anim.isImagesLoaded) component.emit('success', {});
       });
     }
+    getDir(url) {
+      return new URL('./', url).href;
+    }
     remove(changed) {
       const component = changed.component;
       const container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
@@ -8558,7 +8526,10 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
         if (type === 'IMAGE') {
           this.currentSlot[name] = pixi_js.Sprite.from(value);
         } else if (type === 'TEXT') {
-          this.currentSlot[name] = new pixi_js.Text(value, new pixi_js.TextStyle(style));
+          this.currentSlot[name] = new pixi_js.Text({
+            text: value,
+            style: new pixi_js.TextStyle(style)
+          });
         }
         if (x) this.currentSlot[name].x = x;
         if (y) this.currentSlot[name].y = y;
@@ -8589,9 +8560,7 @@ var _EVA_IIFE_lottie = function (exports, eva_js, pluginRenderer, pixi_js) {
       this.on('success', () => {
         const ele = this.anim.querySelector(name);
         const display = ele.display;
-        g.beginFill(0xffffff);
-        g.drawRect(0, 0, 100, 100);
-        g.endFill();
+        g.rect(0, 0, 100, 100).fill(0xffffff);
         g.alpha = 0;
         display.addChild(g);
         ele.display.interactive = true;