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

package/dist/plugin-renderer-lottie.d.ts

@@ -62,6 +62,7 @@ export declare class LottieSystem extends Renderer {
     init(): void;
     componentChanged(changed: ComponentChanged): Promise<void>;
     add(changed: ComponentChanged): Promise<void>;
+    getDir(url: string): string;
     remove(changed: ComponentChanged): void;
 }
 

package/dist/plugin-renderer-lottie.esm.js

@@ -1,6 +1,6 @@
 import { decorators, OBSERVER_TYPE, resource, Component } from '@eva/eva.js';
 import { Renderer } from '@eva/plugin-renderer';
-import { UPDATE_PRIORITY, Ticker, Container, Texture as Texture$1, Graphics, Matrix as Matrix$1, Sprite, Rectangle, EventEmitter, Text, TextStyle } from 'pixi.js';
+import { UPDATE_PRIORITY, Ticker, Container, Texture, Graphics, Matrix as Matrix$1, Sprite, Assets, Text, TextStyle } from 'pixi.js';
 import iOSVersion from 'ios-version';
 
 /*! *****************************************************************************
@@ -10557,8 +10557,6 @@ function createSizedArray(len) {
   return Array.apply(null, { length: len });
 }
 
-window.$commands = [];
-
 class MatrixHelper extends Matrix$1 {
   reset() {
     // 重置为单位矩阵
@@ -11089,18 +11087,17 @@ class SpriteElement extends Sprite {
    * @param {object} config layer data information
    */
   constructor(lottieLayer, imageInfo) {
-    const { asset, texture } = imageInfo;
-    super(texture.baseTexture.texture);
+    const { texture: texturePromise } = imageInfo;
+    super();
     this.label = lottieLayer.fullname;
 
-    if (texture.baseTexture.texture.valid) {
-      texture.baseTexture.texture.orig = new Rectangle(0, 0, asset.w, asset.h);
-    } else {
-      texture.baseTexture.on('loaded', () => {
-        this.texture = texture.baseTexture.texture;
-        texture.baseTexture.texture.orig = new Rectangle(0, 0, asset.w, asset.h);
+    texturePromise
+      .then(texture => {
+        this.texture = texture;
+      })
+      .catch(e => {
+        console.error(e);
       });
-    }
 
     this.lottieLayer = lottieLayer;
 
@@ -11173,32 +11170,6 @@ class SpriteElement extends Sprite {
   }
 }
 
-class BaseTexture extends EventEmitter {
-  constructor(url) {
-    super();
-    this.texture = Texture$1.EMPTY;
-    this.img = new Image();
-    this.img.src = url;
-    this.img.onload = () => {
-      this.texture = Texture$1.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?:)?\/\//;
 
 /**
@@ -11254,25 +11225,20 @@ class LoadTexture extends Eventer {
     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 = Assets.load(url);
+      this.textures[id] = texturePromise;
       this._total++;
-      if (texture.baseTexture.valid || texture === Texture.EMPTY) {
-        this._received++;
-        this.emit('update');
-        if (this._received + this._failed >= this._total) this._onComplete();
-      } else {
-        texture.baseTexture.once('loaded', () => {
+      texturePromise
+        .then(() => {
           this._received++;
           this.emit('update');
           if (this._received + this._failed >= this._total) this._onComplete();
-        });
-        texture.baseTexture.once('error', () => {
+        })
+        .catch(e => {
           this._failed++;
           this.emit('update');
           if (this._received + this._failed >= this._total) this._onComplete();
         });
-      }
     });
   }
 
@@ -11820,7 +11786,8 @@ class AnimationGroup extends Eventer {
       },
     };
     session.fontManager.addChars(data.chars);
-    session.fontManager.addFonts(data.fonts, document.body);
+    // @TODO
+    // session.fontManager.addFonts(data.fonts, document.body);
 
     this._buildElements(session);
 
@@ -12284,11 +12251,11 @@ class AnimationGroup extends Eventer {
    * @param {*} image url | texture
    * @return {this}
    */
-  replaceImageByQuerySelector(selector, image = Texture$1.EMPTY) {
+  replaceImageByQuerySelector(selector, image = Texture.EMPTY) {
     const layerDisplay = this.getDisplayByQuerySelector(selector);
     if (layerDisplay && layerDisplay.isSprite) {
       const texture =
-        typeof image === 'string' ? Texture$1.from(image, { resourceOptions: { crossorigin: '*' } }) : image;
+        typeof image === 'string' ? Texture.from(image, { resourceOptions: { crossorigin: '*' } }) : image;
       layerDisplay.texture = texture;
     }
     return this;
@@ -12301,7 +12268,7 @@ class AnimationGroup extends Eventer {
    * @param {*} image url | texture or array[url | texture]
    * @return {this}
    */
-  replaceImageByQuerySelectorAll(selector, image = [Texture$1.EMPTY]) {
+  replaceImageByQuerySelectorAll(selector, image = [Texture.EMPTY]) {
     const layers = this.querySelectorAll(selector);
     const isArrImage = Tools.isArray(image);
     layers.forEach((layer, idx) => {
@@ -12310,7 +12277,7 @@ class AnimationGroup extends Eventer {
         const imageItem = isArrImage ? image[idx] : image;
         const texture =
           typeof imageItem === 'string'
-            ? Texture$1.from(imageItem, { resourceOptions: { crossorigin: '*' } })
+            ? Texture.from(imageItem, { resourceOptions: { crossorigin: '*' } })
             : imageItem;
         layerDisplay.texture = texture;
       }
@@ -12876,7 +12843,7 @@ class AnimationManager extends Eventer {
   }
 }
 
-const { major } = iOSVersion(window.navigator.userAgent) || {};
+const { major } = iOSVersion(globalThis.navigator.userAgent) || {};
 
 /**
  * dataURL 转成 blob
@@ -12962,14 +12929,16 @@ let LottieSystem = class LottieSystem extends Renderer {
             if (!container)
                 return;
             const _a = component.options, { resource: rn } = _a, otherOpts = __rest(_a, ["resource"]);
-            const { data } = yield resource.getResource(rn);
+            const res = yield resource.getResource(rn);
+            const data = res.data;
+            const url = res.src.json.url;
             const json = Object.assign({}, (data.json || {}));
             const assets = json.assets || [];
             assets.forEach(item => {
                 if (item.p)
                     item.p = imageHandle(item.p);
             });
-            const anim = this.manager.parseAnimation(Object.assign({ keyframes: json }, otherOpts));
+            const anim = this.manager.parseAnimation(Object.assign({ keyframes: json, prefix: this.getDir(url) }, otherOpts));
             component.anim = anim;
             container.addChildAt(anim.group, 0);
             this.managerLife.forEach(eventName => {
@@ -12979,6 +12948,9 @@ let LottieSystem = class LottieSystem extends Renderer {
                 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);
@@ -13031,7 +13003,10 @@ class Lottie extends Component {
                 this.currentSlot[name] = Sprite.from(value);
             }
             else if (type === 'TEXT') {
-                this.currentSlot[name] = new Text(value, new TextStyle(style));
+                this.currentSlot[name] = new Text({
+                    text: value,
+                    style: new TextStyle(style),
+                });
             }
             if (x)
                 this.currentSlot[name].x = x;
@@ -13066,9 +13041,7 @@ class Lottie extends Component {
         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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-lottie",
-  "version": "2.0.1-beta.3",
+  "version": "2.0.1-beta.5",
   "description": "@eva/plugin-renderer-lottie",
   "main": "index.js",
   "module": "dist/plugin-renderer-lottie.esm.js",
@@ -18,8 +18,8 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/eva.js": "2.0.1-beta.3",
-    "@eva/plugin-renderer": "2.0.1-beta.3",
+    "@eva/eva.js": "2.0.1-beta.5",
+    "@eva/plugin-renderer": "2.0.1-beta.5",
     "ios-version": "^1.0.1",
     "pixi.js": "^8.8.1"
   }