@meta2d/core 1.0.97 → 1.0.99

package/src/pen/model.d.ts

@@ -222,7 +222,7 @@ export interface Pen extends Rect {
     lineAnimateDash?: number[] | string;
     lineAnimateDashOffset?: number;
     lineAnimateElementCount?: number;
-    lineAnimateType?: LineAnimateType;
+    lineAnimateType?: LineAnimateType | LineAnimateType[];
     lineAnimateTargetType?: lineAnimateTargetType;
     lineAnimateElementWidth?: number;
     lineAnimateElementHeight?: number;

package/src/pen/render.js

@@ -637,13 +637,13 @@ function linearGradient(ctx, worldRect, fromColor, toColor, angle) {
  * @param pen 画笔
  */
 function getImagePosition(pen) {
-    const { worldIconRect: rect, iconWidth, iconHeight, imgNaturalWidth, imgNaturalHeight, } = pen.calculative;
+    const { worldIconRect: rect, iconWidth, iconHeight, imgNaturalWidth, imgNaturalHeight, worldRect } = pen.calculative;
     if (!rect) {
         return {
-            x: 0,
-            y: 0,
-            width: imgNaturalWidth || pen.calculative.img.naturalWidth,
-            height: imgNaturalHeight || pen.calculative.img.naturalHeight,
+            x: worldRect.x,
+            y: worldRect.y,
+            width: worldRect.width || imgNaturalWidth || pen.calculative.img.naturalWidth,
+            height: worldRect.width || imgNaturalHeight || pen.calculative.img.naturalHeight,
         };
     }
     ;
@@ -1783,8 +1783,18 @@ export function setCtxLineAnimate(ctx, pen, store) {
     }
     pen.calculative.animateLineWidth &&
         (ctx.lineWidth = pen.calculative.animateLineWidth * store.data.scale);
+    if (Array.isArray(pen.lineAnimateType)) {
+        pen.lineAnimateType.forEach(type => {
+            renderLineAnimate(pen, store, type, ctx);
+        });
+    }
+    else {
+        renderLineAnimate(pen, store, pen.lineAnimateType, ctx);
+    }
+}
+function renderLineAnimate(pen, store, type, ctx) {
     let len = 0;
-    switch (pen.lineAnimateType) {
+    switch (type) {
         case LineAnimateType.Beads:
             if (pen.animateReverse) {
                 ctx.lineDashOffset = pen.calculative.animatePos;