vislite 0.4.0 → 0.4.1-alpha.0

package/lib/viewHandler/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.4.0
+* VISLite JavaScript Library v0.4.1-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 Jul 22 2023 04:42:29 GMT+0800 (中国标准时间)
+* Publish Date:  Mon Jul 31 2023 22:52:35 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -37,50 +37,63 @@
                 callback({
                     type: "lookUp",
                     normal: [],
-                    value: 0.1
+                    value: 0.1,
+                    event: event
                 });
             }
             else if (keyCode == 'down') {
                 callback({
                     type: "lookDown",
                     normal: [],
-                    value: 0.1
+                    value: 0.1,
+                    event: event
                 });
             }
             else if (keyCode == 'left') {
                 callback({
                     type: "lookLeft",
                     normal: [],
-                    value: 0.1
+                    value: 0.1,
+                    event: event
                 });
             }
             else if (keyCode == 'right') {
                 callback({
                     type: "lookRight",
                     normal: [],
-                    value: 0.1
+                    value: 0.1,
+                    event: event
                 });
             }
         });
         var mouseP = null;
         var doMove = function (event) {
-            if (mouseP == null)
-                return;
-            var tempMouseP = mousePosition(el, event);
-            var normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y];
-            var rotateNormal = [
-                normal[1],
-                normal[0],
-                0
-            ];
-            if (rotateNormal[0] == 0 && rotateNormal[1] == 0)
-                return;
-            callback({
-                type: "rotate",
-                normal: rotateNormal,
-                value: (Math.abs(tempMouseP.x - mouseP.x) + Math.abs(tempMouseP.y - mouseP.y)) * 0.01
-            });
-            mouseP = tempMouseP;
+            if (mouseP == null) {
+                callback({
+                    type: "hover",
+                    normal: [],
+                    value: 0,
+                    event: event
+                });
+            }
+            else {
+                var tempMouseP = mousePosition(el, event);
+                var normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y];
+                var rotateNormal = [
+                    normal[1],
+                    normal[0],
+                    0
+                ];
+                if (rotateNormal[0] == 0 && rotateNormal[1] == 0)
+                    return;
+                callback({
+                    type: "rotate",
+                    normal: rotateNormal,
+                    value: (Math.abs(tempMouseP.x - mouseP.x) + Math.abs(tempMouseP.y - mouseP.y)) * 0.01,
+                    event: event
+                });
+                mouseP = tempMouseP;
+            }
         };
         el.addEventListener("mousedown", function (event) {
             mouseP = mousePosition(el, event);
@@ -100,22 +113,23 @@
         el.addEventListener("touchmove", function (event) {
             doMove(event.touches[0]);
         });
-        var doScale = function (value) {
+        var doScale = function (value, event) {
             if (value == 0)
                 return;
             var baseTimes = 0.899;
             callback({
                 type: "scale",
                 value: value < 0 ? baseTimes : 2 - baseTimes,
-                normal: []
+                normal: [],
+                event: event
             });
         };
         el.addEventListener("mousewheel", function (event) {
-            doScale(event.wheelDelta);
+            doScale(event.wheelDelta, event);
         });
         if (window.addEventListener) {
             window.addEventListener('DOMMouseScroll', function (event) {
-                doScale(-1 * event.detail);
+                doScale(-1 * event.detail, event);
             }, false);
         }
     }

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

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.4.0
+* VISLite JavaScript Library v0.4.1-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 Jul 22 2023 04:42:29 GMT+0800 (中国标准时间)
+* Publish Date:  Mon Jul 31 2023 22:52:35 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}):"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();
+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(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,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.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "0.4.0",
+  "version": "0.4.1-alpha.0",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@rollup/plugin-typescript": "^11.1.0",
     "@types/jasmine": "^4.3.1",
-    "devby": "^0.3.1",
+    "devby": "^0.4.6",
     "karma": "^6.3.10",
     "karma-chrome-launcher": "^3.1.0",
     "karma-jasmine": "^4.0.1",

package/src/WebGL.ts

@@ -27,6 +27,7 @@ class WebGL extends OralWebGL implements WebGLType {
 
             RegionCanvas.style.position = 'absolute'
             RegionCanvas.style.zIndex = "-1"
+            RegionCanvas.style.opacity = "0"
 
             ViewCanvas = document.createElement('canvas')
             el.appendChild(ViewCanvas)

package/src/common/webgl/index.ts

@@ -2,7 +2,7 @@ import getWebGLContext from './getWebGLContext'
 import Object3DType from '../../../types/Object3D'
 import Scene3DType from '../../../types/Scene3D'
 import getColorFactory from './getColorFactory'
-import Matrix4 from '..//../Matrix4/index'
+import Matrix4 from '../../Matrix4/index'
 import doDraw from './doDraw'
 import assemble from '../assemble'
 

package/src/viewHandler.ts

@@ -30,7 +30,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookUp",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -39,7 +40,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookDown",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -48,7 +50,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookLeft",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -57,7 +60,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookRight",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -66,30 +70,44 @@ export default function (callback: callbackFun) {
     // 鼠标控制
     let mouseP = null;
     let doMove = function (event) {
-        if (mouseP == null) return
 
-        let tempMouseP = mousePosition(el, event)
+        // 单纯移动
+        if (mouseP == null) {
+            callback({
+                type: "hover",
+                normal: [],
+                value: 0,
+                event
+            })
+        }
 
-        // 先求解出轨迹向量
-        let normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y]
+        // 按下移动
+        else {
 
-        // 方向向量旋转90deg得到旋转向量
-        let rotateNormal = [
-            normal[1],
-            normal[0],
-            0
-        ]
+            let tempMouseP = mousePosition(el, event)
 
-        // 非法射线忽略
-        if (rotateNormal[0] == 0 && rotateNormal[1] == 0) return
+            // 先求解出轨迹向量
+            let normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y]
 
-        callback({
-            type: "rotate",
-            normal: rotateNormal,
-            value: (Math.abs(tempMouseP.x - mouseP.x) + Math.abs(tempMouseP.y - mouseP.y)) * 0.01
-        })
+            // 方向向量旋转90deg得到旋转向量
+            let rotateNormal = [
+                normal[1],
+                normal[0],
+                0
+            ]
 
-        mouseP = tempMouseP
+            // 非法射线忽略
+            if (rotateNormal[0] == 0 && rotateNormal[1] == 0) return
+
+            callback({
+                type: "rotate",
+                normal: rotateNormal,
+                value: (Math.abs(tempMouseP.x - mouseP.x) + Math.abs(tempMouseP.y - mouseP.y)) * 0.01,
+                event
+            })
+
+            mouseP = tempMouseP
+        }
     }
 
     el.addEventListener("mousedown", (event) => {
@@ -113,27 +131,28 @@ export default function (callback: callbackFun) {
         doMove(event.touches[0])
     })
 
-    let doScale = function (value: number) {
+    let doScale = function (value: number, event: Event) {
         if (value == 0) return
 
         let baseTimes = 0.899
         callback({
             type: "scale",
             value: value < 0 ? baseTimes : 2 - baseTimes,
-            normal: []
+            normal: [],
+            event
         })
     }
 
     // 滚轮控制
     el.addEventListener("mousewheel", function (event: any) {
-        doScale(event.wheelDelta)
+        doScale(event.wheelDelta, event)
     })
 
     if (window.addEventListener) {
 
         // 针对火狐浏览器
         window.addEventListener('DOMMouseScroll', function (event: any) {
-            doScale(-1 * event.detail)
+            doScale(-1 * event.detail, event)
         }, false)
     }
 

package/types/viewHandler.d.ts

@@ -1,7 +1,8 @@
 export interface paramsType {
     type: string
     value: number,
-    normal: number[]
+    normal: number[],
+    event: Event
 }
 
 export interface callbackFun {