vislite 0.5.2 → 0.6.0-alpha.2

package/src/common/canvas/texts.ts

@@ -1,19 +1,19 @@
-export default function (painter: CanvasRenderingContext2D, contents: string, width: number, height: number, doback: (content: string, top: number) => void) {
-
-    let lineNumber = 0, content = ""
-    for (let i = 0; i < contents.length; i++) {
-        if (painter.measureText(content + contents[i]).width > width || /\n$/.test(content)) {
-            lineNumber += 1
-            doback(content, (lineNumber - 0.5) * height)
-
-            content = contents[i]
-        } else if (i == contents.length - 1) {
-            lineNumber += 1
-            doback(content + contents[i], (lineNumber - 0.5) * height)
-        } else {
-            content += contents[i]
-        }
-    }
-
-    return lineNumber * height
+export default function (painter: CanvasRenderingContext2D, contents: string, width: number, height: number, doback: (content: string, top: number) => void) {
+
+    let lineNumber = 0, content = ""
+    for (let i = 0; i < contents.length; i++) {
+        if (painter.measureText(content + contents[i]).width > width || /\n$/.test(content)) {
+            lineNumber += 1
+            doback(content, (lineNumber - 0.5) * height)
+
+            content = contents[i]
+        } else if (i == contents.length - 1) {
+            lineNumber += 1
+            doback(content + contents[i], (lineNumber - 0.5) * height)
+        } else {
+            content += contents[i]
+        }
+    }
+
+    return lineNumber * height
 }

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

@@ -1,33 +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) {
-        let temp = radius / 1.414
-        beginX = x + temp
-        beginZ = z + temp
-
-    } else {
-        beginX = x + radius
-        beginZ = z
-    }
-
-    let point = [beginX, beginZ], points = [], 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) {
-    let points = []
-    let beginPosition: [number, number]
-
-    if (num == 4) {
-        beginPosition = rotate(x, z, Math.PI * 0.25, x - radius, z)
-    } else {
-        beginPosition = [x + radius, z]
-    }
-
-    let 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) {
-            let 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,39 +1,40 @@
-import rotate from '../../rotate'
-
-// 球体中的一瓣子
-
-export default function (normal: boolean, cx: number, cy: number, cz: number, radius: number, num: number, index: number) {
-    let points = [cx, cy + radius, cz], deg = Math.PI * 2 / num, point: [number, number]
-
-    if (normal) points.push(0, radius, 0)
-
-    let 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()
-
-        // 第一个点
-        let 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()
-
-        // 下一个点
-        let 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 let splitNum = function (precision: number, radius: number) {
-
-    // 根据切割弧度得出切割块数目
-    let 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 (let 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 (let 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]
+    }
 }