@visactor/vrender 0.9.0-alpha.0

package/es/render/contributions/render/area-render.js

@@ -0,0 +1,166 @@
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}, __metadata = this && this.__metadata || function(k, v) {
+    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
+}, __param = this && this.__param || function(paramIndex, decorator) {
+    return function(target, key) {
+        decorator(target, key, paramIndex);
+    };
+};
+
+import { min } from "@visactor/vutils";
+
+import { inject, injectable, named } from "inversify";
+
+import { genLinearSegments, genBasisSegments, genMonotoneXSegments, genMonotoneYSegments, genStepSegments, drawAreaSegments, genLinearClosedSegments, ContributionProvider } from "../../../common";
+
+import { AREA_NUMBER_TYPE, getTheme } from "../../../graphic";
+
+import { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from "./utils";
+
+import { AreaRenderContribution } from "./contributions/area-contribution-render";
+
+import { BaseRenderContributionTime } from "./contributions";
+
+function calcLineCache(points, curveType, params) {
+    switch (curveType) {
+      case "linear":
+      default:
+        return genLinearSegments(points, params);
+
+      case "basis":
+        return genBasisSegments(points, params);
+
+      case "monotoneX":
+        return genMonotoneXSegments(points, params);
+
+      case "monotoneY":
+        return genMonotoneYSegments(points, params);
+
+      case "step":
+        return genStepSegments(points, .5, params);
+
+      case "stepBefore":
+        return genStepSegments(points, 0, params);
+
+      case "stepAfter":
+        return genStepSegments(points, 1, params);
+
+      case "linearClosed":
+        return genLinearClosedSegments(points, params);
+    }
+}
+
+let DefaultCanvasAreaRender = class {
+    constructor(areaRenderContribitions) {
+        this.areaRenderContribitions = areaRenderContribitions, this.numberType = AREA_NUMBER_TYPE;
+    }
+    drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
+        var _a, _b, _c, _d, _e, _f;
+        const areaAttribute = getTheme(area, null == params ? void 0 : params.theme).area, {fill: fill = (null == areaAttribute.fill ? !!area.attribute.fillColor : areaAttribute.fill), fillOpacity: fillOpacity = areaAttribute.fillOpacity, opacity: opacity = areaAttribute.opacity, visible: visible = areaAttribute.visible, z: z = areaAttribute.z, stroke: stroke = !!area.attribute.strokeColor, lineWidth: lineWidth = areaAttribute.lineWidth, strokeOpacity: strokeOpacity = areaAttribute.strokeOpacity} = area.attribute, fVisible = fillVisible(opacity, fillOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth), sVisible = strokeVisible(opacity, strokeOpacity);
+        if (!area.valid || !visible) return;
+        if (!doFill && !doStroke) return;
+        if (!(fVisible || fillCb || sVisible || strokeCb)) return;
+        const {clipRange: clipRange = areaAttribute.clipRange} = area.attribute;
+        if (area.shouldUpdateShape()) {
+            const {points: points, segments: segments, curveType: curveType = areaAttribute.curveType} = area.attribute;
+            if (segments && segments.length) {
+                let startPoint, lastTopSeg;
+                const topCaches = segments.map(((seg, index) => (1 === index ? startPoint = {
+                    x: lastTopSeg.endX,
+                    y: lastTopSeg.endY
+                } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY), 
+                lastTopSeg = calcLineCache(seg.points, curveType, {
+                    startPoint: startPoint
+                }), lastTopSeg)));
+                let lastBottomSeg;
+                const bottomCaches = [];
+                for (let i = segments.length - 1; i >= 0; i--) {
+                    const points = segments[i].points, bottomPoints = [];
+                    for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
+                        x: null !== (_a = points[i].x1) && void 0 !== _a ? _a : points[i].x,
+                        y: null !== (_b = points[i].y1) && void 0 !== _b ? _b : points[i].y
+                    });
+                    if (0 !== i) {
+                        const lastSegmentPoints = segments[i - 1].points, endPoint = lastSegmentPoints[lastSegmentPoints.length - 1];
+                        endPoint && bottomPoints.push({
+                            x: null !== (_c = endPoint.x1) && void 0 !== _c ? _c : endPoint.x,
+                            y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
+                        });
+                    }
+                    lastBottomSeg = calcLineCache(bottomPoints, curveType), bottomCaches.unshift(lastBottomSeg);
+                }
+                area.cacheArea = bottomCaches.map(((item, index) => ({
+                    top: topCaches[index],
+                    bottom: item
+                })));
+            } else {
+                if (!points || !points.length) return area.cache = null, void area.clearUpdateShapeTag();
+                {
+                    const topPoints = points, bottomPoints = [];
+                    for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
+                        x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : points[i].x,
+                        y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : points[i].y
+                    });
+                    const topCache = calcLineCache(topPoints, curveType), bottomCache = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType);
+                    area.cacheArea = {
+                        top: topCache,
+                        bottom: bottomCache
+                    };
+                }
+            }
+            area.clearUpdateShapeTag();
+        }
+        if (Array.isArray(area.cacheArea)) if (1 === clipRange) {
+            let skip = !1;
+            area.cacheArea.forEach(((cache, index) => {
+                skip || (skip = this.drawSegmentItem(context, cache, fill, fillOpacity, area.attribute.segments[index], [ areaAttribute, area.attribute ], clipRange, x, y, z, area, fillCb));
+            }));
+        } else {
+            const totalLength = area.cacheArea.reduce(((l, c) => l + c.top.getLength()), 0), totalDrawLength = clipRange * totalLength;
+            let drawedLengthUntilLast = 0, skip = !1;
+            area.cacheArea.forEach(((cache, index) => {
+                if (skip) return;
+                const curSegLength = cache.top.getLength(), _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
+                drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, fill, fillOpacity, area.attribute.segments[index], [ areaAttribute, area.attribute ], min(_cr, 1), x, y, z, area, fillCb));
+            }));
+        } else this.drawSegmentItem(context, area.cacheArea, fill, fillOpacity, area.attribute, areaAttribute, clipRange, x, y, z, area, fillCb);
+    }
+    draw(area, renderService, drawContext, params) {
+        const {context: context} = drawContext, areaAttribute = getTheme(area, null == params ? void 0 : params.theme).area;
+        let {x: x = areaAttribute.x, y: y = areaAttribute.y} = area.attribute;
+        if (context.highPerformanceSave(), area.transMatrix.onlyTranslate()) {
+            const point = area.getOffsetXY(areaAttribute);
+            x += point.x, y += point.y, context.setTransformForCurrent();
+        } else x = 0, y = 0, context.transformFromMatrix(area.transMatrix, !0);
+        drawPathProxy(area, context, x, y, drawContext, params) || this.drawShape(area, context, x, y, drawContext, params), 
+        context.highPerformanceRestore();
+    }
+    drawSegmentItem(context, cache, fill, fillOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, fillCb) {
+        context.beginPath();
+        return drawAreaSegments(context.camera ? context : context.nativeContext, cache, clipRange, {
+            offsetX: offsetX,
+            offsetY: offsetY,
+            offsetZ: offsetZ
+        }), this._areaRenderContribitions || (this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || [], 
+        this._areaRenderContribitions.sort(((a, b) => b.order - a.order))), this._areaRenderContribitions.forEach((c => {
+            c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, fillCb, null, {
+                attribute: attribute
+            });
+        })), context.setShadowStyle && context.setShadowStyle(area, attribute, defaultAttribute), 
+        !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute), 
+        context.fill())), this._areaRenderContribitions || (this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || []), 
+        this._areaRenderContribitions.forEach((c => {
+            c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, fillCb, null, {
+                attribute: attribute
+            });
+        })), !1;
+    }
+};
+
+DefaultCanvasAreaRender = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(AreaRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasAreaRender);
+
+export { DefaultCanvasAreaRender };
+//# sourceMappingURL=area-render.js.map

package/es/render/contributions/render/area-render.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/area-render.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAWtD,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAIf,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAA2B,MAAM,0CAA0C,CAAC;AAC3G,OAAO,EAAyB,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAEpF,SAAS,aAAa,CACpB,MAAoB,EACpB,SAAqB,EACrB,MAA2D;IAE3D,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,KAAK,OAAO;YACV,OAAO,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1C,KAAK,WAAW;YACd,OAAO,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,WAAW;YACd,OAAO,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,MAAM;YACT,OAAO,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,YAAY;YACf,OAAO,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,WAAW;YACd,OAAO,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,cAAc;YACjB,OAAO,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjD;YACE,OAAO,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC5C;AACH,CAAC;AAGM,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAKlC,YAGqB,uBAAsE;QAAtE,4BAAuB,GAAvB,uBAAuB,CAA+C;QAN3F,eAAU,GAAW,gBAAgB,CAAC;IAOnC,CAAC;IAEJ,SAAS,CACP,IAAW,EACX,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;;QAEZ,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,IAAI,CAAC;QACzD,MAAM,EACJ,IAAI,GAAG,aAAa,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EACnF,WAAW,GAAG,aAAa,CAAC,WAAW,EACvC,OAAO,GAAG,aAAa,CAAC,OAAO,EAC/B,OAAO,GAAG,aAAa,CAAC,OAAO,EAC/B,CAAC,GAAG,aAAa,CAAC,CAAC,EACnB,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EACrC,SAAS,GAAG,aAAa,CAAC,SAAS,EACnC,aAAa,GAAG,aAAa,CAAC,aAAa,EAC5C,GAAG,IAAI,CAAC,SAAS,CAAC;QAGnB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEvD,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,EAAE;YAC5B,OAAO;SACR;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE;YACxB,OAAO;SACR;QAGD,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACnD,OAAO;SACR;QAED,MAAM,EAAE,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAG/D,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAC5B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;YACjF,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;gBAC/B,IAAI,UAAsB,CAAC;gBAC3B,IAAI,UAAsB,CAAC;gBAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAE5C,IAAI,KAAK,KAAK,CAAC,EAAE;wBACf,UAAU,GAAG,EAAE,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;qBACzD;yBAAM,IAAI,KAAK,GAAG,CAAC,EAAE;wBACpB,UAAU,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC;wBAC/B,UAAU,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC;qBAChC;oBACD,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE;wBAChD,UAAU;qBACX,CAAC,CAAC;oBACH,OAAO,UAAU,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,IAAI,aAAyB,CAAC;gBAC9B,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;oBAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBAClC,MAAM,YAAY,GAAiB,EAAE,CAAC;oBACtC,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC3C,YAAY,CAAC,IAAI,CAAC;4BAChB,CAAC,EAAE,MAAA,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,mCAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC9B,CAAC,EAAE,MAAA,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,mCAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;yBAC/B,CAAC,CAAC;qBACJ;oBAED,IAAI,CAAC,KAAK,CAAC,EAAE;wBACX,MAAM,iBAAiB,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;wBACjD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBACjE,QAAQ;4BACN,YAAY,CAAC,IAAI,CAAC;gCAChB,CAAC,EAAE,MAAA,QAAQ,CAAC,EAAE,mCAAI,QAAQ,CAAC,CAAC;gCAC5B,CAAC,EAAE,MAAA,QAAQ,CAAC,EAAE,mCAAI,QAAQ,CAAC,CAAC;6BAC7B,CAAC,CAAC;qBACN;oBACD,aAAa,GAAG,aAAa,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;oBACvD,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;iBACrC;gBACD,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;oBAClD,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC;oBACrB,MAAM,EAAE,IAAI;iBACb,CAAC,CAAC,CAAC;aACL;iBAAM,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;gBAElC,MAAM,SAAS,GAAG,MAAM,CAAC;gBACzB,MAAM,YAAY,GAAiB,EAAE,CAAC;gBACtC,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;oBAC3C,YAAY,CAAC,IAAI,CAAC;wBAChB,CAAC,EAAE,MAAA,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,mCAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC9B,CAAC,EAAE,MAAA,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,mCAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;qBAC/B,CAAC,CAAC;iBACJ;gBACD,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACrD,MAAM,WAAW,GAAG,aAAa,CAC/B,YAAY,EACZ,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,KAAK,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAChG,CAAC;gBAEF,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;aACzD;iBAAM;gBACL,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC3B,OAAO;aACR;YACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAC5B;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACjC,IAAI,SAAS,KAAK,CAAC,EAAE;gBACnB,IAAI,IAAI,GAAG,KAAK,CAAC;gBAEjB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBACtC,IAAI,IAAI,EAAE;wBACR,OAAO;qBACR;oBACD,IAAI,GAAG,IAAI,CAAC,eAAe,CACzB,OAAO,EACP,KAAK,EACL,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC9B,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAC/B,SAAS,EACT,CAAC,EACD,CAAC,EACD,CAAC,EACD,IAAI,EACJ,MAAM,CACP,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ;iBAAM;gBAGL,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;gBAE9E,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,CAAC;gBAEhD,IAAI,qBAAqB,GAAG,CAAC,CAAC;gBAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;gBACjB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBACtC,IAAI,IAAI,EAAE;wBACR,OAAO;qBACR;oBACD,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;oBAC3C,MAAM,GAAG,GAAG,CAAC,eAAe,GAAG,qBAAqB,CAAC,GAAG,YAAY,CAAC;oBACrE,qBAAqB,IAAI,YAAY,CAAC;oBACtC,IAAI,GAAG,GAAG,CAAC,EAAE;wBACX,IAAI,GAAG,IAAI,CAAC,eAAe,CACzB,OAAO,EACP,KAAK,EACL,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC9B,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAC/B,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EACX,CAAC,EACD,CAAC,EACD,CAAC,EACD,IAAI,EACJ,MAAM,CACP,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;aAAM;YACL,IAAI,CAAC,eAAe,CAClB,OAAO,EACP,IAAI,CAAC,SAA2B,EAChC,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,SAAS,EACd,aAAa,EACb,SAAS,EACT,CAAC,EACD,CAAC,EACD,CAAC,EACD,IAAI,EACJ,MAAM,CACP,CAAC;SACH;IACH,CAAC;IAED,IAAI,CAAC,IAAW,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC3G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAGhC,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,IAAI,CAAC;QACzD,IAAI,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAElE,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAE9B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAErC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACrD;aAAM;YACL,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAC9C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,OAAO,CAAC,sBAAsB,EAAE,CAAC;SAClC;QAED,IAAI,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;YAC3D,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACjC,OAAO;SACR;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEzD,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACnC,CAAC;IAiBS,eAAe,CACvB,OAAmB,EACnB,KAAqB,EACrB,IAAa,EACb,WAAmB,EACnB,SAAyC,EACzC,gBAAoF,EACpF,SAAiB,EACjB,OAAe,EACf,OAAe,EACf,OAAe,EACf,IAAW,EACX,MAIY;QAEZ,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpB,MAAM,GAAG,GAAY,KAAK,CAAC;QAC3B,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE;YACnF,OAAO;YACP,OAAO;YACP,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;YACtF,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;SACjE;QACD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACxC,IAAI,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,gBAAgB,EAAE;gBAE1D,CAAC,CAAC,SAAS,CACT,IAAI,EACJ,OAAO,EACP,OAAO,EACP,OAAO,EACP,CAAC,CAAC,WAAW,EACb,KAAK,EACL,IAAI,EACJ,KAAK,EACL,gBAAuB,EACvB,MAAM,EACN,IAAI,EACJ,EAAE,SAAS,EAAE,CACd,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAGH,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAEpF,IAAI,IAAI,KAAK,KAAK,EAAE;YAClB,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;aAC9C;iBAAM,IAAI,WAAW,EAAE;gBACtB,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;gBAC5E,OAAO,CAAC,IAAI,EAAE,CAAC;aAChB;SACF;QAED,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;SACvF;QACD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACxC,IAAI,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,eAAe,EAAE;gBACzD,CAAC,CAAC,SAAS,CACT,IAAI,EACJ,OAAO,EACP,OAAO,EACP,OAAO,EACP,CAAC,CAAC,WAAW,EACb,KAAK,EACL,IAAI,EACJ,KAAK,EACL,gBAAuB,EACvB,MAAM,EACN,IAAI,EACJ,EAAE,SAAS,EAAE,CACd,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAA;AAvVY,uBAAuB;IADnC,UAAU,EAAE;IAOR,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5B,WAAA,KAAK,CAAC,sBAAsB,CAAC,CAAA;;GAPrB,uBAAuB,CAuVnC;SAvVY,uBAAuB","file":"area-render.js","sourcesContent":["import { min, IPointLike } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport {\n  IArea,\n  IAreaCacheItem,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  IContext2d,\n  ICurveType,\n  IMarkAttribute,\n  IThemeAttribute\n} from '../../../interface';\nimport {\n  genLinearSegments,\n  genBasisSegments,\n  genMonotoneXSegments,\n  genMonotoneYSegments,\n  genStepSegments,\n  ISegPath2D,\n  Direction,\n  SegContext,\n  drawAreaSegments,\n  genLinearClosedSegments,\n  ContributionProvider\n} from '../../../common';\nimport { AREA_NUMBER_TYPE, getTheme } from '../../../graphic';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { AreaRenderContribution, IAreaRenderContribution } from './contributions/area-contribution-render';\nimport { ArcRenderContribution, BaseRenderContributionTime } from './contributions';\n\nfunction calcLineCache(\n  points: IPointLike[],\n  curveType: ICurveType,\n  params?: { direction?: Direction; startPoint?: IPointLike }\n): SegContext | null {\n  switch (curveType) {\n    case 'linear':\n      return genLinearSegments(points, params);\n    case 'basis':\n      return genBasisSegments(points, params);\n    case 'monotoneX':\n      return genMonotoneXSegments(points, params);\n    case 'monotoneY':\n      return genMonotoneYSegments(points, params);\n    case 'step':\n      return genStepSegments(points, 0.5, params);\n    case 'stepBefore':\n      return genStepSegments(points, 0, params);\n    case 'stepAfter':\n      return genStepSegments(points, 1, params);\n    case 'linearClosed':\n      return genLinearClosedSegments(points, params);\n    default:\n      return genLinearSegments(points, params);\n  }\n}\n\n@injectable()\nexport class DefaultCanvasAreaRender implements IGraphicRender {\n  type: 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  protected _areaRenderContribitions: IAreaRenderContribution[];\n  constructor(\n    @inject(ContributionProvider)\n    @named(AreaRenderContribution)\n    protected readonly areaRenderContribitions: ContributionProvider<IAreaRenderContribution>\n  ) {}\n\n  drawShape(\n    area: IArea,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const areaAttribute = getTheme(area, params?.theme).area;\n    const {\n      fill = areaAttribute.fill == null ? !!area.attribute.fillColor : areaAttribute.fill,\n      fillOpacity = areaAttribute.fillOpacity,\n      opacity = areaAttribute.opacity,\n      visible = areaAttribute.visible,\n      z = areaAttribute.z,\n      stroke = !!area.attribute.strokeColor,\n      lineWidth = areaAttribute.lineWidth,\n      strokeOpacity = areaAttribute.strokeOpacity\n    } = area.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n\n    if (!(area.valid && visible)) {\n      return;\n    }\n\n    if (!doFill && !doStroke) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || fillCb) && !sVisible && !strokeCb) {\n      return;\n    }\n\n    const { clipRange = areaAttribute.clipRange } = area.attribute;\n\n    // 更新cache\n    if (area.shouldUpdateShape()) {\n      const { points, segments, curveType = areaAttribute.curveType } = area.attribute;\n      if (segments && segments.length) {\n        let startPoint: IPointLike;\n        let lastTopSeg: ISegPath2D;\n        const topCaches = segments.map((seg, index) => {\n          // 添加上一个segment结束的点作为这个segment的起始点\n          if (index === 1) {\n            startPoint = { x: lastTopSeg.endX, y: lastTopSeg.endY };\n          } else if (index > 1) {\n            startPoint.x = lastTopSeg.endX;\n            startPoint.y = lastTopSeg.endY;\n          }\n          lastTopSeg = calcLineCache(seg.points, curveType, {\n            startPoint\n          });\n          return lastTopSeg;\n        });\n        let lastBottomSeg: ISegPath2D;\n        const bottomCaches = [];\n        for (let i = segments.length - 1; i >= 0; i--) {\n          const points = segments[i].points;\n          const bottomPoints: IPointLike[] = [];\n          for (let i = points.length - 1; i >= 0; i--) {\n            bottomPoints.push({\n              x: points[i].x1 ?? points[i].x,\n              y: points[i].y1 ?? points[i].y\n            });\n          }\n          // 处理一下bottom的segments，bottom的segments需要手动添加endPoints\n          if (i !== 0) {\n            const lastSegmentPoints = segments[i - 1].points;\n            const endPoint = lastSegmentPoints[lastSegmentPoints.length - 1];\n            endPoint &&\n              bottomPoints.push({\n                x: endPoint.x1 ?? endPoint.x,\n                y: endPoint.y1 ?? endPoint.y\n              });\n          }\n          lastBottomSeg = calcLineCache(bottomPoints, curveType);\n          bottomCaches.unshift(lastBottomSeg);\n        }\n        area.cacheArea = bottomCaches.map((item, index) => ({\n          top: topCaches[index],\n          bottom: item\n        }));\n      } else if (points && points.length) {\n        // 转换points\n        const topPoints = points;\n        const bottomPoints: IPointLike[] = [];\n        for (let i = points.length - 1; i >= 0; i--) {\n          bottomPoints.push({\n            x: points[i].x1 ?? points[i].x,\n            y: points[i].y1 ?? points[i].y\n          });\n        }\n        const topCache = calcLineCache(topPoints, curveType);\n        const bottomCache = calcLineCache(\n          bottomPoints,\n          curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType\n        );\n\n        area.cacheArea = { top: topCache, bottom: bottomCache };\n      } else {\n        area.cache = null;\n        area.clearUpdateShapeTag();\n        return;\n      }\n      area.clearUpdateShapeTag();\n    }\n\n    if (Array.isArray(area.cacheArea)) {\n      if (clipRange === 1) {\n        let skip = false;\n        // 性能优化，不需要clip的线段不需要计算长度\n        area.cacheArea.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          skip = this.drawSegmentItem(\n            context,\n            cache,\n            fill,\n            fillOpacity,\n            area.attribute.segments[index],\n            [areaAttribute, area.attribute],\n            clipRange,\n            x,\n            y,\n            z,\n            area,\n            fillCb\n          );\n        });\n      } else {\n        // 如果是segments的话，每个clipRange需要重新计算\n        // 整个线段的总长度\n        const totalLength = area.cacheArea.reduce((l, c) => l + c.top.getLength(), 0);\n        // 总需要绘制的长度\n        const totalDrawLength = clipRange * totalLength;\n        // 直到上次绘制的长度\n        let drawedLengthUntilLast = 0;\n        let skip = false;\n        area.cacheArea.forEach((cache, index) => {\n          if (skip) {\n            return;\n          }\n          const curSegLength = cache.top.getLength();\n          const _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;\n          drawedLengthUntilLast += curSegLength;\n          if (_cr > 0) {\n            skip = this.drawSegmentItem(\n              context,\n              cache,\n              fill,\n              fillOpacity,\n              area.attribute.segments[index],\n              [areaAttribute, area.attribute],\n              min(_cr, 1),\n              x,\n              y,\n              z,\n              area,\n              fillCb\n            );\n          }\n        });\n      }\n    } else {\n      this.drawSegmentItem(\n        context,\n        area.cacheArea as IAreaCacheItem,\n        fill,\n        fillOpacity,\n        area.attribute,\n        areaAttribute,\n        clipRange,\n        x,\n        y,\n        z,\n        area,\n        fillCb\n      );\n    }\n  }\n\n  draw(area: IArea, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n\n    // const areaAttribute = graphicService.themeService.getCurrentTheme().areaAttribute;\n    const areaAttribute = getTheme(area, params?.theme).area;\n    let { x = areaAttribute.x, y = areaAttribute.y } = area.attribute;\n\n    context.highPerformanceSave();\n\n    if (!area.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(area.transMatrix, true);\n    } else {\n      const point = area.getOffsetXY(areaAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    if (drawPathProxy(area, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(area, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    context.beginPath();\n\n    const ret: boolean = false;\n    drawAreaSegments(context.camera ? context : context.nativeContext, cache, clipRange, {\n      offsetX,\n      offsetY,\n      offsetZ\n    });\n\n    if (!this._areaRenderContribitions) {\n      this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || [];\n      this._areaRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._areaRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute);\n        c.drawShape(\n          area,\n          context,\n          offsetX,\n          offsetY,\n          !!fillOpacity,\n          false,\n          fill,\n          false,\n          defaultAttribute as any,\n          fillCb,\n          null,\n          { attribute }\n        );\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(area, attribute, defaultAttribute);\n\n    if (fill !== false) {\n      if (fillCb) {\n        fillCb(context, attribute, defaultAttribute);\n      } else if (fillOpacity) {\n        context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute);\n        context.fill();\n      }\n    }\n\n    if (!this._areaRenderContribitions) {\n      this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || [];\n    }\n    this._areaRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        c.drawShape(\n          area,\n          context,\n          offsetX,\n          offsetY,\n          !!fillOpacity,\n          false,\n          fill,\n          false,\n          defaultAttribute as any,\n          fillCb,\n          null,\n          { attribute }\n        );\n      }\n    });\n\n    return ret;\n  }\n}\n"]}

package/es/render/contributions/render/base-render.d.ts

@@ -0,0 +1,12 @@
+import { IPointLike } from '@visactor/vutils';
+import { IGraphicAttribute, ICamera, IContext2d, IGraphic, mat4 } from '../../../interface';
+export declare abstract class BaseRender<T extends IGraphic> {
+    camera: ICamera;
+    transform(graphic: IGraphic, graphicAttribute: IGraphicAttribute, context: IContext2d, use3dMatrixIn3dMode?: boolean): IPointLike & {
+        z: number;
+        lastModelMatrix: mat4;
+    };
+    transformUseContext2d(graphic: IGraphic, graphicAttribute: IGraphicAttribute, z: number, context: IContext2d): void;
+    restoreTransformUseContext2d(graphic: IGraphic, graphicAttribute: IGraphicAttribute, z: number, context: IContext2d): void;
+    protected transformWithoutTranslate(context: IContext2d, x: number, y: number, z: number, scaleX: number, scaleY: number, angle: number): void;
+}

package/es/render/contributions/render/base-render.js

@@ -0,0 +1,68 @@
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+import { injectable } from "inversify";
+
+import { getModelMatrix, multiplyMat4Mat4, shouldUseMat4 } from "../../../graphic";
+
+import { mat4Allocate } from "../../../modules";
+
+let BaseRender = class {
+    transform(graphic, graphicAttribute, context, use3dMatrixIn3dMode = !1) {
+        const onlyTranslate = graphic.transMatrix.onlyTranslate(), {x: x = graphicAttribute.x, y: y = graphicAttribute.y, z: z = graphicAttribute.z, scaleX: scaleX = graphicAttribute.scaleX, scaleY: scaleY = graphicAttribute.scaleY, angle: angle = graphicAttribute.angle} = graphic.attribute, lastModelMatrix = context.modelMatrix, camera = context.camera, result = {
+            x: x,
+            y: y,
+            z: z,
+            lastModelMatrix: lastModelMatrix
+        }, shouldTransform3d = camera && (use3dMatrixIn3dMode || shouldUseMat4(graphic));
+        if (shouldTransform3d) {
+            const nextModelMatrix = mat4Allocate.allocate(), modelMatrix = mat4Allocate.allocate();
+            getModelMatrix(modelMatrix, graphic, graphicAttribute), multiplyMat4Mat4(nextModelMatrix, lastModelMatrix || nextModelMatrix, modelMatrix), 
+            result.x = 0, result.y = 0, result.z = 0, context.modelMatrix = nextModelMatrix, 
+            context.setTransform(1, 0, 0, 1, 0, 0, !0), mat4Allocate.free(modelMatrix);
+        }
+        if (onlyTranslate && !lastModelMatrix) {
+            const point = graphic.getOffsetXY(graphicAttribute);
+            result.x += point.x, result.y += point.y, result.z = z, context.setTransformForCurrent();
+        } else if (shouldTransform3d) result.x = 0, result.y = 0, result.z = 0, context.setTransform(1, 0, 0, 1, 0, 0, !0); else if (camera && context.project) {
+            const point = graphic.getOffsetXY(graphicAttribute);
+            result.x += point.x, result.y += point.y, this.transformWithoutTranslate(context, result.x, result.y, result.z, scaleX, scaleY, angle);
+        } else context.transformFromMatrix(graphic.transMatrix, !0), result.x = 0, result.y = 0, 
+        result.z = 0;
+        return result;
+    }
+    transformUseContext2d(graphic, graphicAttribute, z, context) {
+        const camera = context.camera;
+        if (this.camera = camera, camera) {
+            const bounds = graphic.AABBBounds, width = bounds.x2 - bounds.x1, height = bounds.y2 - bounds.y1, p1 = context.project(0, 0, z), p2 = context.project(width, 0, z), p3 = context.project(width, height, z), _p1 = {
+                x: 0,
+                y: 0
+            }, _p2 = {
+                x: width,
+                y: 0
+            }, _p3 = {
+                x: width,
+                y: height
+            };
+            context.camera = null;
+            const denom = 1 / (_p1.x * (_p3.y - _p2.y) - _p2.x * _p3.y + _p3.x * _p2.y + (_p2.x - _p3.x) * _p1.y), m11 = -(_p1.y * (p3.x - p2.x) - _p2.y * p3.x + _p3.y * p2.x + (_p2.y - _p3.y) * p1.x) * denom, m12 = (_p2.y * p3.y + _p1.y * (p2.y - p3.y) - _p3.y * p2.y + (_p3.y - _p2.y) * p1.y) * denom, m21 = (_p1.x * (p3.x - p2.x) - _p2.x * p3.x + _p3.x * p2.x + (_p2.x - _p3.x) * p1.x) * denom, m22 = -(_p2.x * p3.y + _p1.x * (p2.y - p3.y) - _p3.x * p2.y + (_p3.x - _p2.x) * p1.y) * denom, dx = (_p1.x * (_p3.y * p2.x - _p2.y * p3.x) + _p1.y * (_p2.x * p3.x - _p3.x * p2.x) + (_p3.x * _p2.y - _p2.x * _p3.y) * p1.x) * denom, dy = (_p1.x * (_p3.y * p2.y - _p2.y * p3.y) + _p1.y * (_p2.x * p3.y - _p3.x * p2.y) + (_p3.x * _p2.y - _p2.x * _p3.y) * p1.y) * denom;
+            context.setTransform(m11, m12, m21, m22, dx, dy, !0);
+        }
+    }
+    restoreTransformUseContext2d(graphic, graphicAttribute, z, context) {
+        this.camera && (context.camera = this.camera);
+    }
+    transformWithoutTranslate(context, x, y, z, scaleX, scaleY, angle) {
+        const p = context.project(x, y, z);
+        context.translate(p.x, p.y, !1), context.scale(scaleX, scaleY, !1), context.rotate(angle, !1), 
+        context.translate(-p.x, -p.y, !1), context.setTransformForCurrent();
+    }
+};
+
+BaseRender = __decorate([ injectable() ], BaseRender);
+
+export { BaseRender };
+//# sourceMappingURL=base-render.js.map

package/es/render/contributions/render/base-render.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/base-render.ts"],"names":[],"mappings":"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AC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;YACpG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;YACnG,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;YACnG,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;YACpG,MAAM,EAAE,GACN,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACpC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACrC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACzC,KAAK,CAAC;YACR,MAAM,EAAE,GACN,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACpC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACrC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBACzC,KAAK,CAAC;YAER,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;SACxD;IACH,CAAC;IASD,4BAA4B,CAAC,OAAiB,EAAE,gBAAmC,EAAE,CAAS,EAAE,OAAmB;QACjH,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SAC9B;IACH,CAAC;IAES,yBAAyB,CACjC,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,CAAS,EACT,MAAc,EACd,MAAc,EACd,KAAa;QAEb,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACnC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACnC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7B,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACrC,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACnC,CAAC;CAqIF,CAAA;AAjTqB,UAAU;IAD/B,UAAU,EAAE;GACS,UAAU,CAiT/B;SAjTqB,UAAU","file":"base-render.js","sourcesContent":["import { IPointLike } from '@visactor/vutils';\nimport { injectable } from 'inversify';\nimport { IGraphicAttribute, ICamera, IContext2d, IGraphic, mat4 } from '../../../interface';\nimport { getModelMatrix, multiplyMat4Mat4, shouldUseMat4 } from '../../../graphic';\nimport { mat4Allocate } from '../../../modules';\n\n@injectable()\nexport abstract class BaseRender<T extends IGraphic> {\n  camera: ICamera;\n\n  /**\n   * 进行2d或3d变换\n   * @param graphic\n   * @param graphicAttribute\n   * @param context\n   * @param use3dMatrixIn3dMode 是否在3d模式使用3d矩阵\n   * @returns\n   */\n  transform(\n    graphic: IGraphic,\n    graphicAttribute: IGraphicAttribute,\n    context: IContext2d,\n    use3dMatrixIn3dMode: boolean = false\n  ): IPointLike & { z: number; lastModelMatrix: mat4 } {\n    const transMatrix = graphic.transMatrix;\n    const onlyTranslate = transMatrix.onlyTranslate();\n    const {\n      x = graphicAttribute.x,\n      y = graphicAttribute.y,\n      z = graphicAttribute.z,\n      scaleX = graphicAttribute.scaleX,\n      scaleY = graphicAttribute.scaleY,\n      angle = graphicAttribute.angle\n    } = graphic.attribute;\n\n    // 存在3d变换的时候，需要计算3d矩阵\n    const lastModelMatrix = context.modelMatrix;\n    const camera = context.camera;\n    const result: IPointLike & { z: number; lastModelMatrix: mat4 } = { x, y, z, lastModelMatrix };\n    // 是否应该进行3d变换\n    const shouldTransform3d = camera && (use3dMatrixIn3dMode || shouldUseMat4(graphic));\n    if (shouldTransform3d) {\n      const nextModelMatrix = mat4Allocate.allocate();\n      // 计算模型矩阵\n      const modelMatrix = mat4Allocate.allocate();\n      getModelMatrix(modelMatrix, graphic, graphicAttribute);\n      // 合并模型矩阵\n      if (lastModelMatrix) {\n        multiplyMat4Mat4(nextModelMatrix, lastModelMatrix, modelMatrix);\n      } else {\n        multiplyMat4Mat4(nextModelMatrix, nextModelMatrix, modelMatrix);\n      }\n      result.x = 0;\n      result.y = 0;\n      result.z = 0;\n      context.modelMatrix = nextModelMatrix;\n      context.setTransform(1, 0, 0, 1, 0, 0, true);\n      mat4Allocate.free(modelMatrix);\n      // 有旋转的情况下需要手动计算模型矩阵\n      // TODO: 这里暂时都使用模型矩阵，因为视角旋转的时候如果当不固定角度那也需要用到模型矩阵\n    }\n\n    // 如果只有位移，且没计算3d变换矩阵，那么不设置context的2d矩阵\n    if (onlyTranslate && !lastModelMatrix) {\n      const point = graphic.getOffsetXY(graphicAttribute);\n      result.x += point.x;\n      result.y += point.y;\n      result.z = z;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    } else if (shouldTransform3d) {\n      // 如果计算了3d矩阵，那么就不需要2d矩阵计算了\n      result.x = 0;\n      result.y = 0;\n      result.z = 0;\n      context.setTransform(1, 0, 0, 1, 0, 0, true);\n    } else {\n      if (camera && context.project) {\n        const point = graphic.getOffsetXY(graphicAttribute);\n        result.x += point.x;\n        result.y += point.y;\n        // result.x = 0;\n        // result.y = 0;\n        // 位置直接通过project设置，而2d变换通过变换矩阵完成\n        this.transformWithoutTranslate(context, result.x, result.y, result.z, scaleX, scaleY, angle);\n      } else {\n        // 如果是纯2d的情况，那么直接设置context的2d矩阵\n        // 性能较差\n        context.transformFromMatrix(graphic.transMatrix, true);\n        result.x = 0;\n        result.y = 0;\n        result.z = 0;\n      }\n    }\n\n    return result;\n  }\n\n  /**\n   * 将3d的transform转成context2d的transform\n   * @param graphic\n   * @param graphicAttribute\n   * @param z\n   * @param context\n   */\n  transformUseContext2d(graphic: IGraphic, graphicAttribute: IGraphicAttribute, z: number, context: IContext2d) {\n    const camera = context.camera;\n    this.camera = camera;\n    if (camera) {\n      const bounds = graphic.AABBBounds;\n      const width = bounds.x2 - bounds.x1;\n      const height = bounds.y2 - bounds.y1;\n      const p1 = context.project(0, 0, z);\n      const p2 = context.project(width, 0, z);\n      const p3 = context.project(width, height, z);\n      const _p1 = { x: 0, y: 0 };\n      const _p2 = { x: width, y: 0 };\n      const _p3 = { x: width, y: height };\n\n      context.camera = null;\n\n      // 生成3维矩阵\n      /* Adapted from phoria.js by ecomfe\n      * https://github.com/kevinroast/phoria.js\n      * Licensed under the BSD-3-Clause\n\n      * url: https://github.com/kevinroast/phoria.js/blob/736c6b854a679df180f8a6e689aeb218efa6dc01/scripts/phoria-renderer.js\n      * License: https://github.com/kevinroast/phoria.js/blob/master/LICENSE\n      * @license\n      */\n      const denom = 1.0 / (_p1.x * (_p3.y - _p2.y) - _p2.x * _p3.y + _p3.x * _p2.y + (_p2.x - _p3.x) * _p1.y);\n      // calculate context transformation matrix\n      const m11 = -(_p1.y * (p3.x - p2.x) - _p2.y * p3.x + _p3.y * p2.x + (_p2.y - _p3.y) * p1.x) * denom;\n      const m12 = (_p2.y * p3.y + _p1.y * (p2.y - p3.y) - _p3.y * p2.y + (_p3.y - _p2.y) * p1.y) * denom;\n      const m21 = (_p1.x * (p3.x - p2.x) - _p2.x * p3.x + _p3.x * p2.x + (_p2.x - _p3.x) * p1.x) * denom;\n      const m22 = -(_p2.x * p3.y + _p1.x * (p2.y - p3.y) - _p3.x * p2.y + (_p3.x - _p2.x) * p1.y) * denom;\n      const dx =\n        (_p1.x * (_p3.y * p2.x - _p2.y * p3.x) +\n          _p1.y * (_p2.x * p3.x - _p3.x * p2.x) +\n          (_p3.x * _p2.y - _p2.x * _p3.y) * p1.x) *\n        denom;\n      const dy =\n        (_p1.x * (_p3.y * p2.y - _p2.y * p3.y) +\n          _p1.y * (_p2.x * p3.y - _p3.x * p2.y) +\n          (_p3.x * _p2.y - _p2.x * _p3.y) * p1.y) *\n        denom;\n\n      context.setTransform(m11, m12, m21, m22, dx, dy, true);\n    }\n  }\n\n  /**\n   * transformUseContext2d的后处理\n   * @param graphic\n   * @param graphicAttribute\n   * @param z\n   * @param context\n   */\n  restoreTransformUseContext2d(graphic: IGraphic, graphicAttribute: IGraphicAttribute, z: number, context: IContext2d) {\n    if (this.camera) {\n      context.camera = this.camera;\n    }\n  }\n\n  protected transformWithoutTranslate(\n    context: IContext2d,\n    x: number,\n    y: number,\n    z: number,\n    scaleX: number,\n    scaleY: number,\n    angle: number\n  ) {\n    const p = context.project(x, y, z);\n    context.translate(p.x, p.y, false);\n    context.scale(scaleX, scaleY, false);\n    context.rotate(angle, false);\n    context.translate(-p.x, -p.y, false);\n    context.setTransformForCurrent();\n  }\n\n  // draw(graphic: T, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n  //   const { context } = drawContext;\n  //   if (!context) {\n  //     return;\n  //   }\n\n  //   const themeAttribute = getTheme(graphic)[graphic.type];\n\n  //   context.highPerformanceSave();\n\n  //   let { x = themeAttribute.x, y = themeAttribute.y } = graphic.attribute;\n  //   if (!graphic.transMatrix.onlyTranslate()) {\n  //     // 性能较差\n  //     x = 0;\n  //     y = 0;\n  //     context.transformFromMatrix(graphic.transMatrix, true);\n  //   } else {\n  //     const point = graphic.getOffsetXY(themeAttribute);\n  //     x += point.x;\n  //     y += point.y;\n  //     // 当前context有rotate/scale，重置matrix\n  //     context.setTransformForCurrent();\n  //   }\n\n  //   if (this.drawPathProxy(graphic, context, x, y, drawContext, params)) {\n  //     context.highPerformanceRestore();\n  //     return;\n  //   }\n\n  //   this.drawShape(graphic, context, x, y, drawContext, params);\n\n  //   context.highPerformanceRestore();\n  // }\n\n  // abstract drawShape(\n  //   graphic: T,\n  //   context: IContext2d,\n  //   x: number,\n  //   y: number,\n  //   drawContext: IDrawContext,\n  //   params?: IGraphicRenderDrawParams,\n  //   fillCb?: (\n  //     ctx: IContext2d,\n  //     markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n  //     themeAttribute: IThemeAttribute\n  //   ) => boolean,\n  //   strokeCb?: (\n  //     ctx: IContext2d,\n  //     markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n  //     themeAttribute: IThemeAttribute\n  //   ) => boolean\n  // ): void;\n\n  // drawPathProxy(\n  //   graphic: T,\n  //   context: IContext2d,\n  //   x: number,\n  //   y: number,\n  //   drawContext: IDrawContext,\n  //   params?: IGraphicRenderDrawParams,\n  //   fillCb?: (\n  //     ctx: IContext2d,\n  //     markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n  //     themeAttribute: IThemeAttribute\n  //   ) => boolean,\n  //   strokeCb?: (\n  //     ctx: IContext2d,\n  //     markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n  //     themeAttribute: IThemeAttribute\n  //   ) => boolean\n  // ) {\n  //   if (!graphic.pathProxy) {\n  //     return false;\n  //   }\n\n  //   const themeAttributes = getTheme(graphic)[graphic.type];\n\n  //   const {\n  //     fill = themeAttributes.fill == null ? !!graphic.attribute.fillColor : themeAttributes.fill,\n  //     stroke = themeAttributes.stroke == null ? !!graphic.attribute.strokeColor : themeAttributes.stroke,\n  //     opacity = themeAttributes.opacity,\n  //     fillOpacity = themeAttributes.fillOpacity,\n  //     lineWidth = themeAttributes.lineWidth,\n  //     strokeOpacity = themeAttributes.strokeOpacity,\n  //     visible = themeAttributes.visible\n  //   } = graphic.attribute;\n  //   // 不绘制或者透明\n  //   const fVisible = fillVisible(opacity, fillOpacity);\n  //   const sVisible = strokeVisible(opacity, strokeOpacity);\n  //   const doFill = runFill(fill);\n  //   const doStroke = runStroke(stroke, lineWidth);\n\n  //   if (!visible) {\n  //     return true;\n  //   }\n\n  //   if (!(doFill || doStroke)) {\n  //     return true;\n  //   }\n\n  //   // 如果存在fillCb和strokeCb，那就不直接跳过\n  //   if (!(fVisible || sVisible || fillCb || strokeCb)) {\n  //     return true;\n  //   }\n\n  //   context.beginPath();\n\n  //   const path = typeof graphic.pathProxy === 'function' ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;\n  //   renderCommandList(path.commandList, context, x, y);\n\n  //   // shadow\n  //   context.setShadowStyle && context.setShadowStyle(graphic, graphic.attribute, themeAttributes);\n\n  //   if (doStroke) {\n  //     if (strokeCb) {\n  //       strokeCb(context, graphic.attribute, themeAttributes);\n  //     } else if (sVisible) {\n  //       context.setStrokeStyle(graphic, graphic.attribute, 0, 0, themeAttributes);\n  //       context.stroke();\n  //     }\n  //   }\n  //   if (doFill) {\n  //     if (fillCb) {\n  //       fillCb(context, graphic.attribute, themeAttributes);\n  //     } else if (fVisible) {\n  //       context.setCommonStyle(graphic, graphic.attribute, 0, 0, themeAttributes);\n  //       context.fill();\n  //     }\n  //   }\n  //   return true;\n  // }\n}\n"]}

package/es/render/contributions/render/circle-render.d.ts

@@ -0,0 +1,14 @@
+import { IGraphicAttribute, ICircle, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';
+import { IDrawContext, IRenderService } from '../../render-service';
+import { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';
+import { ICircleRenderContribution } from './contributions/circle-contribution-render';
+import { ContributionProvider } from '../../../common';
+export declare class DefaultCanvasCircleRender implements IGraphicRender {
+    protected readonly circleRenderContribitions: ContributionProvider<ICircleRenderContribution>;
+    type: 'circle';
+    numberType: number;
+    protected _circleRenderContribitions: ICircleRenderContribution[];
+    constructor(circleRenderContribitions: ContributionProvider<ICircleRenderContribution>);
+    drawShape(circle: ICircle, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
+    draw(circle: ICircle, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;
+}

package/es/render/contributions/render/circle-render.js

@@ -0,0 +1,60 @@
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}, __metadata = this && this.__metadata || function(k, v) {
+    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
+}, __param = this && this.__param || function(paramIndex, decorator) {
+    return function(target, key) {
+        decorator(target, key, paramIndex);
+    };
+};
+
+import { inject, injectable, named } from "inversify";
+
+import { CIRCLE_NUMBER_TYPE, getTheme } from "../../../graphic";
+
+import { CircleRenderContribution } from "./contributions/circle-contribution-render";
+
+import { ContributionProvider } from "../../../common";
+
+import { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from "./utils";
+
+import { BaseRenderContributionTime } from "./contributions/base-contribution-render";
+
+let DefaultCanvasCircleRender = class {
+    constructor(circleRenderContribitions) {
+        this.circleRenderContribitions = circleRenderContribitions, this.numberType = CIRCLE_NUMBER_TYPE;
+    }
+    drawShape(circle, context, x, y, drawContext, params, fillCb, strokeCb) {
+        const circleAttribute = getTheme(circle, null == params ? void 0 : params.theme).circle, {fill: fill = (null == circleAttribute.fill ? !!circle.attribute.fillColor : circleAttribute.fill), background: background, stroke: stroke = (null == circleAttribute.stroke ? !!circle.attribute.strokeColor : circleAttribute.stroke), radius: radius = circleAttribute.radius, startAngle: startAngle = circleAttribute.startAngle, endAngle: endAngle = circleAttribute.endAngle, fillOpacity: fillOpacity = circleAttribute.fillOpacity, strokeOpacity: strokeOpacity = circleAttribute.strokeOpacity, opacity: opacity = circleAttribute.opacity, lineWidth: lineWidth = circleAttribute.lineWidth, visible: visible = circleAttribute.visible} = circle.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
+        circle.valid && visible && (doFill || doStroke || background) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), 
+        context.arc(x, y, radius, startAngle, endAngle), context.closePath(), this._circleRenderContribitions || (this._circleRenderContribitions = this.circleRenderContribitions.getContributions() || [], 
+        this._circleRenderContribitions.sort(((a, b) => b.order - a.order))), this._circleRenderContribitions.forEach((c => {
+            c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, fillCb, strokeCb);
+        })), context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute), 
+        doFill && (fillCb ? fillCb(context, circle.attribute, circleAttribute) : fVisible && (context.setCommonStyle(circle, circle.attribute, x, y, circleAttribute), 
+        context.fill())), doStroke && (strokeCb ? strokeCb(context, circle.attribute, circleAttribute) : sVisible && (context.setStrokeStyle(circle, circle.attribute, x, y, circleAttribute), 
+        context.stroke())), this._circleRenderContribitions.forEach((c => {
+            c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, fillCb, strokeCb);
+        })));
+    }
+    draw(circle, renderService, drawContext, params) {
+        const {context: context} = drawContext;
+        if (!context) return;
+        context.highPerformanceSave();
+        const circleAttribute = getTheme(circle, null == params ? void 0 : params.theme).circle;
+        let {x: x = circleAttribute.x, y: y = circleAttribute.y} = circle.attribute;
+        if (circle.transMatrix.onlyTranslate()) {
+            const point = circle.getOffsetXY(circleAttribute);
+            x += point.x, y += point.y, context.setTransformForCurrent();
+        } else x = 0, y = 0, context.transformFromMatrix(circle.transMatrix, !0);
+        drawPathProxy(circle, context, x, y, drawContext, params) || this.drawShape(circle, context, x, y, drawContext, params), 
+        context.highPerformanceRestore();
+    }
+};
+
+DefaultCanvasCircleRender = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(CircleRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasCircleRender);
+
+export { DefaultCanvasCircleRender };
+//# sourceMappingURL=circle-render.js.map

package/es/render/contributions/render/circle-render.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/circle-render.ts"],"names":[],"mappings":"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","file":"circle-render.js","sourcesContent":["import { inject, injectable, named } from 'inversify';\nimport { IGraphicAttribute, ICircle, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { CIRCLE_NUMBER_TYPE, getTheme } from '../../../graphic';\nimport { graphicService } from '../../../modules';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { CircleRenderContribution, ICircleRenderContribution } from './contributions/circle-contribution-render';\nimport { ContributionProvider } from '../../../common';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { renderCommandList } from '../../../common/render-command-list';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasCircleRender implements IGraphicRender {\n  type: 'circle';\n  numberType: number = CIRCLE_NUMBER_TYPE;\n\n  protected _circleRenderContribitions: ICircleRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(CircleRenderContribution)\n    protected readonly circleRenderContribitions: ContributionProvider<ICircleRenderContribution>\n  ) {}\n\n  drawShape(\n    circle: ICircle,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const circleAttribute = graphicService.themeService.getCurrentTheme().circleAttribute;\n    const circleAttribute = getTheme(circle, params?.theme).circle;\n    const {\n      fill = circleAttribute.fill == null ? !!circle.attribute.fillColor : circleAttribute.fill,\n      background,\n      stroke = circleAttribute.stroke == null ? !!circle.attribute.strokeColor : circleAttribute.stroke,\n      radius = circleAttribute.radius,\n      startAngle = circleAttribute.startAngle,\n      endAngle = circleAttribute.endAngle,\n      fillOpacity = circleAttribute.fillOpacity,\n      strokeOpacity = circleAttribute.strokeOpacity,\n      opacity = circleAttribute.opacity,\n      lineWidth = circleAttribute.lineWidth,\n      visible = circleAttribute.visible\n    } = circle.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(circle.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n\n    context.beginPath();\n    context.arc(x, y, radius, startAngle, endAngle);\n    context.closePath();\n\n    if (!this._circleRenderContribitions) {\n      this._circleRenderContribitions = this.circleRenderContribitions.getContributions() || [];\n      this._circleRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n\n    this._circleRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(circle, circle.attribute, x, y, circleAttribute);\n        c.drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, circle.attribute, circleAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(circle, circle.attribute, x, y, circleAttribute);\n        context.fill();\n      }\n    }\n\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, circle.attribute, circleAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(circle, circle.attribute, x, y, circleAttribute);\n        context.stroke();\n      }\n    }\n\n    this._circleRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(circle, circle.attribute, x, y, circleAttribute);\n        c.drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(circle: ICircle, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const circleAttribute = graphicService.themeService.getCurrentTheme().circleAttribute;\n    const circleAttribute = getTheme(circle, params?.theme).circle;\n    let { x = circleAttribute.x, y = circleAttribute.y } = circle.attribute;\n    if (!circle.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(circle.transMatrix, true);\n    } else {\n      const point = circle.getOffsetXY(circleAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    if (drawPathProxy(circle, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(circle, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

package/es/render/contributions/render/clear-screen.d.ts

@@ -0,0 +1 @@
+

package/es/render/contributions/render/clear-screen.js

@@ -0,0 +1,3 @@
+
+
+//# sourceMappingURL=clear-screen.js.map

package/es/render/contributions/render/clear-screen.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/clear-screen.ts"],"names":[],"mappings":"","file":"clear-screen.js","sourcesContent":["// export class ClearScreenContribution extends Be\n"]}

package/es/render/contributions/render/contributions/arc-contribution-render.d.ts

@@ -0,0 +1,18 @@
+import { IGraphicAttribute, IContext2d, IMarkAttribute, IArc, IArcGraphicAttribute, IThemeAttribute } from '../../../../interface';
+import { BaseRenderContributionTime, DefaultBaseBackgroundRenderContribution, DefaultBaseTextureRenderContribution, IBaseRenderContribution } from './base-contribution-render';
+export declare const ArcRenderContribution: unique symbol;
+export interface IArcRenderContribution extends IBaseRenderContribution {
+    drawShape: (arc: IArc, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, arcAttribute: Required<IArcGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean) => void;
+}
+export declare class DefaultArcRenderContribution implements IArcRenderContribution {
+    time: BaseRenderContributionTime;
+    useStyle: boolean;
+    order: number;
+    drawShape(arc: IArc, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, arcAttribute: Required<IArcGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
+}
+export declare class DefaultArcBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution implements IArcRenderContribution {
+    time: BaseRenderContributionTime;
+}
+export declare class DefaultArcTextureRenderContribution extends DefaultBaseTextureRenderContribution implements IArcRenderContribution {
+    time: BaseRenderContributionTime;
+}

package/es/render/contributions/render/contributions/arc-contribution-render.js

@@ -0,0 +1,85 @@
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+import { injectable } from "inversify";
+
+import { getScaledStroke } from "../../../../common";
+
+import { drawArcPath } from "../arc-render";
+
+import { BaseRenderContributionTime, DefaultBaseBackgroundRenderContribution, DefaultBaseTextureRenderContribution } from "./base-contribution-render";
+
+export const ArcRenderContribution = Symbol.for("ArcRenderContribution");
+
+let DefaultArcRenderContribution = class {
+    constructor() {
+        this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
+    }
+    drawShape(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, fillCb, strokeCb) {
+        const {innerRadius: innerRadius = arcAttribute.innerRadius, outerRadius: outerRadius = arcAttribute.outerRadius, startAngle: startAngle = arcAttribute.startAngle, endAngle: endAngle = arcAttribute.endAngle, opacity: opacity = arcAttribute.opacity, outerBorder: outerBorder, innerBorder: innerBorder} = arc.attribute;
+        if (outerBorder) {
+            const {distance: distance = arcAttribute.outerBorder.distance} = outerBorder, d = getScaledStroke(context, distance, context.dpr), deltaAngle = distance / outerRadius;
+            if (arc.setAttributes({
+                outerRadius: outerRadius + d,
+                innerRadius: innerRadius - d,
+                startAngle: startAngle - deltaAngle,
+                endAngle: endAngle + deltaAngle
+            }), context.beginPath(), drawArcPath(arc, context, x, y, outerRadius + d, innerRadius - d), 
+            context.setShadowStyle && context.setShadowStyle(arc, arc.attribute, arcAttribute), 
+            strokeCb) strokeCb(context, outerBorder, arcAttribute.outerBorder); else if (sVisible) {
+                const lastOpacity = arcAttribute.outerBorder.opacity;
+                arcAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(arc, outerBorder, x, y, arcAttribute.outerBorder), 
+                arcAttribute.outerBorder.opacity = lastOpacity, context.stroke();
+            }
+        }
+        if (innerBorder) {
+            const {distance: distance = arcAttribute.innerBorder.distance} = innerBorder, d = getScaledStroke(context, distance, context.dpr), deltaAngle = distance / outerRadius;
+            if (arc.setAttributes({
+                outerRadius: outerRadius - d,
+                innerRadius: innerRadius + d,
+                startAngle: startAngle + deltaAngle,
+                endAngle: endAngle - deltaAngle
+            }), context.beginPath(), drawArcPath(arc, context, x, y, outerRadius - d, innerRadius + d), 
+            context.setShadowStyle && context.setShadowStyle(arc, arc.attribute, arcAttribute), 
+            strokeCb) strokeCb(context, innerBorder, arcAttribute.innerBorder); else if (sVisible) {
+                const lastOpacity = arcAttribute.innerBorder.opacity;
+                arcAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(arc, innerBorder, x, y, arcAttribute.innerBorder), 
+                arcAttribute.innerBorder.opacity = lastOpacity, context.stroke();
+            }
+        }
+        arc.setAttributes({
+            outerRadius: outerRadius,
+            innerRadius: innerRadius,
+            startAngle: startAngle,
+            endAngle: endAngle
+        });
+    }
+};
+
+DefaultArcRenderContribution = __decorate([ injectable() ], DefaultArcRenderContribution);
+
+export { DefaultArcRenderContribution };
+
+let DefaultArcBackgroundRenderContribution = class extends DefaultBaseBackgroundRenderContribution {
+    constructor() {
+        super(...arguments), this.time = BaseRenderContributionTime.beforeFillStroke;
+    }
+};
+
+DefaultArcBackgroundRenderContribution = __decorate([ injectable() ], DefaultArcBackgroundRenderContribution);
+
+export { DefaultArcBackgroundRenderContribution };
+
+let DefaultArcTextureRenderContribution = class extends DefaultBaseTextureRenderContribution {
+    constructor() {
+        super(...arguments), this.time = BaseRenderContributionTime.afterFillStroke;
+    }
+};
+
+DefaultArcTextureRenderContribution = __decorate([ injectable() ], DefaultArcTextureRenderContribution);
+
+export { DefaultArcTextureRenderContribution };
+//# sourceMappingURL=arc-contribution-render.js.map

package/es/render/contributions/render/contributions/arc-contribution-render.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/render/contributions/render/contributions/arc-contribution-render.ts"],"names":[],"mappings":"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","file":"arc-contribution-render.js","sourcesContent":["import { IAABBBounds, isArray } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IArc,\n  IArcGraphicAttribute,\n  IThemeAttribute\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common';\nimport { drawArcPath } from '../arc-render';\nimport {\n  BaseRenderContributionTime,\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution,\n  IBaseRenderContribution\n} from './base-contribution-render';\n\nexport const ArcRenderContribution = Symbol.for('ArcRenderContribution');\n\nexport interface IArcRenderContribution extends IBaseRenderContribution {\n  drawShape: (\n    arc: IArc,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    arcAttribute: Required<IArcGraphicAttribute>,\n\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) => void;\n}\n\n@injectable()\nexport class DefaultArcRenderContribution implements IArcRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    arc: IArc,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    arcAttribute: Required<IArcGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      innerRadius = arcAttribute.innerRadius,\n      outerRadius = arcAttribute.outerRadius,\n      startAngle = arcAttribute.startAngle,\n      endAngle = arcAttribute.endAngle,\n      opacity = arcAttribute.opacity,\n      outerBorder,\n      innerBorder\n    } = arc.attribute;\n    if (outerBorder) {\n      const { distance = arcAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const deltaAngle = (distance as number) / outerRadius;\n      arc.setAttributes({\n        outerRadius: outerRadius + d,\n        innerRadius: innerRadius - d,\n        startAngle: startAngle - deltaAngle,\n        endAngle: endAngle + deltaAngle\n      } as any);\n      context.beginPath();\n      drawArcPath(arc, context, x, y, outerRadius + d, innerRadius - d);\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(arc, arc.attribute, arcAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, arcAttribute.outerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (arcAttribute.outerBorder as any).opacity;\n        (arcAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(arc, outerBorder, x, y, arcAttribute.outerBorder as any);\n        (arcAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (innerBorder) {\n      const { distance = arcAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const deltaAngle = (distance as number) / outerRadius;\n      arc.setAttributes({\n        outerRadius: outerRadius - d,\n        innerRadius: innerRadius + d,\n        startAngle: startAngle + deltaAngle,\n        endAngle: endAngle - deltaAngle\n      } as any);\n      context.beginPath();\n      drawArcPath(arc, context, x, y, outerRadius - d, innerRadius + d);\n      // arc.setAttributes({ outerRadius: outerRadius, innerRadius: innerRadius });\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(arc, arc.attribute, arcAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, arcAttribute.innerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (arcAttribute.innerBorder as any).opacity;\n        (arcAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(arc, innerBorder, x, y, arcAttribute.innerBorder as any);\n        (arcAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    arc.setAttributes({ outerRadius: outerRadius, innerRadius: innerRadius, startAngle, endAngle } as any);\n  }\n}\n\n@injectable()\nexport class DefaultArcBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements IArcRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultArcTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements IArcRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n"]}

package/es/render/contributions/render/contributions/area-contribution-render.d.ts

@@ -0,0 +1,17 @@
+import { IGraphicAttribute, IContext2d, IMarkAttribute, IThemeAttribute, IArea, IAreaGraphicAttribute } from '../../../../interface';
+import { BaseRenderContributionTime, DefaultBaseBackgroundRenderContribution, DefaultBaseTextureRenderContribution, IBaseRenderContribution } from './base-contribution-render';
+export declare const AreaRenderContribution: unique symbol;
+export interface IAreaRenderContribution extends IBaseRenderContribution {
+    drawShape: (area: IArea, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, areaAttribute: Required<IAreaGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, options?: {
+        attribute?: Partial<IAreaGraphicAttribute>;
+    }) => void;
+}
+export declare class DefaultAreaBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution implements IAreaRenderContribution {
+    time: BaseRenderContributionTime;
+}
+export declare class DefaultAreaTextureRenderContribution extends DefaultBaseTextureRenderContribution implements IAreaRenderContribution {
+    time: BaseRenderContributionTime;
+    drawShape(graphic: IArea, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, graphicAttribute: Required<IGraphicAttribute>, fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, options?: {
+        attribute?: Partial<IAreaGraphicAttribute>;
+    }): void;
+}