vislite 0.2.0 → 0.3.0-alpha.0

package/lib/rotate/index.umd.js

@@ -1,12 +1,16 @@
 /*!
-* VISLite JavaScript Library v0.2.0
+* VISLite JavaScript Library v0.3.0-alpha.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: Sat Jun 03 2023 09:32:28 GMT+0800 (中国标准时间)
+* 本版本系测试版本，请认真阅读下述说明再使用：
+*
+*【测试版本细则】
+* alpha：内测版本，仅供开发人员提供测试环境而发布，后续的修改可能极具破坏性，非有明确了解前请勿直接用于项目中
+* beta：外测版本，正式发布前的确认测试，或者新功能紧急发布，一般可以直接用于实际项目，因为即使后续发现了问题，直接使用正式版即可，不会有破坏性
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

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

@@ -1,11 +1,15 @@
 /*!
-* VISLite JavaScript Library v0.2.0
+* VISLite JavaScript Library v0.3.0-alpha.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: Sat Jun 03 2023 09:32:28 GMT+0800 (中国标准时间)
+* 本版本系测试版本，请认真阅读下述说明再使用：
+*
+*【测试版本细则】
+* alpha：内测版本，仅供开发人员提供测试环境而发布，后续的修改可能极具破坏性，非有明确了解前请勿直接用于项目中
+* beta：外测版本，正式发布前的确认测试，或者新功能紧急发布，一般可以直接用于实际项目，因为即使后续发现了问题，直接使用正式版即可，不会有破坏性
 */
 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,16 @@
 /*!
-* VISLite JavaScript Library v0.2.0
+* VISLite JavaScript Library v0.3.0-alpha.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: Sat Jun 03 2023 09:32:28 GMT+0800 (中国标准时间)
+* 本版本系测试版本，请认真阅读下述说明再使用：
+*
+*【测试版本细则】
+* alpha：内测版本，仅供开发人员提供测试环境而发布，后续的修改可能极具破坏性，非有明确了解前请勿直接用于项目中
+* beta：外测版本，正式发布前的确认测试，或者新功能紧急发布，一般可以直接用于实际项目，因为即使后续发现了问题，直接使用正式版即可，不会有破坏性
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

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

@@ -1,11 +1,15 @@
 /*!
-* VISLite JavaScript Library v0.2.0
+* VISLite JavaScript Library v0.3.0-alpha.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: Sat Jun 03 2023 09:32:28 GMT+0800 (中国标准时间)
+* 本版本系测试版本，请认真阅读下述说明再使用：
+*
+*【测试版本细则】
+* alpha：内测版本，仅供开发人员提供测试环境而发布，后续的修改可能极具破坏性，非有明确了解前请勿直接用于项目中
+* beta：外测版本，正式发布前的确认测试，或者新功能紧急发布，一般可以直接用于实际项目，因为即使后续发现了问题，直接使用正式版即可，不会有破坏性
 */
 var e,r;e=this,r=function(){"use strict";return function(e,r,t){if(e<r){var f=r;r=e,e=f}else if(e==r)return[e];var n=function(e){for(var r=e<100&&e>-100?10:.1,t=-1,f=e;10==r?f>=-100&&f<=100:f<=-100||f>=100;)t+=1,f*=r;if(10==r)return Math.pow(10,t);for(var n="0.",o=1;o<t;o++)n+="0";return+(n+"1")}(e-r),o=Math.ceil((e-r)*n/t),i=(o={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}[o]||o)/n,u=Math.floor(r/i)*i,a=[];a.push(u);for(var l=1;a[a.length-1]<e;l++)a.push(u+i*l);return a}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define(r):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_ruler=r();

package/lib/viewHandler/index.umd.js

@@ -1,12 +1,16 @@
 /*!
-* VISLite JavaScript Library v0.2.0
+* VISLite JavaScript Library v0.3.0-alpha.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: Sat Jun 03 2023 09:32:28 GMT+0800 (中国标准时间)
+* 本版本系测试版本，请认真阅读下述说明再使用：
+*
+*【测试版本细则】
+* alpha：内测版本，仅供开发人员提供测试环境而发布，后续的修改可能极具破坏性，非有明确了解前请勿直接用于项目中
+* beta：外测版本，正式发布前的确认测试，或者新功能紧急发布，一般可以直接用于实际项目，因为即使后续发现了问题，直接使用正式版即可，不会有破坏性
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :

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

@@ -1,11 +1,15 @@
 /*!
-* VISLite JavaScript Library v0.2.0
+* VISLite JavaScript Library v0.3.0-alpha.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: Sat Jun 03 2023 09:32:28 GMT+0800 (中国标准时间)
+* 本版本系测试版本，请认真阅读下述说明再使用：
+*
+*【测试版本细则】
+* alpha：内测版本，仅供开发人员提供测试环境而发布，后续的修改可能极具破坏性，非有明确了解前请勿直接用于项目中
+* beta：外测版本，正式发布前的确认测试，或者新功能紧急发布，一般可以直接用于实际项目，因为即使后续发现了问题，直接使用正式版即可，不会有破坏性
 */
 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}):"down"==t?n({type:"lookDown",normal:[],value:.1}):"left"==t?n({type:"lookLeft",normal:[],value:.1}):"right"==t&&n({type:"lookRight",normal:[],value:.1})}));var o=null,i=function(i){if(null!=o){var u=e(t,i),l=[u.x-o.x,u.y-o.y],a=[l[1],l[0],0];0==a[0]&&0==a[1]||(n({type:"rotate",normal:a,value:.01*(Math.abs(u.x-o.x)+Math.abs(u.y-o.y))}),o=u)}};t.addEventListener("mousedown",(function(n){o=e(t,n)})),t.addEventListener("mouseup",(function(e){o=null})),t.addEventListener("mousemove",(function(e){i(e)})),t.addEventListener("touchend",(function(e){o=null})),t.addEventListener("touchstart",(function(n){o=e(t,n)})),t.addEventListener("touchmove",(function(e){i(e.touches[0])}));var u=function(e){0!=e&&n({type:"scale",value:e<0?.899:1.101,normal:[]})};t.addEventListener("mousewheel",(function(e){u(e.wheelDelta)})),window.addEventListener&&window.addEventListener("DOMMouseScroll",(function(e){u(-1*e.detail)}),!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/miniprogram/ui-canvas/index.json

@@ -1,4 +1,4 @@
-{
-    "usingComponents": {},
-    "component": true
-  }
+{
+    "usingComponents": {},
+    "component": true
+  }

package/miniprogram/ui-canvas/index.wxml

@@ -1,4 +1,4 @@
-<view>
-    <canvas type="2d" id="painter" style='width:{{width}}px;height:{{height}}px;' bindtouchstart="doitstart"></canvas>
-    <canvas type="2d" id="region" style='width:{{width}}px;height:{{height}}px;' class="region"></canvas>
-</view>
+<view>
+    <canvas type="2d" id="painter" style='width:{{width}}px;height:{{height}}px;' bindtouchstart="doitstart"></canvas>
+    <canvas type="2d" id="region" style='width:{{width}}px;height:{{height}}px;' class="region"></canvas>
+</view>

package/miniprogram/ui-canvas/index.wxss

@@ -1,5 +1,5 @@
-/* 辅助的区域不应该可以看见 */
-.region {
-  position: fixed;
-  left: 50000px;
-}
+/* 辅助的区域不应该可以看见 */
+.region {
+  position: fixed;
+  left: 50000px;
+}

package/package/Canvas/index.ts

@@ -1,2 +1,2 @@
-import Canvas from "../../src/Canvas"
+import Canvas from "../../src/Canvas"
 export default Canvas

package/package/Cardinal/index.ts

@@ -1,3 +1,3 @@
-import Cardinal from "../../src/interpolation/Cardinal"
-
+import Cardinal from "../../src/interpolation/Cardinal"
+
 export default Cardinal

package/package/Eoap/index.ts

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

package/package/Hermite/index.ts

@@ -1,3 +1,3 @@
-import Hermite from "../../src/interpolation/Hermite"
-
+import Hermite from "../../src/interpolation/Hermite"
+
 export default Hermite

package/package/Matrix4/index.ts

@@ -1,3 +1,3 @@
-import Matrix4 from "../../src/Matrix4/index"
-
+import Matrix4 from "../../src/Matrix4/index"
+
 export default Matrix4

package/package/OralCanvas/index.ts

@@ -1,2 +1,2 @@
-import _Canvas from "../../src/common/canvas/index"
+import _Canvas from "../../src/common/canvas/index"
 export default _Canvas

package/package/OralWebGL/index.ts

@@ -1,2 +1,2 @@
-import _WebGL from "../../src/common/webgl/index"
+import _WebGL from "../../src/common/webgl/index"
 export default _WebGL

package/package/SVG/index.ts

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

package/package/animation/index.ts

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

package/package/getLoopColors/index.ts

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

package/package/rotate/index.ts

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

package/package/ruler/index.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "0.2.0",
+  "version": "0.3.0-alpha.0",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",
@@ -8,7 +8,7 @@
   "sideEffects": false,
   "scripts": {
     "dev": "webpack serve --config ./build/webpack.config.js",
-    "build": "devby -d ./lib && node ./build/pkg.js",
+    "build": "devby --delete ./lib && node ./build/pkg.js",
     "server": "devby -s 30000",
     "test": "karma start ./build/karma.config.js"
   },
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@rollup/plugin-typescript": "^11.1.0",
     "@types/jasmine": "^4.3.1",
-    "devby": "^0.3.0",
+    "devby": "^0.3.1",
     "karma": "^6.3.10",
     "karma-chrome-launcher": "^3.1.0",
     "karma-jasmine": "^4.0.1",
@@ -55,4 +55,4 @@
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.7.4"
   }
-}
+}

package/src/Matrix4/index.ts

@@ -1,77 +1,77 @@
-import Matrix4Type from '../../types/Matrix4'
-
-// 两个4x4矩阵相乘
-// 或矩阵和齐次坐标相乘
-let _multiply = function (matrix4: number[], param: number[]) {
-    let newParam: number[] = []
-    for (let i = 0; i < 4; i++)
-        for (let j = 0; j < param.length / 4; j++)
-            newParam[j * 4 + i] =
-                matrix4[i] * param[j * 4] +
-                matrix4[i + 4] * param[j * 4 + 1] +
-                matrix4[i + 8] * param[j * 4 + 2] +
-                matrix4[i + 12] * param[j * 4 + 3]
-    return newParam
-}
-
-import _move from './move'
-import _rotate from './rotate'
-import _scale from './scale'
-import _transform from './transform'
-
-// 列主序存储的4x4矩阵
-
-class Matrix4 implements Matrix4Type {
-    readonly name: string = 'Matrix4'
-
-    private __matrix4: number[]
-
-    constructor(initMatrix4: number[] = [
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        0, 0, 0, 1
-    ]) {
-        this.__matrix4 = initMatrix4
-    }
-
-    // 移动
-    move(dis: number, a: number, b: number, c: number = 0) {
-        this.__matrix4 = _multiply(_move(dis, a, b, c), this.__matrix4)
-        return this
-    }
-
-    // 旋转
-    rotate(deg: number, a1: number, b1: number, c1?: number, a2?: number, b2?: number, c2?: number) {
-        let matrix4s = _transform(a1, b1, c1, a2, b2, c2)
-        this.__matrix4 = _multiply(_multiply(_multiply(matrix4s[1], _rotate(deg)), matrix4s[0]), this.__matrix4)
-        return this
-    }
-
-    // 缩放
-    scale(xTimes: number, yTimes: number, zTimes: number, cx: number = 0, cy: number = 0, cz: number = 0) {
-        this.__matrix4 = _multiply(_scale(xTimes, yTimes, zTimes, cx, cy, cz), this.__matrix4)
-        return this
-    }
-
-    // 乘法
-    // 可以传入一个矩阵(matrix4,flag)
-    multiply(newMatrix4: number[], flag: boolean = false) {
-        this.__matrix4 = flag ? _multiply(this.__matrix4, newMatrix4) : _multiply(newMatrix4, this.__matrix4)
-        return this
-    }
-
-    // 对一个坐标应用变换
-    // 齐次坐标(x,y,z,w)
-    use(x: number, y: number, z: number = 0, w: number = 1) {
-        // w为0表示点位于无穷远处，忽略
-        return _multiply(this.__matrix4, [x, y, z, w])
-    }
-
-    // 矩阵的值
-    value() {
-        return this.__matrix4
-    }
-}
-
+import Matrix4Type from '../../types/Matrix4'
+
+// 两个4x4矩阵相乘
+// 或矩阵和齐次坐标相乘
+let _multiply = function (matrix4: number[], param: number[]) {
+    let newParam: number[] = []
+    for (let i = 0; i < 4; i++)
+        for (let j = 0; j < param.length / 4; j++)
+            newParam[j * 4 + i] =
+                matrix4[i] * param[j * 4] +
+                matrix4[i + 4] * param[j * 4 + 1] +
+                matrix4[i + 8] * param[j * 4 + 2] +
+                matrix4[i + 12] * param[j * 4 + 3]
+    return newParam
+}
+
+import _move from './move'
+import _rotate from './rotate'
+import _scale from './scale'
+import _transform from './transform'
+
+// 列主序存储的4x4矩阵
+
+class Matrix4 implements Matrix4Type {
+    readonly name: string = 'Matrix4'
+
+    private __matrix4: number[]
+
+    constructor(initMatrix4: number[] = [
+        1, 0, 0, 0,
+        0, 1, 0, 0,
+        0, 0, 1, 0,
+        0, 0, 0, 1
+    ]) {
+        this.__matrix4 = initMatrix4
+    }
+
+    // 移动
+    move(dis: number, a: number, b: number, c: number = 0) {
+        this.__matrix4 = _multiply(_move(dis, a, b, c), this.__matrix4)
+        return this
+    }
+
+    // 旋转
+    rotate(deg: number, a1: number, b1: number, c1?: number, a2?: number, b2?: number, c2?: number) {
+        let matrix4s = _transform(a1, b1, c1, a2, b2, c2)
+        this.__matrix4 = _multiply(_multiply(_multiply(matrix4s[1], _rotate(deg)), matrix4s[0]), this.__matrix4)
+        return this
+    }
+
+    // 缩放
+    scale(xTimes: number, yTimes: number, zTimes: number, cx: number = 0, cy: number = 0, cz: number = 0) {
+        this.__matrix4 = _multiply(_scale(xTimes, yTimes, zTimes, cx, cy, cz), this.__matrix4)
+        return this
+    }
+
+    // 乘法
+    // 可以传入一个矩阵(matrix4,flag)
+    multiply(newMatrix4: number[], flag: boolean = false) {
+        this.__matrix4 = flag ? _multiply(this.__matrix4, newMatrix4) : _multiply(newMatrix4, this.__matrix4)
+        return this
+    }
+
+    // 对一个坐标应用变换
+    // 齐次坐标(x,y,z,w)
+    use(x: number, y: number, z: number = 0, w: number = 1) {
+        // w为0表示点位于无穷远处，忽略
+        return _multiply(this.__matrix4, [x, y, z, w])
+    }
+
+    // 矩阵的值
+    value() {
+        return this.__matrix4
+    }
+}
+
 export default Matrix4

package/src/Matrix4/move.ts

@@ -1,12 +1,12 @@
-/**
- * 在(a,b,c)方向位移d
- */
-export default function (d: number, a: number, b: number, c: number = 0) {
-    let sqrt = Math.sqrt(a * a + b * b + c * c)
-    return [
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        a * d / sqrt, b * d / sqrt, c * d / sqrt, 1
-    ]
-}
+/**
+ * 在(a,b,c)方向位移d
+ */
+export default function (d: number, a: number, b: number, c: number = 0) {
+    let sqrt = Math.sqrt(a * a + b * b + c * c)
+    return [
+        1, 0, 0, 0,
+        0, 1, 0, 0,
+        0, 0, 1, 0,
+        a * d / sqrt, b * d / sqrt, c * d / sqrt, 1
+    ]
+}

package/src/Matrix4/rotate.ts

@@ -1,15 +1,15 @@
-/**
- * 围绕0Z轴旋转
- * 其它的旋转可以借助transform实现
- * 旋转角度单位采用弧度制
- */
-export default function (deg: number) {
-    let sin = Math.sin(deg),
-        cos = Math.cos(deg)
-    return [
-        cos, sin, 0, 0,
-        -sin, cos, 0, 0,
-        0, 0, 1, 0,
-        0, 0, 0, 1
-    ]
-}
+/**
+ * 围绕0Z轴旋转
+ * 其它的旋转可以借助transform实现
+ * 旋转角度单位采用弧度制
+ */
+export default function (deg: number) {
+    let sin = Math.sin(deg),
+        cos = Math.cos(deg)
+    return [
+        cos, sin, 0, 0,
+        -sin, cos, 0, 0,
+        0, 0, 1, 0,
+        0, 0, 0, 1
+    ]
+}

package/src/Matrix4/scale.ts

@@ -1,11 +1,11 @@
-/**
- * 围绕圆心x、y和z分别缩放xTimes, yTimes和zTimes倍
- */
-export default function (xTimes: number, yTimes: number, zTimes: number, cx: number = 0, cy: number = 0, cz: number = 0) {
-    return [
-        xTimes, 0, 0, 0,
-        0, yTimes, 0, 0,
-        0, 0, zTimes, 0,
-        cx - cx * xTimes, cy - cy * yTimes, cz - cz * zTimes, 1
-    ]
-}
+/**
+ * 围绕圆心x、y和z分别缩放xTimes, yTimes和zTimes倍
+ */
+export default function (xTimes: number, yTimes: number, zTimes: number, cx: number = 0, cy: number = 0, cz: number = 0) {
+    return [
+        xTimes, 0, 0, 0,
+        0, yTimes, 0, 0,
+        0, 0, zTimes, 0,
+        cx - cx * xTimes, cy - cy * yTimes, cz - cz * zTimes, 1
+    ]
+}

package/src/Matrix4/transform.ts

@@ -1,64 +1,64 @@
-/**
- * 针对任意射线(a1,b1,c1)->(a2,b2,c2)
- * 计算出两个变换矩阵
- * 分别为：任意射线变成OZ轴变换矩阵 + OZ轴变回原来的射线的变换矩阵
- */
-export default function (a1: number, b1: number, c1: number, a2: number, b2: number, c2: number) {
-
-    if (typeof a1 === 'number' && typeof b1 === 'number') {
-
-        // 如果设置两个点
-        // 表示二维上围绕某个点旋转
-        if (typeof c1 !== 'number') {
-            c1 = 0
-            a2 = a1
-            b2 = b1
-            c2 = 1
-        }
-        // 只设置三个点(设置不足六个点都认为只设置了三个点)
-        // 表示围绕从原点出发的射线旋转
-        else if (typeof a2 !== 'number' || typeof b2 !== 'number' || typeof c2 !== 'number') {
-            a2 = a1
-            b2 = b1
-            c2 = c1
-            a1 = 0
-            b1 = 0
-            c1 = 0
-        }
-
-        if (a1 == a2 && b1 == b2 && c1 == c2) throw new Error('It\'s not a legitimate ray!')
-
-        let sqrt1 = Math.sqrt((a2 - a1) * (a2 - a1) + (b2 - b1) * (b2 - b1)),
-            cos1 = sqrt1 != 0 ? (b2 - b1) / sqrt1 : 1,
-            sin1 = sqrt1 != 0 ? (a2 - a1) / sqrt1 : 0,
-
-            b = (a2 - a1) * sin1 + (b2 - b1) * cos1,
-            c = c2 - c1,
-
-            sqrt2 = Math.sqrt(b * b + c * c),
-            cos2 = sqrt2 != 0 ? c / sqrt2 : 1,
-            sin2 = sqrt2 != 0 ? b / sqrt2 : 0
-
-        return [
-
-            // 任意射线变成OZ轴变换矩阵
-            [
-                cos1, cos2 * sin1, sin1 * sin2, 0,
-                -sin1, cos1 * cos2, cos1 * sin2, 0,
-                0, -sin2, cos2, 0,
-                b1 * sin1 - a1 * cos1, c1 * sin2 - a1 * sin1 * cos2 - b1 * cos1 * cos2, -a1 * sin1 * sin2 - b1 * cos1 * sin2 - c1 * cos2, 1
-            ],
-
-            // OZ轴变回原来的射线的变换矩阵
-            [
-                cos1, -sin1, 0, 0,
-                cos2 * sin1, cos2 * cos1, -sin2, 0,
-                sin1 * sin2, cos1 * sin2, cos2, 0,
-                a1, b1, c1, 1
-            ]
-
-        ]
-    } else {
-        throw new Error('a1 and b1 is required!')
-    }
-}
+/**
+ * 针对任意射线(a1,b1,c1)->(a2,b2,c2)
+ * 计算出两个变换矩阵
+ * 分别为：任意射线变成OZ轴变换矩阵 + OZ轴变回原来的射线的变换矩阵
+ */
+export default function (a1: number, b1: number, c1: number, a2: number, b2: number, c2: number) {
+
+    if (typeof a1 === 'number' && typeof b1 === 'number') {
+
+        // 如果设置两个点
+        // 表示二维上围绕某个点旋转
+        if (typeof c1 !== 'number') {
+            c1 = 0
+            a2 = a1
+            b2 = b1
+            c2 = 1
+        }
+        // 只设置三个点(设置不足六个点都认为只设置了三个点)
+        // 表示围绕从原点出发的射线旋转
+        else if (typeof a2 !== 'number' || typeof b2 !== 'number' || typeof c2 !== 'number') {
+            a2 = a1
+            b2 = b1
+            c2 = c1
+            a1 = 0
+            b1 = 0
+            c1 = 0
+        }
+
+        if (a1 == a2 && b1 == b2 && c1 == c2) throw new Error('It\'s not a legitimate ray!')
+
+        let sqrt1 = Math.sqrt((a2 - a1) * (a2 - a1) + (b2 - b1) * (b2 - b1)),
+            cos1 = sqrt1 != 0 ? (b2 - b1) / sqrt1 : 1,
+            sin1 = sqrt1 != 0 ? (a2 - a1) / sqrt1 : 0,
+
+            b = (a2 - a1) * sin1 + (b2 - b1) * cos1,
+            c = c2 - c1,
+
+            sqrt2 = Math.sqrt(b * b + c * c),
+            cos2 = sqrt2 != 0 ? c / sqrt2 : 1,
+            sin2 = sqrt2 != 0 ? b / sqrt2 : 0
+
+        return [
+
+            // 任意射线变成OZ轴变换矩阵
+            [
+                cos1, cos2 * sin1, sin1 * sin2, 0,
+                -sin1, cos1 * cos2, cos1 * sin2, 0,
+                0, -sin2, cos2, 0,
+                b1 * sin1 - a1 * cos1, c1 * sin2 - a1 * sin1 * cos2 - b1 * cos1 * cos2, -a1 * sin1 * sin2 - b1 * cos1 * sin2 - c1 * cos2, 1
+            ],
+
+            // OZ轴变回原来的射线的变换矩阵
+            [
+                cos1, -sin1, 0, 0,
+                cos2 * sin1, cos2 * cos1, -sin2, 0,
+                sin1 * sin2, cos1 * sin2, cos2, 0,
+                a1, b1, c1, 1
+            ]
+
+        ]
+    } else {
+        throw new Error('a1 and b1 is required!')
+    }
+}