@visactor/vrender-core 0.16.19 → 0.16.20-alpha.1

package/es/graphic/graphic-service/graphic-service.js

@@ -10,30 +10,20 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { inject, injectable, named } from "../../common/inversify-lite";
+import { inject, injectable } from "../../common/inversify-lite";
 
 import { AABBBounds, epsilon, isArray, pi2, transformBoundsWithMatrix } from "@visactor/vutils";
 
 import { SyncHook } from "../../tapable";
 
-import { RectBoundsContribution } from "./rect-contribution";
-
 import { textDrawOffsetX } from "../../common/text";
 
-import { SymbolBoundsContribution } from "./symbol-contribution";
+import { DefaultSymbolOuterBorderBoundsContribution } from "./symbol-contribution";
 
 import { boundStroke } from "../tools";
 
-import { CircleBoundsContribution } from "./circle-contribution";
-
-import { ArcBoundsContribution } from "./arc-contribution";
-
-import { PathBoundsContribution } from "./path-contribution";
-
 import { mat4Allocate } from "../../allocator/matrix-allocate";
 
-import { ContributionProvider } from "../../common/contribution-provider";
-
 import { BoundsContext } from "../../common/bounds-context";
 
 import { renderCommandList } from "../../common/render-command-list";
@@ -42,6 +32,8 @@ import { circleBounds } from "../../common/utils";
 
 import { GraphicCreator } from "../constants";
 
+import { DefaultOuterBorderBoundsContribution } from "./common-contribution";
+
 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, 
     out[7] = 0, out[8] = 0, out[9] = 0, out[10] = 1, out[11] = 0, out[12] = 0, out[13] = 0, 
@@ -196,11 +188,8 @@ export function shouldUseMat4(graphic) {
 }
 
 let DefaultGraphicService = class {
-    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 = {
+    constructor(creator) {
+        this.creator = creator, this.hooks = {
             onAttributeUpdate: new SyncHook([ "graphic" ]),
             onSetStage: new SyncHook([ "graphic", "stage" ]),
             onRemove: new SyncHook([ "graphic" ]),
@@ -209,7 +198,10 @@ let DefaultGraphicService = class {
             onClearIncremental: new SyncHook([ "graphic", "group", "stage" ]),
             beforeUpdateAABBBounds: new SyncHook([ "graphic", "stage", "willUpdate", "aabbBounds" ]),
             afterUpdateAABBBounds: new SyncHook([ "graphic", "stage", "aabbBounds", "globalAABBBounds", "selfChange" ])
-        }, this.tempAABBBounds1 = new AABBBounds, this.tempAABBBounds2 = new AABBBounds;
+        }, this.tempAABBBounds1 = new AABBBounds, this.tempAABBBounds2 = new AABBBounds, 
+        this._rectBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ], this._symbolBoundsContribitions = [ new DefaultSymbolOuterBorderBoundsContribution ], 
+        this._circleBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ], 
+        this._arcBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ], this._pathBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ];
     }
     onAttributeUpdate(graphic) {
         this.hooks.onAttributeUpdate.taps.length && this.hooks.onAttributeUpdate.call(graphic);
@@ -244,13 +236,14 @@ let DefaultGraphicService = class {
     updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
         if (!this._validCheck(attribute, rectTheme, aabbBounds, graphic)) return aabbBounds;
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
-            const {width: width = rectTheme.width, height: height = rectTheme.height} = attribute;
-            aabbBounds.set(0, 0, width, height);
+            let {width: width, height: height} = attribute;
+            const {x1: x1, y1: y1, x: x, y: y} = attribute;
+            width = null != width ? width : x1 - x, height = null != height ? height : y1 - y, 
+            aabbBounds.set(0, 0, width || 0, height || 0);
         }
         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._rectBoundsContribitions || (this._rectBoundsContribitions = this.rectBoundsContribitions.getContributions() || []), 
-        this._rectBoundsContribitions.length && this._rectBoundsContribitions.forEach((c => {
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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.transformAABBBounds(attribute, aabbBounds, rectTheme, !1, graphic), aabbBounds;
     }
@@ -334,7 +327,6 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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);
         }));
@@ -439,8 +431,7 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateCircleAABBBoundsImprecise(attribute, circleTheme, aabbBounds, graphic) : this.updateCircleAABBBoundsAccurate(attribute, circleTheme, 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._circleBoundsContribitions || (this._circleBoundsContribitions = this.circleBoundsContribitions.getContributions() || []), 
-        this._circleBoundsContribitions.length && this._circleBoundsContribitions.forEach((c => {
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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.transformAABBBounds(attribute, aabbBounds, circleTheme, !1, graphic), 
         aabbBounds;
@@ -459,7 +450,6 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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);
         }));
@@ -490,7 +480,6 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateSymbolAABBBoundsImprecise(attribute, symbolTheme, aabbBounds, graphic) : this.updateSymbolAABBBoundsAccurate(attribute, symbolTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        this._symbolBoundsContribitions || (this._symbolBoundsContribitions = this.symbolBoundsContribitions.getContributions() || []), 
         this._symbolBoundsContribitions.length && this._symbolBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, symbolTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }));
@@ -529,9 +518,9 @@ let DefaultGraphicService = class {
         }
     }
     transformAABBBounds(attribute, aabbBounds, theme, miter, graphic) {
-        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, pickStrokeBuffer: pickStrokeBuffer = theme.pickStrokeBuffer, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
-        if (stroke) {
-            const scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);
+        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
+        if (stroke && lineWidth) {
+            const scaledHalfLineWidth = lineWidth / Math.abs(scaleX + scaleY);
             boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1), 
             tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }
@@ -540,7 +529,11 @@ let DefaultGraphicService = class {
             boundStroke(tb1, shadowBlurWidth, !1, strokeBoundsBuffer + 1), tb1.translate(shadowOffsetX, shadowOffsetY), 
             aabbBounds.union(tb1);
         }
-        this.combindShadowAABBBounds(aabbBounds, graphic), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix);
+        this.combindShadowAABBBounds(aabbBounds, graphic);
+        let updateMatrix = !0;
+        const m = graphic.transMatrix;
+        graphic && graphic.isContainer && (updateMatrix = !(1 === m.a && 0 === m.b && 0 === m.c && 1 === m.d && 0 === m.e && 0 === m.f)), 
+        updateMatrix && transformBoundsWithMatrix(aabbBounds, aabbBounds, m);
     }
     _validCheck(attribute, theme, aabbBounds, graphic) {
         if (!graphic) return !0;
@@ -550,7 +543,7 @@ let DefaultGraphicService = class {
     }
 };
 
-DefaultGraphicService = __decorate([ injectable(), __param(0, inject(GraphicCreator)), __param(1, inject(ContributionProvider)), __param(1, named(RectBoundsContribution)), __param(2, inject(ContributionProvider)), __param(2, named(SymbolBoundsContribution)), __param(3, inject(ContributionProvider)), __param(3, named(CircleBoundsContribution)), __param(4, inject(ContributionProvider)), __param(4, named(ArcBoundsContribution)), __param(5, inject(ContributionProvider)), __param(5, named(PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object ]) ], DefaultGraphicService);
+DefaultGraphicService = __decorate([ injectable(), __param(0, inject(GraphicCreator)), __metadata("design:paramtypes", [ Object ]) ], DefaultGraphicService);
 
 export { DefaultGraphicService };
 //# sourceMappingURL=graphic-service.js.map