@meta2d/core 1.0.18 → 1.0.20

package/src/pen/model.js

@@ -49,7 +49,7 @@ export var needCalcTextRectProps = [
     'ellipsis',
     'keepDecimal',
 ];
-export var needSetPenProps = ['x', 'y', 'width', 'height'];
+export var needSetPenProps = ['x', 'y', 'width', 'height', 'flipX', 'flipY'];
 export var needPatchFlagsPenRectProps = [
     'paddingTop',
     'paddingRight',
@@ -182,5 +182,10 @@ export function clearLifeCycle(pen) {
     pen.onInput = undefined;
     pen.onChangeId = undefined;
     pen.onBinds = undefined;
+    pen.onStartVideo = undefined;
+    pen.onPauseVideo = undefined;
+    pen.onStopVideo = undefined;
+    pen.onRenderPenRaw = undefined;
+    pen.onKeyDown = undefined;
 }
 //# sourceMappingURL=model.js.map

package/src/pen/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}

package/src/pen/render.d.ts

@@ -31,7 +31,7 @@ export declare function getFont({ fontStyle, textDecoration, fontWeight, fontSiz
     lineHeight?: number;
 }): string;
 export declare function ctxFlip(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen): void;
-export declare function ctxRotate(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen): void;
+export declare function ctxRotate(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen, noFlip?: boolean): void;
 export declare function renderPen(ctx: CanvasRenderingContext2D, pen: Pen): void;
 /**
  * 更改 ctx 的 lineCap 属性

package/src/pen/render.js

@@ -653,7 +653,34 @@ export function drawImage(ctx, pen) {
         ctx.rotate((iconRotate * Math.PI) / 180);
         ctx.translate(-centerX, -centerY);
     }
-    ctx.drawImage(img, x, y, width, height);
+    if (pen.imageRadius) {
+        ctx.save();
+        var wr = pen.calculative.imageRadius || 0, hr = wr;
+        var _d = pen.calculative.worldRect, _x = _d.x, _y = _d.y, w = _d.width, h = _d.height, ex = _d.ex, ey = _d.ey;
+        if (wr < 1) {
+            wr = w * wr;
+            hr = h * hr;
+        }
+        var r = wr < hr ? wr : hr;
+        if (w < 2 * r) {
+            r = w / 2;
+        }
+        if (h < 2 * r) {
+            r = h / 2;
+        }
+        ctx.beginPath();
+        ctx.moveTo(_x + r, _y);
+        ctx.arcTo(ex, _y, ex, ey, r);
+        ctx.arcTo(ex, ey, _x, ey, r);
+        ctx.arcTo(_x, ey, _x, _y, r);
+        ctx.arcTo(_x, _y, ex, _y, r);
+        ctx.clip();
+        ctx.drawImage(img, x, y, width, height);
+        ctx.restore();
+    }
+    else {
+        ctx.drawImage(img, x, y, width, height);
+    }
 }
 /**
  * 获取文字颜色， textColor 优先其次 color
@@ -883,16 +910,19 @@ export function ctxFlip(ctx, pen) {
         ctx.scale(1, -1);
     }
 }
-export function ctxRotate(ctx, pen) {
+export function ctxRotate(ctx, pen, noFlip) {
+    if (noFlip === void 0) { noFlip = false; }
     var _a = pen.calculative.worldRect.center, x = _a.x, y = _a.y;
     ctx.translate(x, y);
     var rotate = (pen.calculative.rotate * Math.PI) / 180;
     // 目前只有水平和垂直翻转，都需要 * -1
-    if (pen.calculative.flipX) {
-        rotate *= -1;
-    }
-    else if (pen.calculative.flipY) {
-        rotate *= -1;
+    if (!noFlip) {
+        if (pen.calculative.flipX) {
+            rotate *= -1;
+        }
+        if (pen.calculative.flipY) {
+            rotate *= -1;
+        }
     }
     ctx.rotate(rotate);
     ctx.translate(-x, -y);
@@ -902,6 +932,12 @@ export function renderPen(ctx, pen) {
     ctx.save();
     ctx.translate(0.5, 0.5);
     ctx.beginPath();
+    var store = pen.calculative.canvas.store;
+    var textFlip = pen.textFlip || store.options.textFlip;
+    var textRotate = pen.textRotate || store.options.textRotate;
+    if (!textFlip || !textRotate) {
+        ctx.save();
+    }
     ctxFlip(ctx, pen);
     if (pen.calculative.rotate && pen.name !== 'line') {
         ctxRotate(ctx, pen);
@@ -909,7 +945,6 @@ export function renderPen(ctx, pen) {
     if (pen.calculative.lineWidth > 1) {
         ctx.lineWidth = pen.calculative.lineWidth;
     }
-    var store = pen.calculative.canvas.store;
     inspectRect(ctx, store, pen); // 审查 rect
     var fill;
     // 该变量控制在 hover active 状态下的节点是否设置填充颜色
@@ -1044,6 +1079,17 @@ export function renderPen(ctx, pen) {
     if (!(pen.image && pen.calculative.img) && pen.calculative.icon) {
         drawIcon(ctx, pen);
     }
+    if (!textFlip || !textRotate) {
+        ctx.restore();
+    }
+    if (textFlip && !textRotate) {
+        ctxFlip(ctx, pen);
+    }
+    if (!textFlip && textRotate) {
+        if (pen.calculative.rotate && pen.name !== 'line') {
+            ctxRotate(ctx, pen, true);
+        }
+    }
     drawText(ctx, pen);
     if (pen.type === PenType.Line && pen.fillTexts) {
         try {
@@ -1101,7 +1147,13 @@ export function renderPenRaw(ctx, pen, rect) {
     // for canvas2svg
     (_c = (_b = ctx).setAttrs) === null || _c === void 0 ? void 0 : _c.call(_b, pen);
     // end
+    var store = pen.calculative.canvas.store;
+    var textFlip = pen.textFlip || store.options.textFlip;
+    var textRotate = pen.textRotate || store.options.textRotate;
     ctx.beginPath();
+    if (!textFlip || !textRotate) {
+        ctx.save();
+    }
     if (pen.calculative.flipX) {
         if (rect) {
             ctx.translate(pen.calculative.worldRect.x + pen.calculative.worldRect.ex, 0);
@@ -1126,7 +1178,6 @@ export function renderPenRaw(ctx, pen, rect) {
     if (pen.calculative.lineWidth > 1) {
         ctx.lineWidth = pen.calculative.lineWidth;
     }
-    var store = pen.calculative.canvas.store;
     var fill;
     if (pen.calculative.hover) {
         ctx.strokeStyle = pen.hoverColor || store.options.hoverColor;
@@ -1189,6 +1240,34 @@ export function renderPenRaw(ctx, pen, rect) {
     else if (pen.calculative.icon) {
         drawIcon(ctx, pen);
     }
+    if (!textFlip || !textRotate) {
+        ctx.restore();
+    }
+    if (textFlip && !textRotate) {
+        if (pen.calculative.flipX) {
+            if (rect) {
+                ctx.translate(pen.calculative.worldRect.x + pen.calculative.worldRect.ex, 0);
+            }
+            else {
+                ctx.translate(pen.calculative.worldRect.x + pen.calculative.worldRect.ex, 0);
+            }
+            ctx.scale(-1, 1);
+        }
+        if (pen.calculative.flipY) {
+            if (rect) {
+                ctx.translate(0, pen.calculative.worldRect.y + pen.calculative.worldRect.ey);
+            }
+            else {
+                ctx.translate(0, pen.calculative.worldRect.y + pen.calculative.worldRect.ey);
+            }
+            ctx.scale(1, -1);
+        }
+    }
+    if (!textFlip && textRotate) {
+        if (pen.calculative.rotate && pen.name !== 'line') {
+            ctxRotate(ctx, pen, true);
+        }
+    }
     drawText(ctx, pen);
     if (pen.type === PenType.Line && pen.fillTexts) {
         try {
@@ -1548,7 +1627,18 @@ export function calcWorldAnchors(pen) {
     var store = pen.calculative.canvas.store;
     var anchors = [];
     if (pen.anchors) {
-        pen.anchors.forEach(function (anchor) {
+        var _anchors = deepClone(pen.anchors);
+        if (pen.flipX) {
+            _anchors.forEach(function (anchor) {
+                anchor.x = 0.5 - (anchor.x - 0.5);
+            });
+        }
+        if (pen.flipY) {
+            _anchors.forEach(function (anchor) {
+                anchor.y = 0.5 - (anchor.y - 0.5);
+            });
+        }
+        _anchors.forEach(function (anchor) {
             anchors.push(calcWorldPointOfPen(pen, anchor));
         });
     }
@@ -1712,6 +1802,14 @@ export function facePen(pt, pen) {
     if (!pen || !pen.calculative || !pen.calculative.worldRect.center) {
         return Direction.None;
     }
+    if (pt.anchorId) {
+        var anchor = pen.anchors.filter(function (_anchor) { return _anchor.id === pt.anchorId; });
+        if (anchor.length) {
+            if (anchor[0].direction > -1) {
+                return anchor[0].direction;
+            }
+        }
+    }
     return facePoint(pt, pen.calculative.worldRect.center);
 }
 export function nearestAnchor(pen, pt) {
@@ -2459,14 +2557,14 @@ export function setChildValue(pen, data) {
             pen[k] = data[k];
             pen.calculative[k] = data[k];
         }
-        if (pen.calculative.canvas.parent.isCombine(pen) &&
-            pen.showChild === undefined) {
-            var children = pen.children;
-            children === null || children === void 0 ? void 0 : children.forEach(function (childId) {
-                var child = pen.calculative.canvas.store.pens[childId];
-                setChildValue(child, data);
-            });
-        }
+    }
+    if (pen.calculative.canvas.parent.isCombine(pen) &&
+        pen.showChild === undefined) {
+        var children = pen.children;
+        children === null || children === void 0 ? void 0 : children.forEach(function (childId) {
+            var child = pen.calculative.canvas.store.pens[childId];
+            setChildValue(child, data);
+        });
     }
 }
 //# sourceMappingURL=render.js.map