vislite 0.6.0-alpha.2 → 0.6.0

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

@@ -1,35 +1,35 @@
-import rotate from '../../rotate'
-
-// 棱柱水平部分
-
-export default function (normal: boolean, x: number, y: number, z: number, radius: number, num: number, d: number) {
-
-    let beginX: number, beginZ: number
-    if (num == 4) {
-        const temp = radius / 1.414
-        beginX = x + temp
-        beginZ = z + temp
-
-    } else {
-        beginX = x + radius
-        beginZ = z
-    }
-
-    let point = [beginX, beginZ]
-    const points = []
-    const deg = Math.PI * 2 / num
-    for (let i = 0; i < num; i++) {
-
-        points.push(x, y, z)
-        if (normal) points.push(0, d, 0)
-
-        points.push(point[0], y, point[1])
-        if (normal) points.push(0, d, 0)
-
-        point = rotate(x, z, deg * (i + 1), beginX, beginZ)
-        points.push(point[0], y, point[1])
-        if (normal) points.push(0, d, 0)
-    }
-
-    return points
-}
+import rotate from '../../rotate'
+
+// 棱柱水平部分
+
+export default function (normal: boolean, x: number, y: number, z: number, radius: number, num: number, d: number) {
+
+    let beginX: number, beginZ: number
+    if (num == 4) {
+        const temp = radius / 1.414
+        beginX = x + temp
+        beginZ = z + temp
+
+    } else {
+        beginX = x + radius
+        beginZ = z
+    }
+
+    let point = [beginX, beginZ]
+    const points = []
+    const deg = Math.PI * 2 / num
+    for (let i = 0; i < num; i++) {
+
+        points.push(x, y, z)
+        if (normal) points.push(0, d, 0)
+
+        points.push(point[0], y, point[1])
+        if (normal) points.push(0, d, 0)
+
+        point = rotate(x, z, deg * (i + 1), beginX, beginZ)
+        points.push(point[0], y, point[1])
+        if (normal) points.push(0, d, 0)
+    }
+
+    return points
+}

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 = []
+    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/sphere-fragment.ts

@@ -1,40 +1,40 @@
-import rotate from '../../rotate'
-
-// 球体中的一瓣子
-
-export default function (normal: boolean, cx: number, cy: number, cz: number, radius: number, num: number, index: number) {
-    const points = [cx, cy + radius, cz], deg = Math.PI * 2 / num
-    let point: [number, number]
-
-    if (normal) points.push(0, radius, 0)
-
-    const copy2 = () => {
-        points.push(...points.slice(points.length - (normal ? 12 : 6)))
-    }
-
-    for (let i = 1; i < num * 0.5; i++) {
-        point = rotate(cx, cy, deg * i, cx, cy + radius)
-
-        if (i > 1) copy2()
-
-        // 第一个点
-        const point1 = rotate(cx, cz, deg * index, point[0], cz)
-        points.push(point1[0], point[1], point1[1])
-
-        if (normal) points.push(point1[0] - cx, point[1] - cy, point1[1] - cz)
-
-        if (i > 1) copy2()
-
-        // 下一个点
-        const point2 = rotate(cx, cz, deg * (index + 1), point[0], cz)
-        points.push(point2[0], point[1], point2[1])
-
-        if (normal) points.push(point2[0] - cx, point2[1] - cy, point2[1] - cz)
-    }
-    copy2()
-    points.push(cx, cy - radius, cz)
-
-    if (normal) points.push(0, - radius, 0)
-
-    return points
-}
+import rotate from '../../rotate'
+
+// 球体中的一瓣子
+
+export default function (normal: boolean, cx: number, cy: number, cz: number, radius: number, num: number, index: number) {
+    const points = [cx, cy + radius, cz], deg = Math.PI * 2 / num
+    let point: [number, number]
+
+    if (normal) points.push(0, radius, 0)
+
+    const copy2 = () => {
+        points.push(...points.slice(points.length - (normal ? 12 : 6)))
+    }
+
+    for (let i = 1; i < num * 0.5; i++) {
+        point = rotate(cx, cy, deg * i, cx, cy + radius)
+
+        if (i > 1) copy2()
+
+        // 第一个点
+        const point1 = rotate(cx, cz, deg * index, point[0], cz)
+        points.push(point1[0], point[1], point1[1])
+
+        if (normal) points.push(point1[0] - cx, point[1] - cy, point1[1] - cz)
+
+        if (i > 1) copy2()
+
+        // 下一个点
+        const point2 = rotate(cx, cz, deg * (index + 1), point[0], cz)
+        points.push(point2[0], point[1], point2[1])
+
+        if (normal) points.push(point2[0] - cx, point2[1] - cy, point2[1] - cz)
+    }
+    copy2()
+    points.push(cx, cy - radius, cz)
+
+    if (normal) points.push(0, - radius, 0)
+
+    return points
+}

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

@@ -1,12 +1,12 @@
-// 计算切割份数
-export const splitNum = function (precision: number, radius: number) {
-
-    // 根据切割弧度得出切割块数目
-    const num = Math.ceil(Math.PI * 2 /
-
-        // 为了满足最小精度而得出的切割弧度
-        Math.asin(precision / radius) * 2)
-
-    return (isNaN(num) || num < 12) ? 12 : num
-
+// 计算切割份数
+export const splitNum = function (precision: number, radius: number) {
+
+    // 根据切割弧度得出切割块数目
+    const num = Math.ceil(Math.PI * 2 /
+
+        // 为了满足最小精度而得出的切割弧度
+        Math.asin(precision / radius) * 2)
+
+    return (isNaN(num) || num < 12) ? 12 : num
+
 }

package/src/common/mergeOption.ts

@@ -1,7 +1,7 @@
-export default function (option: any, defaultOption: any) {
-    for (const key in option) {
-        defaultOption[key] = option[key]
-    }
-
-    return defaultOption
+export default function (option: any, defaultOption: any) {
+    for (const key in option) {
+        defaultOption[key] = option[key]
+    }
+
+    return defaultOption
 }

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] = styles[key]
+    }
 }

package/src/common/svg/config.ts

@@ -1,186 +1,186 @@
-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"] * 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)
+        }
+    )
+}