@visactor/vrender 0.9.1 → 0.9.2-fill-stroke.2

package/cjs/graphic/graphic-service/graphic-service.js

@@ -14,9 +14,9 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.DefaultGraphicService = exports.GraphicService = exports.shouldUseMat4 = exports.getModelMatrix = exports.getExtraModelMatrix = exports.multiplyMat4Mat4 = exports.multiplyMat4Mat3 = exports.mat3Tomat4 = exports.translate = exports.rotateY = exports.rotateX = void 0;
+}), exports.DefaultGraphicService = exports.shouldUseMat4 = exports.getModelMatrix = exports.getExtraModelMatrix = exports.multiplyMat4Mat4 = exports.multiplyMat4Mat3 = exports.mat3Tomat4 = exports.translate = exports.rotateY = exports.rotateX = void 0;
 
-const inversify_1 = require("inversify"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), graphic_creator_1 = require("../graphic-creator"), rect_contribution_1 = require("./rect-contribution"), common_1 = require("../../common"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), circle_contribution_1 = require("./circle-contribution"), arc_contribution_1 = require("./arc-contribution"), path_contribution_1 = require("./path-contribution"), modules_1 = require("../../modules");
+const inversify_1 = require("inversify"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), rect_contribution_1 = require("./rect-contribution"), text_1 = require("../../common/text"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), circle_contribution_1 = require("./circle-contribution"), arc_contribution_1 = require("./arc-contribution"), path_contribution_1 = require("./path-contribution"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), contribution_provider_1 = require("../../common/contribution-provider"), bounds_context_1 = require("../../common/bounds-context"), render_command_list_1 = require("../../common/render-command-list"), utils_1 = require("../../common/utils"), constants_1 = require("../constants");
 
 function identity(out) {
     return out[0] = 1, out[1] = 0, out[2] = 0, out[3] = 0, out[4] = 0, out[5] = 1, out[6] = 0, 
@@ -124,10 +124,10 @@ function getExtraModelMatrix(dx, dy, graphic) {
     }
     if ("text" === graphic.type) {
         const {textAlign: textAlign} = graphic.attribute;
-        _anchor[0] += (0, common_1.textDrawOffsetX)(textAlign, graphic.clipedWidth);
+        _anchor[0] += (0, text_1.textDrawOffsetX)(textAlign, graphic.clipedWidth);
     }
     _anchor[0] += dx, _anchor[1] += dy;
-    const modelMatrix = modules_1.mat4Allocate.allocate();
+    const modelMatrix = matrix_allocate_1.mat4Allocate.allocate();
     return translate(modelMatrix, modelMatrix, [ _anchor[0], _anchor[1], 0 ]), beta && rotateX(modelMatrix, modelMatrix, beta), 
     alpha && rotateY(modelMatrix, modelMatrix, alpha), translate(modelMatrix, modelMatrix, [ -_anchor[0], -_anchor[1], 0 ]), 
     modelMatrix;
@@ -150,7 +150,7 @@ function getModelMatrix(out, graphic, theme) {
     if (identity(out), translate(out, out, [ x + dx, y + dy, z + dz ]), translate(out, out, [ _anchor[0], _anchor[1], _anchor[2] ]), 
     rotateX(out, out, beta), rotateY(out, out, alpha), translate(out, out, [ -_anchor[0], -_anchor[1], _anchor[2] ]), 
     scale(out, out, [ scaleX, scaleY, scaleZ ]), angle) {
-        const m = modules_1.mat4Allocate.allocate(), _anchor = [ 0, 0 ];
+        const m = matrix_allocate_1.mat4Allocate.allocate(), _anchor = [ 0, 0 ];
         if (anchor) {
             if ("string" == typeof anchor3d[0]) {
                 const ratio = parseFloat(anchor3d[0]) / 100, bounds = graphic.AABBBounds;
@@ -174,13 +174,13 @@ function shouldUseMat4(graphic) {
 exports.rotateX = rotateX, exports.rotateY = rotateY, exports.translate = translate, 
 exports.mat3Tomat4 = mat3Tomat4, exports.multiplyMat4Mat3 = multiplyMat4Mat3, exports.multiplyMat4Mat4 = multiplyMat4Mat4, 
 exports.getExtraModelMatrix = getExtraModelMatrix, exports.getModelMatrix = getModelMatrix, 
-exports.shouldUseMat4 = shouldUseMat4, exports.GraphicService = Symbol.for("GraphicService");
+exports.shouldUseMat4 = shouldUseMat4;
 
 let DefaultGraphicService = class {
-    constructor(rectBoundsContribitions, symbolBoundsContribitions, circleBoundsContribitions, arcBoundsContribitions, pathBoundsContribitions) {
-        this.rectBoundsContribitions = rectBoundsContribitions, this.symbolBoundsContribitions = symbolBoundsContribitions, 
-        this.circleBoundsContribitions = circleBoundsContribitions, this.arcBoundsContribitions = arcBoundsContribitions, 
-        this.pathBoundsContribitions = pathBoundsContribitions, this.creator = graphic_creator_1.graphicCreator, 
+    constructor(creator, rectBoundsContribitions, symbolBoundsContribitions, circleBoundsContribitions, arcBoundsContribitions, pathBoundsContribitions) {
+        this.creator = creator, this.rectBoundsContribitions = rectBoundsContribitions, 
+        this.symbolBoundsContribitions = symbolBoundsContribitions, this.circleBoundsContribitions = circleBoundsContribitions, 
+        this.arcBoundsContribitions = arcBoundsContribitions, this.pathBoundsContribitions = pathBoundsContribitions, 
         this.hooks = {
             onAttributeUpdate: new tapable_1.SyncHook([ "graphic" ]),
             onSetStage: new tapable_1.SyncHook([ "graphic", "stage" ]),
@@ -215,8 +215,9 @@ let DefaultGraphicService = class {
     updatePathProxyAABBBounds(aabbBounds, graphic) {
         const path = "function" == typeof graphic.pathProxy ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;
         if (!path) return !1;
-        const boundsContext = new common_1.BoundsContext(aabbBounds);
-        return (0, common_1.renderCommandList)(path.commandList, boundsContext, 0, 0), !0;
+        const boundsContext = new bounds_context_1.BoundsContext(aabbBounds);
+        return (0, render_command_list_1.renderCommandList)(path.commandList, boundsContext, 0, 0), 
+        !0;
     }
     updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
@@ -228,19 +229,18 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._rectBoundsContribitions || (this._rectBoundsContribitions = this.rectBoundsContribitions.getContributions() || []), 
         this._rectBoundsContribitions.length && this._rectBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, rectTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, rectTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, rectTheme, graphic), aabbBounds;
     }
     updateGroupAABBBounds(attribute, groupTheme, aabbBounds, graphic) {
         const {width: width, height: height, path: path, clip: clip = groupTheme.clip} = attribute;
         path && path.length ? path.forEach((g => {
             aabbBounds.union(g.AABBBounds);
-        })) : null != width && null != height && aabbBounds.set(0, 0, width, height);
+        })) : null != width && null != height && aabbBounds.set(0, 0, width, height), clip || graphic.forEachChildren((node => {
+            aabbBounds.union(node.AABBBounds);
+        }));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), clip || (graphic.forEachChildren((node => {
-            aabbBounds.union(node.AABBBounds);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic)), this.transformAABBBounds(attribute, aabbBounds, groupTheme, graphic), 
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, groupTheme, graphic), 
         aabbBounds;
     }
     updateGlyphAABBBounds(attribute, theme, aabbBounds, graphic) {
@@ -287,8 +287,8 @@ let DefaultGraphicService = class {
         aabbBounds.translate(deltaX, deltaY);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, richtextTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, richtextTheme, graphic), 
+        aabbBounds;
     }
     updateTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
@@ -296,8 +296,7 @@ let DefaultGraphicService = class {
         Array.isArray(text) ? graphic.updateMultilineAABBBounds(text) : graphic.updateSingallineAABBBounds(text);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        (0, vutils_1.transformBoundsWithMatrix)(aabbBounds, aabbBounds, graphic.transMatrix), 
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), (0, vutils_1.transformBoundsWithMatrix)(aabbBounds, aabbBounds, graphic.transMatrix), 
         aabbBounds;
     }
     updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
@@ -307,8 +306,7 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._pathBoundsContribitions || (this._pathBoundsContribitions = this.pathBoundsContribitions.getContributions() || []), 
         this._pathBoundsContribitions.length && this._pathBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, pathTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, pathTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, pathTheme, graphic), aabbBounds;
     }
     updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
@@ -325,8 +323,8 @@ let DefaultGraphicService = class {
         }));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), 
+        aabbBounds;
     }
     updateArc3dAABBBounds(attribute, arcTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
@@ -336,15 +334,15 @@ let DefaultGraphicService = class {
         aabbBounds.setValue(-r, -r, r, r);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), 
+        aabbBounds;
     }
     updatePolygonAABBBounds(attribute, polygonTheme, aabbBounds, graphic) {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePolygonAABBBoundsImprecise(attribute, polygonTheme, aabbBounds, graphic);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), 
+        aabbBounds;
     }
     updatePolygonAABBBoundsImprecise(attribute, polygonTheme, aabbBounds, graphic) {
         const {points: points = polygonTheme.points} = attribute;
@@ -356,8 +354,8 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (attribute.segments ? this.updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) : this.updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, lineTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, lineTheme, graphic), 
+        aabbBounds;
     }
     updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic) {
         const {points: points = lineTheme.points} = attribute, b = aabbBounds;
@@ -377,8 +375,8 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (attribute.segments ? this.updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds, graphic) : this.updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, areaTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, areaTheme, graphic), 
+        aabbBounds;
     }
     updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds, graphic) {
         const {points: points = areaTheme.points} = attribute, b = aabbBounds;
@@ -403,8 +401,7 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._circleBoundsContribitions || (this._circleBoundsContribitions = this.circleBoundsContribitions.getContributions() || []), 
         this._circleBoundsContribitions.length && this._circleBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, circleTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, circleTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, circleTheme, graphic), aabbBounds;
     }
     updateCircleAABBBoundsImprecise(attribute, circleTheme, aabbBounds, graphic) {
         const {radius: radius = circleTheme.radius} = attribute;
@@ -413,7 +410,7 @@ let DefaultGraphicService = class {
     updateCircleAABBBoundsAccurate(attribute, circleTheme, aabbBounds, graphic) {
         const {startAngle: startAngle = circleTheme.startAngle, endAngle: endAngle = circleTheme.endAngle, radius: radius = circleTheme.radius} = attribute;
         return endAngle - startAngle > vutils_1.pi2 - vutils_1.epsilon ? aabbBounds.set(-radius, -radius, radius, radius) : (0, 
-        common_1.circleBounds)(startAngle, endAngle, radius, aabbBounds), aabbBounds;
+        utils_1.circleBounds)(startAngle, endAngle, radius, aabbBounds), aabbBounds;
     }
     updateArcAABBBounds(attribute, arcTheme, aabbBounds, full, graphic) {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic));
@@ -422,8 +419,7 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._arcBoundsContribitions || (this._arcBoundsContribitions = this.arcBoundsContribitions.getContributions() || []), 
         this._arcBoundsContribitions.length && this._arcBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, arcTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), aabbBounds;
     }
     updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) {
         const {outerRadius: outerRadius = arcTheme.outerRadius} = attribute;
@@ -432,7 +428,7 @@ let DefaultGraphicService = class {
     updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic) {
         const {outerRadius: outerRadius = arcTheme.outerRadius, innerRadius: innerRadius = arcTheme.innerRadius, endAngle: endAngle = arcTheme.endAngle, startAngle: startAngle = arcTheme.startAngle} = attribute;
         return outerRadius <= vutils_1.epsilon ? aabbBounds.set(0, 0, 0, 0) : Math.abs(endAngle - startAngle) > vutils_1.pi2 - vutils_1.epsilon ? aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius) : ((0, 
-        common_1.circleBounds)(startAngle, endAngle, outerRadius, aabbBounds), (0, common_1.circleBounds)(startAngle, endAngle, innerRadius, aabbBounds)), 
+        utils_1.circleBounds)(startAngle, endAngle, outerRadius, aabbBounds), (0, utils_1.circleBounds)(startAngle, endAngle, innerRadius, aabbBounds)), 
         aabbBounds;
     }
     updateSymbolAABBBounds(attribute, symbolTheme, aabbBounds, full, graphic) {
@@ -464,8 +460,8 @@ let DefaultGraphicService = class {
         }
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, imageTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, imageTheme, graphic), 
+        aabbBounds;
     }
     combindShadowAABBBounds(bounds, graphic) {
         if (graphic && graphic.shadowRoot) {
@@ -474,7 +470,7 @@ let DefaultGraphicService = class {
         }
     }
     transformAABBBounds(attribute, aabbBounds, theme, graphic) {
-        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = (null == theme.stroke ? !!attribute.strokeColor : theme.stroke), shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, lineJoin: lineJoin = theme.lineJoin, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
+        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, lineJoin: lineJoin = theme.lineJoin, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         if (stroke) {
             const scaledHalfLineWidth = lineWidth / Math.abs(scaleX + scaleY);
             (0, tools_1.boundStroke)(tb1, scaledHalfLineWidth, "miter" === lineJoin, strokeBoundsBuffer), 
@@ -490,10 +486,14 @@ let DefaultGraphicService = class {
 };
 
 DefaultGraphicService = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(rect_contribution_1.RectBoundsContribution)), __param(1, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(1, (0, inversify_1.named)(symbol_contribution_1.SymbolBoundsContribution)), __param(2, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(2, (0, inversify_1.named)(circle_contribution_1.CircleBoundsContribution)), __param(3, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(3, (0, inversify_1.named)(arc_contribution_1.ArcBoundsContribution)), __param(4, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(4, (0, inversify_1.named)(path_contribution_1.PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object ]) ], DefaultGraphicService), 
+inversify_1.inject)(constants_1.GraphicCreator)), __param(1, (0, inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(1, (0, 
+inversify_1.named)(rect_contribution_1.RectBoundsContribution)), __param(2, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(2, (0, 
+inversify_1.named)(symbol_contribution_1.SymbolBoundsContribution)), __param(3, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(3, (0, 
+inversify_1.named)(circle_contribution_1.CircleBoundsContribution)), __param(4, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(4, (0, 
+inversify_1.named)(arc_contribution_1.ArcBoundsContribution)), __param(5, (0, inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(5, (0, 
+inversify_1.named)(path_contribution_1.PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object ]) ], DefaultGraphicService), 
 exports.DefaultGraphicService = DefaultGraphicService;
 //# sourceMappingURL=graphic-service.js.map