vislite 0.6.0 → 0.7.0

package/lib/resizeObserver/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 var e,r;e=this,r=function(){"use strict";var e,r={},n=0;return function(o,t){try{return e||(e=new ResizeObserver((function(e){for(var n=0,o=e;n<o.length;n++){var t=o[n];r[t.target._resize_observer_]()}}))),n++,o._resize_observer_=n,r[n]=t,e.observe(o),function(){e&&(e.unobserve(o),delete r[o._resize_observer_])}}catch(e){t(),console.error("ResizeObserver undefined!")}}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define(r):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_resizeObserver=r();

package/lib/rotate/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

package/lib/rotate/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 var e,t;e=this,t=function(){"use strict";return function(e,t,n,o,i){var f=Math.cos(n),d=Math.sin(n);return[(o-e)*f-(i-t)*d+e,(o-e)*d+(i-t)*f+t]}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_rotate=t();

package/lib/ruler/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -80,7 +80,7 @@
         var rulerArray = getResult(0);
         var balanceMax = function () {
             var rulerArray_temp = [];
-            var changeDist = rulerArray[rulerArray.length - 1] - option.max;
+            var changeDist = rulerArray[rulerArray.length - 1] - (option === null || option === void 0 ? void 0 : option.max);
             for (var index = 0; index < rulerArray.length; index++) {
                 if (index + 1 < rulerArray.length && rulerArray[index + 1] - changeDist < minValue) ;
                 else {
@@ -91,7 +91,7 @@
         };
         var balanceMin = function () {
             var rulerArray_temp = [];
-            var changeDist = rulerArray[0] - option.min;
+            var changeDist = rulerArray[0] - (option === null || option === void 0 ? void 0 : option.min);
             for (var index = 0; index < rulerArray.length; index++) {
                 rulerArray_temp[index] = rulerArray[index] - changeDist;
                 if (maxValue <= rulerArray_temp[index])

package/lib/ruler/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
-var n,e;n=this,e=function(){"use strict";return function(n,e,r,t){if(n<e){var i=e;e=n,n=i}else if(n==e)return[n];var f=function(n){for(var e=n<100&&n>-100?10:.1,r=-1,t=n;10==e?t>=-100&&t<=100:t<=-100||t>=100;)r+=1,t*=e;if(10==e)return Math.pow(10,r);for(var i="0.",f=1;f<r;f++)i+="0";return+(i+"1")}(n-e),a=Math.ceil((n-e)*f/r),u=function(r){var t=({3:2,4:5,6:5,7:5,8:10,9:10,11:10,12:10,13:15,14:15,16:15,17:15,18:20,19:20,21:20,22:20,23:25,24:25,26:25,27:25}[a+r]||a+r)/f,i=Math.floor(e/t)*t,u=[];u.push(i);for(var o=1;u[u.length-1]<n;o++)u.push(i+t*o);return u},o=u(0),l=function(){for(var n=[],r=o[o.length-1]-t.max,i=0;i<o.length;i++)i+1<o.length&&o[i+1]-r<e||n.push(o[i]-r);return n},h=function(){for(var e=[],r=o[0]-t.min,i=0;i<o.length&&(e[i]=o[i]-r,!(n<=e[i]));i++);return e};if(t){if("max"in t&&"min"in t&&t.max>=n&&t.min<=e){var m=function(){if(o[0]>=t.min&&o[o.length-1]<=t.max)return!0;var n=l();if(n[0]>=t.min&&n[n.length-1]<=t.max)return o=n,!0;var e=h();return e[0]>=t.min&&e[n.length-1]<=t.max?(o=e,!0):void 0};if(m())return o;for(var s=1;s<100;s++){if(o=u(s),m())return o;if(o=u(-s),m())return o}}"max"in t&&t.max>=n?t.max<o[o.length-1]&&(o=l()):"min"in t&&t.min<=e&&t.min>o[0]&&(o=h())}for(var v=0;v<o.length;v++){var g=o[v]+"";/\./.test(g)&&(/9{7,}$/.test(g)?(g=g.replace(/9{7,}$/,""),o[v]=+(g.substring(0,g.length-1)+(+g[g.length-1]+1))):/0{7,}\d$/.test(g)&&(o[v]=+g.replace(/0{7,}\d$/,"")))}return o}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(n="undefined"!=typeof globalThis?globalThis:n||self).VISLite_ruler=e();
+var n,e;n=this,e=function(){"use strict";return function(n,e,r,t){if(n<e){var i=e;e=n,n=i}else if(n==e)return[n];var f=function(n){for(var e=n<100&&n>-100?10:.1,r=-1,t=n;10==e?t>=-100&&t<=100:t<=-100||t>=100;)r+=1,t*=e;if(10==e)return Math.pow(10,r);for(var i="0.",f=1;f<r;f++)i+="0";return+(i+"1")}(n-e),u=Math.ceil((n-e)*f/r),a=function(r){var t=({3:2,4:5,6:5,7:5,8:10,9:10,11:10,12:10,13:15,14:15,16:15,17:15,18:20,19:20,21:20,22:20,23:25,24:25,26:25,27:25}[u+r]||u+r)/f,i=Math.floor(e/t)*t,a=[];a.push(i);for(var o=1;a[a.length-1]<n;o++)a.push(i+t*o);return a},o=a(0),l=function(){for(var n=[],r=o[o.length-1]-(null==t?void 0:t.max),i=0;i<o.length;i++)i+1<o.length&&o[i+1]-r<e||n.push(o[i]-r);return n},h=function(){for(var e=[],r=o[0]-(null==t?void 0:t.min),i=0;i<o.length&&(e[i]=o[i]-r,!(n<=e[i]));i++);return e};if(t){if("max"in t&&"min"in t&&t.max>=n&&t.min<=e){var m=function(){if(o[0]>=t.min&&o[o.length-1]<=t.max)return!0;var n=l();if(n[0]>=t.min&&n[n.length-1]<=t.max)return o=n,!0;var e=h();return e[0]>=t.min&&e[n.length-1]<=t.max?(o=e,!0):void 0};if(m())return o;for(var v=1;v<100;v++){if(o=a(v),m())return o;if(o=a(-v),m())return o}}"max"in t&&t.max>=n?t.max<o[o.length-1]&&(o=l()):"min"in t&&t.min<=e&&t.min>o[0]&&(o=h())}for(var s=0;s<o.length;s++){var d=o[s]+"";/\./.test(d)&&(/9{7,}$/.test(d)?(d=d.replace(/9{7,}$/,""),o[s]=+(d.substring(0,d.length-1)+(+d[d.length-1]+1))):/0{7,}\d$/.test(d)&&(o[s]=+d.replace(/0{7,}\d$/,"")))}return o}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(n="undefined"!=typeof globalThis?globalThis:n||self).VISLite_ruler=e();

package/lib/scale/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

package/lib/scale/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 var e,t;e=this,t=function(){"use strict";return function(e,t,n,o,f){return[n*(o-e)+e,n*(f-t)+t]}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_scale=t();

package/lib/throttle/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

package/lib/throttle/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 var e,t;e=this,t=function(){"use strict";return function(e,t){void 0===t&&(t={}),t=function(e,t){for(var n in e)t[n]=e[n];return t}(t,{time:200,keep:!1,opportunity:"end"});var n,o=!1,i=!1,r=!1;return function(){var p=this;if(n=arguments,o)i=!0,r=!0;else{"end"!=t.opportunity&&e.apply(p,n),o=!0;var f=setInterval((function(){i?t.keep||e.apply(p,n):("begin"!=t.opportunity&&(r||"end"==t.opportunity)&&e.apply(p,n),o=!1,r=!1,clearInterval(f)),i=!1}),t.time)}}}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_throttle=t();

package/lib/viewHandler/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

package/lib/viewHandler/index.umd.min.js

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.6.0
+* VISLite JavaScript Library v0.7.0
 * git+https://github.com/oi-contrib/VISLite.git
 *
 * Copyright zxl20070701
 * Released under the MIT license
 * https://zxl20070701.github.io/notebook/home.html
 *
-* Publish Date:  Sun Dec 17 2023 17:10:48 GMT+0800 (中国标准时间)
+* Publish Date:  Sun Jan 14 2024 15:48:51 GMT+0800 (中国标准时间)
 */
 var e,n;e=this,n=function(){"use strict";var e=function(e,n){var t=e.getBoundingClientRect();return{x:n.clientX-t.left,y:n.clientY-t.top}};return function(n){var t=document.getElementsByTagName("body")[0];t.addEventListener("keydown",(function(e){var t=function(e){return{37:"left",38:"up",39:"right",40:"down"}[e.keyCode||e.which]}(e);"up"==t?n({type:"lookUp",normal:[],value:.1,event:e}):"down"==t?n({type:"lookDown",normal:[],value:.1,event:e}):"left"==t?n({type:"lookLeft",normal:[],value:.1,event:e}):"right"==t&&n({type:"lookRight",normal:[],value:.1,event:e})}));var o=null,i=function(i){if(null==o)n({type:"hover",normal:[],value:0,event:i});else{var u=e(t,i),l=[u.x-o.x,u.y-o.y],a=[l[1],l[0],0];if(0==a[0]&&0==a[1])return;n({type:"rotate",normal:a,value:.01*(Math.abs(u.x-o.x)+Math.abs(u.y-o.y)),event:i}),o=u}};t.addEventListener("mousedown",(function(n){o=e(t,n)})),t.addEventListener("mouseup",(function(){o=null})),t.addEventListener("mousemove",(function(e){i(e)})),t.addEventListener("touchend",(function(){o=null})),t.addEventListener("touchstart",(function(n){o=e(t,n)})),t.addEventListener("touchmove",(function(e){i(e.touches[0])}));var u=function(e,t){0!=e&&n({type:"scale",value:e<0?.899:1.101,normal:[],event:t})};t.addEventListener("mousewheel",(function(e){u(e.wheelDelta,e)})),window.addEventListener&&window.addEventListener("DOMMouseScroll",(function(e){u(-1*e.detail,e)}),!1)}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_viewHandler=n();

package/package/TreeLayout/index.ts

@@ -1,3 +1,3 @@
-import TreeLayout from "../../src/layout/TreeLayout"
-
+import TreeLayout from "../../src/layout/TreeLayout"
+
 export default TreeLayout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",

package/src/Canvas.ts

@@ -18,7 +18,7 @@ class Canvas extends OralCanvas implements CanvasType {
 
         const width = el.clientWidth, height = el.clientHeight
 
-        let ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement
+        let ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement | null = null
 
         const _el = el as any
 

package/src/Eoap.ts

@@ -1,66 +1,66 @@
-import type MapType from '../types/Map'
-
-// 围绕X轴旋转
-const rotateX = function (deg: number, x: number, y: number, z: number) {
-    const cos = Math.cos(deg), sin = Math.sin(deg)
-    return [x, y * cos - z * sin, y * sin + z * cos]
-}
-
-// 围绕Y轴旋转
-const rotateY = function (deg: number, x: number, y: number, z: number) {
-    const cos = Math.cos(deg), sin = Math.sin(deg)
-    return [z * sin + x * cos, y, z * cos - x * sin]
-}
-
-// 围绕Z轴旋转
-const rotateZ = function (deg: number, x: number, y: number, z: number) {
-    const cos = Math.cos(deg), sin = Math.sin(deg)
-    return [x * cos - y * sin, x * sin + y * cos, z]
-}
-
-/* 等角斜方位投影 */
-class Eoap implements MapType {
-    readonly name: string = 'Eoap'
-
-    private __scale: number // 缩放比例
-    private __center: number[] // 投影中心经纬度
-
-    constructor(scale: number = 7, center: number[] = [107, 36]) {
-        this.__scale = scale
-        this.__center = center
-    }
-
-    use(λ: number, φ: number): [number, number, number] {
-        /**
-         * 通过旋转的方法
-         * 先旋转出点的位置
-         * 然后根据把地心到旋转中心的这条射线变成OZ这条射线的变换应用到初始化点上
-         * 这样求的的点的x,y就是最终结果
-         *
-         *  计算过程：
-         *  1.初始化点的位置是p（x,0,0）,其中x的值是地球半径除以缩放倍速
-         *  2.根据点的纬度对p进行旋转，旋转后得到的p的坐标纬度就是目标纬度
-         *  3.同样的对此刻的p进行经度的旋转，这样就获取了极点作为中心点的坐标
-         *  4.接着想象一下为了让旋转中心移动到极点需要进行旋转的经纬度是多少，记为lo和la
-         *  5.然后再对p进行经度度旋转lo获得新的p
-         *  6.然后再对p进行纬度旋转la获得新的p
-         *  7.旋转结束
-         *
-         * 特别注意：第5和第6步顺序一定不可以调换，原因来自经纬度定义上
-         * 【除了经度为0的位置，不然纬度的旋转会改变原来的经度值，反过来不会】
-         *
-         */
-        let p = rotateY((360 - φ) / 180 * Math.PI, 100 * this.__scale, 0, 0)
-        p = rotateZ(λ / 180 * Math.PI, p[0], p[1], p[2])
-        p = rotateZ((90 - this.__center[0]) / 180 * Math.PI, p[0], p[1], p[2])
-        p = rotateX((90 - this.__center[1]) / 180 * Math.PI, p[0], p[1], p[2])
-
-        return [
-            -p[0], // 加-号是因为浏览器坐标和地图不一样
-            p[1],
-            p[2]
-        ]
-    }
-}
-
-export default Eoap
+import type MapType from '../types/Map'
+
+// 围绕X轴旋转
+const rotateX = function (deg: number, x: number, y: number, z: number) {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [x, y * cos - z * sin, y * sin + z * cos]
+}
+
+// 围绕Y轴旋转
+const rotateY = function (deg: number, x: number, y: number, z: number) {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [z * sin + x * cos, y, z * cos - x * sin]
+}
+
+// 围绕Z轴旋转
+const rotateZ = function (deg: number, x: number, y: number, z: number) {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [x * cos - y * sin, x * sin + y * cos, z]
+}
+
+/* 等角斜方位投影 */
+class Eoap implements MapType {
+    readonly name: string = 'Eoap'
+
+    private __scale: number // 缩放比例
+    private __center: number[] // 投影中心经纬度
+
+    constructor(scale: number = 7, center: number[] = [107, 36]) {
+        this.__scale = scale
+        this.__center = center
+    }
+
+    use(λ: number, φ: number): [number, number, number] {
+        /**
+         * 通过旋转的方法
+         * 先旋转出点的位置
+         * 然后根据把地心到旋转中心的这条射线变成OZ这条射线的变换应用到初始化点上
+         * 这样求的的点的x,y就是最终结果
+         *
+         *  计算过程：
+         *  1.初始化点的位置是p（x,0,0）,其中x的值是地球半径除以缩放倍速
+         *  2.根据点的纬度对p进行旋转，旋转后得到的p的坐标纬度就是目标纬度
+         *  3.同样的对此刻的p进行经度的旋转，这样就获取了极点作为中心点的坐标
+         *  4.接着想象一下为了让旋转中心移动到极点需要进行旋转的经纬度是多少，记为lo和la
+         *  5.然后再对p进行经度度旋转lo获得新的p
+         *  6.然后再对p进行纬度旋转la获得新的p
+         *  7.旋转结束
+         *
+         * 特别注意：第5和第6步顺序一定不可以调换，原因来自经纬度定义上
+         * 【除了经度为0的位置，不然纬度的旋转会改变原来的经度值，反过来不会】
+         *
+         */
+        let p = rotateY((360 - φ) / 180 * Math.PI, 100 * this.__scale, 0, 0)
+        p = rotateZ(λ / 180 * Math.PI, p[0], p[1], p[2])
+        p = rotateZ((90 - this.__center[0]) / 180 * Math.PI, p[0], p[1], p[2])
+        p = rotateX((90 - this.__center[1]) / 180 * Math.PI, p[0], p[1], p[2])
+
+        return [
+            -p[0], // 加-号是因为浏览器坐标和地图不一样
+            p[1],
+            p[2]
+        ]
+    }
+}
+
+export default Eoap

package/src/Geometry.ts

@@ -2,11 +2,14 @@ import type GeometryType from "../types/Geometry"
 import type GeometryOptionType from "../types/GeometryOption"
 import type GeometryResultType from "../types/GeometryResult"
 
+type rotateLineType = (x0: number, y0: number, z0: number, isNormal: boolean) => Array<number>
+
 import { splitNum } from './common/geometry/tool/circle'
 import prismHorizontal from './common/geometry/prism-horizontal'
 import prismVertical from './common/geometry/prism-vertical'
 import sphereFragment from './common/geometry/sphere-fragment'
 import mergeOption from './common/mergeOption'
+import rotateLineFactory from "./common/geometry/tool/rotateLine"
 
 class Geometry implements GeometryType {
     readonly name: string = 'Geometry'
@@ -28,32 +31,72 @@ class Geometry implements GeometryType {
     }
 
     // 圆柱体
-    cylinder(x: number, y: number, z: number, radius: number, height: number): Array<GeometryResultType> {
+    cylinder(x: number, y: number, z: number, radius: number, x2: number, y2?: number, z2?: number): Array<GeometryResultType> {
 
         // 求解出需要切割多少份比较合理
-        const num = splitNum(this.__option.precision, radius)
-        return this.prism(x, y, z, radius, height, num)
+        const num = splitNum(this.__option.precision as number, radius)
+
+        if (arguments.length == 5) {
+            return this.prism(x, y, z, radius, x2, num)
+        } else {
+            return this.prism(x, y, z, radius, x2, y2 as number, z2, num)
+        }
     }
 
     // 棱柱体
-    prism(x: number, y: number, z: number, radius: number, height: number, num: number): Array<GeometryResultType> {
+    prism(x: number, y: number, z: number, radius: number, x2: number, y2: number, z2?: number, num?: number): Array<GeometryResultType> {
+
+
+        let height: number, rotateLine: rotateLineType | null = null
+
+        if (arguments.length == 6) {
+            height = x2
+            num = y2
+        } else {
+            height = Math.sqrt((x2 - x) * (x2 - x) + (y2 - y) * (y2 - y) + (z2 as number - z) * (z2 as number - z))
+            rotateLine = rotateLineFactory(x, y, z, x2, y2, z2 as number)
+        }
 
         const result = [{
+            name: "bottom",
+            points: [],
+            length: 0,
+            method: "TRIANGLES" as const
+        }, {
+            name: "top",
+            points: [],
+            length: 0,
+            method: "TRIANGLES" as const
+        }, {
+            name: "side",
             points: [],
             length: 0,
             method: "TRIANGLES" as const
         }]
 
-        // 绘制底部的盖子
-        result[0].points.push(...prismHorizontal(this.__option.normal, x, y, z, radius, num, height > 0 ? -1 : 1))
+            // 绘制底部的盖子
+            ; (result[0].points as Array<number>).push(...prismHorizontal(this.__option.normal as boolean, x, y, z, radius, num as number, height > 0 ? -1 : 1))
+
+            // 绘制顶部的盖子
+            ; (result[1].points as Array<number>).push(...prismHorizontal(this.__option.normal as boolean, x, y + height, z, radius, num as number, height > 0 ? 1 : -1))
 
-        // 绘制顶部的盖子
-        result[0].points.push(...prismHorizontal(this.__option.normal, x, y + height, z, radius, num, height > 0 ? 1 : -1))
+            // 绘制侧边部分
+            ; (result[2].points as Array<number>).push(...prismVertical(this.__option.normal as boolean, x, y, z, radius, height, num as number))
 
-        // 绘制侧边部分
-        result[0].points.push(...prismVertical(this.__option.normal, x, y, z, radius, height, num))
+        for (let i = 0; i < result.length; i++) {
+            if (rotateLine) {
+
+                const points = []
+                let isNormal = false
+                for (let index = 0; index < result[i].points.length; index += 3) {
+                    points.push(...rotateLine(result[i].points[index], result[i].points[index + 1], result[i].points[index + 2], (this.__option.normal as boolean) && isNormal))
+                    isNormal = !isNormal
+                }
+                (result[i].points as Array<number>) = points
+            }
+            result[i].length = result[i].points.length / (this.__option.normal ? 6 : 3)
+        }
 
-        result[0].length = 12 * num
         return result
     }
 
@@ -61,16 +104,17 @@ class Geometry implements GeometryType {
     sphere(cx: number, cy: number, cz: number, radius: number): Array<GeometryResultType> {
 
         // 求解出需要切割多少份比较合理
-        const num = splitNum(this.__option.precision, radius)
+        const num = splitNum(this.__option.precision as number, radius)
 
         // 然后一瓣瓣的绘制
         const result = [{
+            name: "surface",
             points: [],
             length: 0,
             method: "TRIANGLES" as const
         }]
         for (let i = 0; i < num; i++) {
-            result[0].points.push(...sphereFragment(this.__option.normal, cx, cy, cz, radius, num, i))
+            ; (result[0].points as Array<number>).push(...sphereFragment(this.__option.normal as boolean, cx, cy, cz, radius, num, i))
         }
 
         result[0].length = result[0].points.length / (this.__option.normal ? 6 : 3)