@visactor/vrender 0.14.6 → 0.14.8-alpha.0

package/dist/index.js

@@ -9210,6 +9210,7 @@
 	    angle: 0,
 	    alpha: 0,
 	    beta: 0,
+	    scaleCenter: [0, 0],
 	    anchor: [0, 0],
 	    anchor3d: [0, 0],
 	    postMatrix: new Matrix()
@@ -9274,7 +9275,7 @@
 	const DefaultCircleAttribute = Object.assign(Object.assign({}, DefaultAttribute), { radius: 1, startAngle: 0, endAngle: pi2 });
 	const DefaultGroupAttribute = Object.assign(Object.assign({}, DefaultAttribute), { width: 0, height: 0, cornerRadius: 0, path: [], clip: false, visibleAll: true, display: 'relative', flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'flex-start', alignItems: 'flex-start', alignContent: 'flex-start' });
 	const DefaultGlyphAttribute = Object.assign(Object.assign({}, DefaultAttribute), { path: '', width: 0, height: 0, cornerRadius: 0, clip: false });
-	const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, clipRangeByDimension: 'default' });
+	const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultConnectAttribute), { points: [], segments: [], curveType: 'linear', clipRange: 1, clipRangeByDimension: 'default', closePath: false });
 	const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), { path: new CustomPath2D(), customPath: () => {
 	        console.warn('空函数');
 	    } });
@@ -17566,7 +17567,7 @@
 	        this._updateTag &= exports.UpdateTag.CLEAR_GLOBAL_MATRIX;
 	    }
 	    doUpdateLocalMatrix() {
-	        const { x = DefaultTransform.x, y = DefaultTransform.y, scaleX = DefaultTransform.scaleX, scaleY = DefaultTransform.scaleY, angle = DefaultTransform.angle, anchor, postMatrix } = this.attribute;
+	        const { x = DefaultTransform.x, y = DefaultTransform.y, scaleX = DefaultTransform.scaleX, scaleY = DefaultTransform.scaleY, angle = DefaultTransform.angle, scaleCenter, anchor, postMatrix } = this.attribute;
 	        const _anchor = [0, 0];
 	        if (anchor) {
 	            if (typeof anchor[0] === 'string') {
@@ -17586,7 +17587,18 @@
 	                _anchor[1] = anchor[1];
 	            }
 	        }
-	        normalTransform(this._transMatrix, this._transMatrix.reset(), x, y, scaleX, scaleY, angle, anchor && _anchor);
+	        if (scaleCenter && (scaleX !== 1 || scaleY !== 1)) {
+	            const m = this._transMatrix;
+	            m.reset();
+	            m.translate(_anchor[0], _anchor[1]);
+	            m.rotate(angle);
+	            m.translate(-_anchor[0], -_anchor[1]);
+	            m.translate(x, y);
+	            application.transformUtil.fromMatrix(m, m).scale(scaleX, scaleY, { x: scaleCenter[0], y: scaleCenter[1] });
+	        }
+	        else {
+	            normalTransform(this._transMatrix, this._transMatrix.reset(), x, y, scaleX, scaleY, angle, anchor && _anchor);
+	        }
 	        const p = this.getOffsetXY(DefaultTransform);
 	        this._transMatrix.e += p.x;
 	        this._transMatrix.f += p.y;
@@ -24786,7 +24798,11 @@
 	            return;
 	        }
 	        if (line.shouldUpdateShape()) {
-	            const { points, segments, curveType = lineAttribute.curveType } = line.attribute;
+	            const { points, segments, closePath } = line.attribute;
+	            let { curveType = lineAttribute.curveType } = line.attribute;
+	            if (closePath && curveType === 'linear') {
+	                curveType = 'linearClosed';
+	            }
 	            const _points = points;
 	            if (segments && segments.length) {
 	                let startPoint;
@@ -24804,11 +24820,27 @@
 	                        startPoint.y = lastSeg.endY;
 	                        startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined;
 	                    }
-	                    lastSeg = calcLineCache$1(seg.points, curveType, {
+	                    lastSeg = calcLineCache$1(seg.points, curveType === 'linearClosed' ? 'linear' : curveType, {
 	                        startPoint
 	                    });
 	                    return lastSeg;
 	                });
+	                if (curveType === 'linearClosed') {
+	                    let startP;
+	                    for (let i = 0; i < line.cache.length; i++) {
+	                        const cacheItem = line.cache[i];
+	                        for (let i = 0; i < cacheItem.curves.length; i++) {
+	                            if (cacheItem.curves[i].defined) {
+	                                startP = cacheItem.curves[i].p0;
+	                                break;
+	                            }
+	                        }
+	                        if (startP) {
+	                            break;
+	                        }
+	                    }
+	                    lastSeg.lineTo(startP.x, startP.y, true);
+	                }
 	            }
 	            else if (points && points.length) {
 	                line.cache = calcLineCache$1(_points, curveType);
@@ -36975,7 +37007,7 @@
 	    'rect'
 	];
 
-	const version = "0.14.6";
+	const version = "0.14.8-alpha.0";
 
 	exports.ACustomAnimate = ACustomAnimate;
 	exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;