@visactor/vrender-core 0.20.0-alpha.0 → 0.20.0-alpha.1

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

@@ -14,99 +14,9 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.DefaultGraphicService = 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 = void 0;
 
-const inversify_lite_1 = require("../../common/inversify-lite"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), text_1 = require("../../common/text"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), 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"), common_contribution_1 = require("./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, 
-    out[14] = 0, out[15] = 1, out;
-}
-
-function rotateX(out, a, rad) {
-    const s = Math.sin(rad), c = Math.cos(rad), a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7], a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11];
-    return a !== out && (out[0] = a[0], out[1] = a[1], out[2] = a[2], out[3] = a[3], 
-    out[12] = a[12], out[13] = a[13], out[14] = a[14], out[15] = a[15]), out[4] = a10 * c + a20 * s, 
-    out[5] = a11 * c + a21 * s, out[6] = a12 * c + a22 * s, out[7] = a13 * c + a23 * s, 
-    out[8] = a20 * c - a10 * s, out[9] = a21 * c - a11 * s, out[10] = a22 * c - a12 * s, 
-    out[11] = a23 * c - a13 * s, out;
-}
-
-function rotateY(out, a, rad) {
-    const s = Math.sin(rad), c = Math.cos(rad), a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3], a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11];
-    return a !== out && (out[4] = a[4], out[5] = a[5], out[6] = a[6], out[7] = a[7], 
-    out[12] = a[12], out[13] = a[13], out[14] = a[14], out[15] = a[15]), out[0] = a00 * c - a20 * s, 
-    out[1] = a01 * c - a21 * s, out[2] = a02 * c - a22 * s, out[3] = a03 * c - a23 * s, 
-    out[8] = a00 * s + a20 * c, out[9] = a01 * s + a21 * c, out[10] = a02 * s + a22 * c, 
-    out[11] = a03 * s + a23 * c, out;
-}
-
-function rotateZ(out, a, rad) {
-    const s = Math.sin(rad), c = Math.cos(rad), a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3], a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7];
-    return a !== out && (out[8] = a[8], out[9] = a[9], out[10] = a[10], out[11] = a[11], 
-    out[12] = a[12], out[13] = a[13], out[14] = a[14], out[15] = a[15]), out[0] = a00 * c + a10 * s, 
-    out[1] = a01 * c + a11 * s, out[2] = a02 * c + a12 * s, out[3] = a03 * c + a13 * s, 
-    out[4] = a10 * c - a00 * s, out[5] = a11 * c - a01 * s, out[6] = a12 * c - a02 * s, 
-    out[7] = a13 * c - a03 * s, out;
-}
-
-function translate(out, a, v) {
-    const x = v[0], y = v[1], z = v[2];
-    let a00, a01, a02, a03, a10, a11, a12, a13, a20, a21, a22, a23;
-    return a === out ? (out[12] = a[0] * x + a[4] * y + a[8] * z + a[12], out[13] = a[1] * x + a[5] * y + a[9] * z + a[13], 
-    out[14] = a[2] * x + a[6] * y + a[10] * z + a[14], out[15] = a[3] * x + a[7] * y + a[11] * z + a[15]) : (a00 = a[0], 
-    a01 = a[1], a02 = a[2], a03 = a[3], a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7], 
-    a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11], out[0] = a00, out[1] = a01, out[2] = a02, 
-    out[3] = a03, out[4] = a10, out[5] = a11, out[6] = a12, out[7] = a13, out[8] = a20, 
-    out[9] = a21, out[10] = a22, out[11] = a23, out[12] = a00 * x + a10 * y + a20 * z + a[12], 
-    out[13] = a01 * x + a11 * y + a21 * z + a[13], out[14] = a02 * x + a12 * y + a22 * z + a[14], 
-    out[15] = a03 * x + a13 * y + a23 * z + a[15]), out;
-}
-
-function mat3Tomat4(out, b) {
-    out[0] = b.a, out[1] = b.b, out[2] = 0, out[3] = 0, out[4] = b.c, out[5] = b.d, 
-    out[6] = 0, out[7] = 0, out[8] = 0, out[9] = 0, out[10] = 1, out[11] = 0, out[12] = b.e, 
-    out[13] = b.f, out[14] = 0, out[15] = 1;
-}
-
-function multiplyMat4Mat3(out, a, b) {
-    const a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3], a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7], a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11], a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
-    let b0 = b.a, b1 = b.b, b2 = 0, b3 = 0;
-    return out[0] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, out[1] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, 
-    out[2] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, out[3] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, 
-    b0 = b.c, b1 = b.d, b2 = 0, b3 = 0, out[4] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, 
-    out[5] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, out[6] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, 
-    out[7] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, b0 = 0, b1 = 0, b2 = 1, b3 = 0, 
-    out[8] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, out[9] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, 
-    out[10] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, out[11] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, 
-    b0 = b.e, b1 = b.f, b2 = 0, b3 = 1, out[12] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, 
-    out[13] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, out[14] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, 
-    out[15] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, out;
-}
-
-function scale(out, a, v) {
-    const x = v[0], y = v[1], z = v[2];
-    return out[0] = a[0] * x, out[1] = a[1] * x, out[2] = a[2] * x, out[3] = a[3] * x, 
-    out[4] = a[4] * y, out[5] = a[5] * y, out[6] = a[6] * y, out[7] = a[7] * y, out[8] = a[8] * z, 
-    out[9] = a[9] * z, out[10] = a[10] * z, out[11] = a[11] * z, out[12] = a[12], out[13] = a[13], 
-    out[14] = a[14], out[15] = a[15], out;
-}
-
-function multiplyMat4Mat4(out, a, b) {
-    const a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3], a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7], a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11], a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
-    let b0 = b[0], b1 = b[1], b2 = b[2], b3 = b[3];
-    return out[0] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, out[1] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, 
-    out[2] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, out[3] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, 
-    b0 = b[4], b1 = b[5], b2 = b[6], b3 = b[7], out[4] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, 
-    out[5] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, out[6] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, 
-    out[7] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, b0 = b[8], b1 = b[9], b2 = b[10], 
-    b3 = b[11], out[8] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, out[9] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, 
-    out[10] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, out[11] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, 
-    b0 = b[12], b1 = b[13], b2 = b[14], b3 = b[15], out[12] = b0 * a00 + b1 * a10 + b2 * a20 + b3 * a30, 
-    out[13] = b0 * a01 + b1 * a11 + b2 * a21 + b3 * a31, out[14] = b0 * a02 + b1 * a12 + b2 * a22 + b3 * a32, 
-    out[15] = b0 * a03 + b1 * a13 + b2 * a23 + b3 * a33, out;
-}
+const inversify_lite_1 = require("../../common/inversify-lite"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), text_1 = require("../../common/text"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), 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"), common_contribution_1 = require("./common-contribution"), matrix_1 = require("../../common/matrix");
 
 function getExtraModelMatrix(dx, dy, graphic) {
     const {alpha: alpha, beta: beta} = graphic.attribute;
@@ -128,8 +38,9 @@ function getExtraModelMatrix(dx, dy, graphic) {
     }
     _anchor[0] += dx, _anchor[1] += dy;
     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 ]), 
+    return (0, matrix_1.translate)(modelMatrix, modelMatrix, [ _anchor[0], _anchor[1], 0 ]), 
+    beta && (0, matrix_1.rotateX)(modelMatrix, modelMatrix, beta), alpha && (0, matrix_1.rotateY)(modelMatrix, modelMatrix, alpha), 
+    (0, matrix_1.translate)(modelMatrix, modelMatrix, [ -_anchor[0], -_anchor[1], 0 ]), 
     modelMatrix;
 }
 
@@ -147,9 +58,10 @@ function getModelMatrix(out, graphic, theme) {
         } else _anchor[1] = anchor3d[1];
         _anchor[2] = null !== (_a = anchor3d[2]) && void 0 !== _a ? _a : 0;
     }
-    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) {
+    if ((0, matrix_1.identityMat4)(out), (0, matrix_1.translate)(out, out, [ x + dx, y + dy, z + dz ]), 
+    (0, matrix_1.translate)(out, out, [ _anchor[0], _anchor[1], _anchor[2] ]), (0, matrix_1.rotateX)(out, out, beta), 
+    (0, matrix_1.rotateY)(out, out, alpha), (0, matrix_1.translate)(out, out, [ -_anchor[0], -_anchor[1], _anchor[2] ]), 
+    (0, matrix_1.scaleMat4)(out, out, [ scaleX, scaleY, scaleZ ]), angle) {
         const m = matrix_allocate_1.mat4Allocate.allocate(), _anchor = [ 0, 0 ];
         if (anchor) {
             if ("string" == typeof anchor3d[0]) {
@@ -161,8 +73,8 @@ function getModelMatrix(out, graphic, theme) {
                 _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;
             } else _anchor[1] = anchor3d[1];
         }
-        translate(m, m, [ _anchor[0], _anchor[1], 0 ]), rotateZ(m, m, angle), translate(m, m, [ -_anchor[0], -_anchor[1], 0 ]), 
-        multiplyMat4Mat4(out, out, m);
+        (0, matrix_1.translate)(m, m, [ _anchor[0], _anchor[1], 0 ]), (0, matrix_1.rotateZ)(m, m, angle), 
+        (0, matrix_1.translate)(m, m, [ -_anchor[0], -_anchor[1], 0 ]), (0, matrix_1.multiplyMat4Mat4)(out, out, m);
     }
 }
 
@@ -171,8 +83,6 @@ function shouldUseMat4(graphic) {
     return alpha || beta;
 }
 
-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;
 
@@ -232,7 +142,7 @@ let DefaultGraphicService = class {
             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);
+            (isFinite(width) || isFinite(height) || isFinite(x) || isFinite(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), 
@@ -243,7 +153,7 @@ let DefaultGraphicService = class {
     updateGroupAABBBounds(attribute, groupTheme, aabbBounds, graphic) {
         const originalAABBBounds = aabbBounds;
         aabbBounds = aabbBounds.clone();
-        const {width: width, height: height, path: path, clip: clip = groupTheme.clip} = attribute;
+        const {width: width, height: height, path: path, clip: clip = groupTheme.clip, display: display} = attribute;
         path && path.length ? path.forEach((g => {
             aabbBounds.union(g.AABBBounds);
         })) : null != width && null != height && aabbBounds.set(0, 0, Math.max(0, width), Math.max(0, height)), 
@@ -398,16 +308,16 @@ let DefaultGraphicService = class {
         aabbBounds;
     }
     updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic) {
-        const {points: points = lineTheme.points} = attribute, b = aabbBounds;
+        const {points: points = lineTheme.points, connectedType: connectedType} = attribute, b = aabbBounds;
         return points.forEach((p => {
-            b.add(p.x, p.y);
+            !1 === p.defined && "zero" !== connectedType || b.add(p.x, p.y);
         })), b;
     }
     updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
-        const {segments: segments = lineTheme.segments} = attribute, b = aabbBounds;
+        const {segments: segments = lineTheme.segments, connectedType: connectedType} = attribute, b = aabbBounds;
         return segments.forEach((s => {
             s.points.forEach((p => {
-                b.add(p.x, p.y);
+                !1 === p.defined && "zero" !== connectedType || b.add(p.x, p.y);
             }));
         })), b;
     }