@meta2d/core 1.0.79 → 1.0.81-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.79",
+  "version": "1.0.81-alpha.1",
   "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
   "main": "index.js",
   "types": "index.d.ts",

package/src/canvas/canvas.d.ts

@@ -260,6 +260,7 @@ export declare class Canvas {
      */
     private firefoxLoadSvg;
     loadImage(pen: Pen): void;
+    __loadImage(src: string): Promise<unknown>;
     private imageTimer;
     imageLoaded(): void;
     private templateImageTimer;

package/src/canvas/canvas.js

@@ -2424,7 +2424,7 @@ export class Canvas {
         // const pens = deepClone(this.store.active, true);
         const gridSize = this.store.data.gridSize || this.store.options.gridSize;
         const { origin, scale } = this.store.data;
-        const autoAlignGrid = this.store.options.autoAlignGrid && this.store.data.grid;
+        const autoAlignGrid = this.store.options.autoAlignGrid && (this.store.data.grid || this.store.options.grid);
         movedPens.forEach((pen) => {
             const i = this.movingPens.findIndex((item) => item.id === pen.id + movingSuffix);
             if (i < 0) {
@@ -3259,6 +3259,7 @@ export class Canvas {
                 else if (!pen.height) {
                     pen.width = this.width;
                 }
+                this.updatePenRect(pen);
             }
             calcInView(pen);
         }
@@ -3645,6 +3646,12 @@ export class Canvas {
             });
         }
         !pen.rotate && (pen.rotate = 0);
+        pen.lineAnimateImages ??= [];
+        if (pen.lineAnimateImages) {
+            pen.lineAnimateImages.forEach((src) => {
+                this.__loadImage(src);
+            });
+        }
         this.loadImage(pen);
         this.parent.penNetwork(pen);
     }
@@ -3965,6 +3972,29 @@ export class Canvas {
             pen.calculative.strokeImage = pen.strokeImage;
         }
     }
+    // 加载图片到全局缓存
+    __loadImage(src) {
+        return new Promise(resolve => {
+            if (!globalStore.htmlElements[src]) {
+                const img = new Image();
+                img.crossOrigin = 'anonymous';
+                img.src = src;
+                if (this.store.options.cdn &&
+                    !(src.startsWith('http') ||
+                        src.startsWith('//') ||
+                        src.startsWith('data:image'))) {
+                    img.src = this.store.options.cdn + src;
+                }
+                img.onload = () => {
+                    globalStore.htmlElements[src] = img;
+                    resolve(img);
+                };
+            }
+            else {
+                resolve(globalStore.htmlElements[src]);
+            }
+        });
+    }
     imageTimer;
     // 避免初始化图片加载重复调用 render，此处防抖
     imageLoaded() {