vislite 0.7.0-alpha.0 → 0.7.0

package/src/common/geometry/prism-vertical.ts

@@ -1,40 +1,40 @@
-import rotate from '../../rotate'
-
-// 棱柱垂直部分
-
-export default function (normal: boolean, x: number, y: number, z: number, radius: number, height: number, num: number) {
-    const points = []
-    let beginPosition: [number, number]
-
-    if (num == 4) {
-        beginPosition = rotate(x, z, Math.PI * 0.25, x - radius, z)
-    } else {
-        beginPosition = [x + radius, z]
-    }
-
-    const deg = Math.PI * 2 / num, degHalf = Math.PI * 2 / (num * 2)
-
-    let endPosition: [number, number], normalPosition = []
-    for (let i = 0; i < num; i++) {
-
-        endPosition = rotate(x, z, deg, ...beginPosition)
-
-        if (normal) {
-            const halfPosition = rotate(x, z, degHalf, ...beginPosition)
-            normalPosition = [halfPosition[0], 0, halfPosition[1]]
-        }
-
-        points.push(beginPosition[0], y, beginPosition[1], ...normalPosition)
-        points.push(beginPosition[0], y + height, beginPosition[1], ...normalPosition)
-        points.push(endPosition[0], y + height, endPosition[1], ...normalPosition)
-
-        points.push(beginPosition[0], y, beginPosition[1], ...normalPosition)
-        points.push(endPosition[0], y, endPosition[1], ...normalPosition)
-        points.push(endPosition[0], y + height, endPosition[1], ...normalPosition)
-
-
-        beginPosition = endPosition
-    }
-
-    return points
-}
+import rotate from '../../rotate'
+
+// 棱柱垂直部分
+
+export default function (normal: boolean, x: number, y: number, z: number, radius: number, height: number, num: number) {
+    const points = []
+    let beginPosition: [number, number]
+
+    if (num == 4) {
+        beginPosition = rotate(x, z, Math.PI * 0.25, x - radius, z)
+    } else {
+        beginPosition = [x + radius, z]
+    }
+
+    const deg = Math.PI * 2 / num, degHalf = Math.PI * 2 / (num * 2)
+
+    let endPosition: [number, number], normalPosition: [number, number, number] | [] = []
+    for (let i = 0; i < num; i++) {
+
+        endPosition = rotate(x, z, deg, ...beginPosition)
+
+        if (normal) {
+            const halfPosition = rotate(x, z, degHalf, ...beginPosition)
+            normalPosition = [halfPosition[0], 0, halfPosition[1]]
+        }
+
+        points.push(beginPosition[0], y, beginPosition[1], ...normalPosition)
+        points.push(beginPosition[0], y + height, beginPosition[1], ...normalPosition)
+        points.push(endPosition[0], y + height, endPosition[1], ...normalPosition)
+
+        points.push(beginPosition[0], y, beginPosition[1], ...normalPosition)
+        points.push(endPosition[0], y, endPosition[1], ...normalPosition)
+        points.push(endPosition[0], y + height, endPosition[1], ...normalPosition)
+
+
+        beginPosition = endPosition
+    }
+
+    return points
+}

package/src/common/geometry/tool/rotateLine.ts

@@ -0,0 +1,36 @@
+export default function (x: number, y: number, z: number, x2: number, y2: number, z2: number) {
+    return (x0: number, y0: number, z0: number, isNormal: boolean) => {
+        let sin: number, cos: number, temp: Array<number>
+
+        // 第一步：归零化
+        let _x0 = x0 - (isNormal ? 0 : x), _y0 = y0 - (isNormal ? 0 : y), _z0 = z0 - (isNormal ? 0 : z)  // 法向量起点本来就是原点
+        const _x2 = x2 - x, _y2 = y2 - y, _z2 = z2 - z
+
+        // 第二步：围绕OZ轴旋转
+
+        const __d = Math.sqrt(_x2 * _x2 + _z2 * _z2)
+        cos = _x2 / __d
+        sin = _z2 / __d
+
+        const _x2N = _z2 * sin + _x2 * cos
+
+        const d = Math.sqrt(_y2 * _y2 + _x2N * _x2N)
+        cos = _y2 / d
+        sin = _x2N / d
+
+        temp = [_y0, _x0]
+        _y0 = temp[0] * cos - temp[1] * sin
+        _x0 = temp[0] * sin + temp[1] * cos
+
+        // 第三步：围绕0Y轴旋转
+        cos = _x2 / __d
+        sin = _z2 / __d
+
+        temp = [_x0, _z0]
+        _x0 = temp[0] * cos - temp[1] * sin
+        _z0 = temp[0] * sin + temp[1] * cos
+
+        // 第四步：去零化（直接返回）
+        return [_x0 + (isNormal ? 0 : x), _y0 + (isNormal ? 0 : y), _z0 + (isNormal ? 0 : z)]
+    }
+}

package/src/common/setStyle.ts

@@ -1,6 +1,6 @@
-// 修改样式
-export default function (el: HTMLElement | SVGElement, styles: any) {
-    for (const key in styles) {
-        el.style[key] = styles[key]
-    }
+// 修改样式
+export default function (el: HTMLElement | SVGElement, styles: any) {
+    for (const key in styles) {
+        el.style[key as any] = styles[key]
+    }
 }

package/src/common/svg/config.ts

@@ -1,186 +1,190 @@
-import type SVGConfigType from "../../../types/SVGConfig"
-
-import { setAttribute } from "./tool"
-import setStyle from "../setStyle"
-import arc from "../canvas/arc"
-import { toNode } from "./tool"
-
-export const initDefs = (el: SVGElement) => {
-    const defs = el.getElementsByTagName('defs')
-    if (defs.length <= 0) {
-        const newDefs = toNode("defs")
-        el.appendChild(newDefs)
-        return newDefs
-    } else {
-        return defs[0]
-    }
-}
-
-// 文字统一设置方法
-export const initText = (
-    el: SVGElement,
-    config: SVGConfigType,
-    x: number,
-    y: number,
-    deg: number
-) => {
-    if (el.nodeName.toLowerCase() !== "text") throw new Error("Need a <text> !")
-
-    // 垂直对齐采用dy实现
-    setAttribute(
-        el,
-        "dy",
-        {
-            top: config["fontSize"] * 0.5,
-            middle: 0,
-            bottom: -config["fontSize"] * 0.5,
-        }[config.textBaseline]
-    )
-
-    setStyle(el, {
-        // 文字对齐方式
-        "text-anchor": {
-            left: "start",
-            right: "end",
-            center: "middle",
-        }[config.textAlign],
-        "dominant-baseline": "central",
-
-        // 文字大小和字体设置
-        "font-size": config["fontSize"] + "px",
-        "font-family": config["fontFamily"],
-    })
-
-    // 位置
-    setAttribute(el, "x", x)
-    setAttribute(el, "y", y)
-
-    // 旋转
-    if (typeof deg == "number") {
-        deg = deg % 360
-        setAttribute(el, "transform", "rotate(" + deg + "," + x + "," + y + ")")
-    }
-}
-
-// 画圆统一设置方法
-export const initCircle = (el: SVGElement, cx: number, cy: number, r: number) => {
-    if (el.nodeName.toLowerCase() !== "circle")
-        throw new Error("Need a <circle> !")
-    setAttribute(el, "cx", cx)
-    setAttribute(el, "cy", cy)
-    setAttribute(el, "r", r)
-}
-
-// 路径统一设置方法
-export const initPath = (el: SVGElement, path: string) => {
-    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
-    setAttribute(el, "d", path)
-}
-
-// 画矩形统一设置方法
-export const initRect = (
-    el: SVGElement,
-    x: number,
-    y: number,
-    width: number,
-    height: number
-) => {
-    if (el.nodeName.toLowerCase() !== "rect") throw new Error("Need a <rect> !")
-
-    // 由于高和宽不可以是负数，校对一下
-    if (height < 0) {
-        height *= -1
-        y -= height
-    }
-    if (width < 0) {
-        width *= -1
-        x -= width
-    }
-
-    setAttribute(el, "x", x)
-    setAttribute(el, "y", y)
-    setAttribute(el, "width", width)
-    setAttribute(el, "height", height)
-}
-
-// 画弧统一设置方法
-export const initArc = (
-    el: SVGElement,
-    config: SVGConfigType,
-    cx: number,
-    cy: number,
-    r1: number,
-    r2: number,
-    beginDeg: number,
-    deg: number
-) => {
-    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
-
-    beginDeg = (beginDeg / 180) * Math.PI
-    deg = (deg / 180) * Math.PI
-
-    beginDeg = beginDeg % (Math.PI * 2)
-
-    if (r1 > r2) {
-        const temp = r1
-        r1 = r2
-        r2 = temp
-    }
-
-    // 当|deg|>=2π的时候都认为是一个圆环
-    if (deg >= Math.PI * 1.999999 || deg <= -Math.PI * 1.999999) {
-        deg = Math.PI * 1.999999
-    } else {
-        deg = deg % (Math.PI * 2)
-    }
-
-    arc(
-        beginDeg,
-        deg,
-        cx,
-        cy,
-        r1,
-        r2,
-        function (
-            beginA: number,
-            endA: number,
-            begInnerX: number,
-            begInnerY: number,
-            begOuterX: number,
-            begOuterY: number,
-            endInnerX: number,
-            endInnerY: number,
-            endOuterX: number,
-            endOuterY: number,
-            r: number
-        ) {
-            const f = endA - beginA > Math.PI ? 1 : 0
-            let d = "M" + begInnerX + " " + begInnerY
-            if (r < 0) r = -r
-
-            d +=
-                // 横半径 竖半径 x轴偏移角度 0小弧/1大弧 0逆时针/1顺时针 终点x 终点y
-                "A" + r1 + " " + r1 + " 0 " + f + " 1 " + endInnerX + " " + endInnerY
-
-            // 结尾
-            if (config.arcEndCap == "round")
-                d += "A" + r + " " + r + " " + " 0 1 0 " + endOuterX + " " + endOuterY
-            else if (config.arcEndCap == "-round")
-                d += "A" + r + " " + r + " " + " 0 1 1 " + endOuterX + " " + endOuterY
-            else d += "L" + endOuterX + " " + endOuterY
-            d +=
-                "A" + r2 + " " + r2 + " 0 " + f + " 0 " + begOuterX + " " + begOuterY
-
-            // 开头
-            if (config.arcStartCap == "round")
-                d += "A" + r + " " + r + " " + " 0 1 0 " + begInnerX + " " + begInnerY
-            else if (config.arcStartCap == "-round")
-                d += "A" + r + " " + r + " " + " 0 1 1 " + begInnerX + " " + begInnerY
-            else d += "L" + begInnerX + " " + begInnerY
-
-            if (config.arcStartCap == "butt") d += "Z"
-
-            setAttribute(el, "d", d)
-        }
-    )
-}
+import type SVGConfigType from "../../../types/SVGConfig"
+
+import { setAttribute } from "./tool"
+import setStyle from "../setStyle"
+import arc from "../canvas/arc"
+import { toNode } from "./tool"
+
+export const initDefs = (el: SVGElement) => {
+    const defs = el.getElementsByTagName('defs')
+    if (defs.length <= 0) {
+        const newDefs = toNode("defs")
+        el.appendChild(newDefs)
+        return newDefs
+    } else {
+        return defs[0]
+    }
+}
+
+// 文字统一设置方法
+export const initText = (
+    el: SVGElement,
+    config: SVGConfigType,
+    x: number,
+    y: number,
+    deg: number
+) => {
+    if (el.nodeName.toLowerCase() !== "text") throw new Error("Need a <text> !")
+
+    // 垂直对齐采用dy实现
+    setAttribute(
+        el,
+        "dy",
+        ({
+            top: (config["fontSize"] as number) * 0.5,
+            middle: 0,
+            bottom: -(config["fontSize"] as number) * 0.5,
+        } as {
+            [key: string]: number
+        })[config.textBaseline as string]
+    )
+
+    setStyle(el, {
+        // 文字对齐方式
+        "text-anchor": ({
+            left: "start",
+            right: "end",
+            center: "middle",
+        } as {
+            [key: string]: string
+        })[config.textAlign as string],
+        "dominant-baseline": "central",
+
+        // 文字大小和字体设置
+        "font-size": config["fontSize"] + "px",
+        "font-family": config["fontFamily"],
+    })
+
+    // 位置
+    setAttribute(el, "x", x)
+    setAttribute(el, "y", y)
+
+    // 旋转
+    if (typeof deg == "number") {
+        deg = deg % 360
+        setAttribute(el, "transform", "rotate(" + deg + "," + x + "," + y + ")")
+    }
+}
+
+// 画圆统一设置方法
+export const initCircle = (el: SVGElement, cx: number, cy: number, r: number) => {
+    if (el.nodeName.toLowerCase() !== "circle")
+        throw new Error("Need a <circle> !")
+    setAttribute(el, "cx", cx)
+    setAttribute(el, "cy", cy)
+    setAttribute(el, "r", r)
+}
+
+// 路径统一设置方法
+export const initPath = (el: SVGElement, path: string) => {
+    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
+    setAttribute(el, "d", path)
+}
+
+// 画矩形统一设置方法
+export const initRect = (
+    el: SVGElement,
+    x: number,
+    y: number,
+    width: number,
+    height: number
+) => {
+    if (el.nodeName.toLowerCase() !== "rect") throw new Error("Need a <rect> !")
+
+    // 由于高和宽不可以是负数，校对一下
+    if (height < 0) {
+        height *= -1
+        y -= height
+    }
+    if (width < 0) {
+        width *= -1
+        x -= width
+    }
+
+    setAttribute(el, "x", x)
+    setAttribute(el, "y", y)
+    setAttribute(el, "width", width)
+    setAttribute(el, "height", height)
+}
+
+// 画弧统一设置方法
+export const initArc = (
+    el: SVGElement,
+    config: SVGConfigType,
+    cx: number,
+    cy: number,
+    r1: number,
+    r2: number,
+    beginDeg: number,
+    deg: number
+) => {
+    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
+
+    beginDeg = (beginDeg / 180) * Math.PI
+    deg = (deg / 180) * Math.PI
+
+    beginDeg = beginDeg % (Math.PI * 2)
+
+    if (r1 > r2) {
+        const temp = r1
+        r1 = r2
+        r2 = temp
+    }
+
+    // 当|deg|>=2π的时候都认为是一个圆环
+    if (deg >= Math.PI * 1.999999 || deg <= -Math.PI * 1.999999) {
+        deg = Math.PI * 1.999999
+    } else {
+        deg = deg % (Math.PI * 2)
+    }
+
+    arc(
+        beginDeg,
+        deg,
+        cx,
+        cy,
+        r1,
+        r2,
+        function (
+            beginA: number,
+            endA: number,
+            begInnerX: number,
+            begInnerY: number,
+            begOuterX: number,
+            begOuterY: number,
+            endInnerX: number,
+            endInnerY: number,
+            endOuterX: number,
+            endOuterY: number,
+            r: number
+        ) {
+            const f = endA - beginA > Math.PI ? 1 : 0
+            let d = "M" + begInnerX + " " + begInnerY
+            if (r < 0) r = -r
+
+            d +=
+                // 横半径 竖半径 x轴偏移角度 0小弧/1大弧 0逆时针/1顺时针 终点x 终点y
+                "A" + r1 + " " + r1 + " 0 " + f + " 1 " + endInnerX + " " + endInnerY
+
+            // 结尾
+            if (config.arcEndCap == "round")
+                d += "A" + r + " " + r + " " + " 0 1 0 " + endOuterX + " " + endOuterY
+            else if (config.arcEndCap == "-round")
+                d += "A" + r + " " + r + " " + " 0 1 1 " + endOuterX + " " + endOuterY
+            else d += "L" + endOuterX + " " + endOuterY
+            d +=
+                "A" + r2 + " " + r2 + " 0 " + f + " 0 " + begOuterX + " " + begOuterY
+
+            // 开头
+            if (config.arcStartCap == "round")
+                d += "A" + r + " " + r + " " + " 0 1 0 " + begInnerX + " " + begInnerY
+            else if (config.arcStartCap == "-round")
+                d += "A" + r + " " + r + " " + " 0 1 1 " + begInnerX + " " + begInnerY
+            else d += "L" + begInnerX + " " + begInnerY
+
+            if (config.arcStartCap == "butt") d += "Z"
+
+            setAttribute(el, "d", d)
+        }
+    )
+}

package/src/common/svg/tool.ts

@@ -1,45 +1,45 @@
-import type SVGConfigType from '../../../types/SVGConfig'
-
-import { XLINK_ATTRIBUTE } from "./dictionary"
-
-// 新建节点
-export function toNode(tagname: string) {
-    return document.createElementNS('http://www.w3.org/2000/svg', tagname)
-}
-
-// 设置属性
-const _setAttribute = function (el: SVGElement, key: string, value: string | number) {
-
-    // 需要使用xlink命名空间的xml属性
-    if (XLINK_ATTRIBUTE.indexOf(key) > -1) {
-        el.setAttributeNS("http://www.w3.org/1999/xlink", 'xlink:' + key, value + "")
-    }
-
-    // 否则
-    else {
-        el.setAttribute(key, value + "")
-    }
-}
-export const setAttribute = _setAttribute
-
-// 获取属性
-export function getAttribute(el: SVGElement, key: string) {
-    if (XLINK_ATTRIBUTE.indexOf(key) > -1) key = 'xlink:' + key
-    return el.getAttribute(key)
-}
-
-export function full(el: SVGElement, config: SVGConfigType) {
-    _setAttribute(el, "stroke", config.strokeStyle)
-    _setAttribute(el, "fill", config.fillStyle)
-    _setAttribute(el, "stroke-dasharray", config.lineDash.join(','))
-}
-
-export function fill(el: SVGElement, config: SVGConfigType) {
-    _setAttribute(el, "fill", config.fillStyle)
-}
-
-export function stroke(el: SVGElement, config: SVGConfigType) {
-    _setAttribute(el, "stroke", config.strokeStyle)
-    _setAttribute(el, "fill", "none")
-    _setAttribute(el, "stroke-dasharray", config.lineDash.join(','))
+import type SVGConfigType from '../../../types/SVGConfig'
+
+import { XLINK_ATTRIBUTE } from "./dictionary"
+
+// 新建节点
+export function toNode(tagname: string) {
+    return document.createElementNS('http://www.w3.org/2000/svg', tagname)
+}
+
+// 设置属性
+const _setAttribute = function (el: SVGElement, key: string, value: string | number) {
+
+    // 需要使用xlink命名空间的xml属性
+    if (XLINK_ATTRIBUTE.indexOf(key) > -1) {
+        el.setAttributeNS("http://www.w3.org/1999/xlink", 'xlink:' + key, value + "")
+    }
+
+    // 否则
+    else {
+        el.setAttribute(key, value + "")
+    }
+}
+export const setAttribute = _setAttribute
+
+// 获取属性
+export function getAttribute(el: SVGElement, key: string) {
+    if (XLINK_ATTRIBUTE.indexOf(key) > -1) key = 'xlink:' + key
+    return el.getAttribute(key)
+}
+
+export function full(el: SVGElement, config: SVGConfigType) {
+    _setAttribute(el, "stroke", config.strokeStyle as string)
+    _setAttribute(el, "fill", config.fillStyle as string)
+    _setAttribute(el, "stroke-dasharray", (config.lineDash as Array<number>).join(','))
+}
+
+export function fill(el: SVGElement, config: SVGConfigType) {
+    _setAttribute(el, "fill", config.fillStyle as string)
+}
+
+export function stroke(el: SVGElement, config: SVGConfigType) {
+    _setAttribute(el, "stroke", config.strokeStyle as string)
+    _setAttribute(el, "fill", "none")
+    _setAttribute(el, "stroke-dasharray", (config.lineDash as Array<number>).join(','))
 }