vislite 0.5.2 → 0.6.0-alpha.2

package/src/shader/vsImage.c

@@ -1,14 +1,14 @@
-attribute vec4 a_position;
-uniform mat4 u_matrix;
-attribute vec2 a_textcoord;
-varying vec2 v_textcoord;
-
-void main()
-{
-    vec4 temp = u_matrix * a_position;
-    temp.z = -1.0 * temp.z;
-    float dist = 4.0;
-    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
-
-    v_textcoord = a_textcoord;
+attribute vec4 a_position;
+uniform mat4 u_matrix;
+attribute vec2 a_textcoord;
+varying vec2 v_textcoord;
+
+void main()
+{
+    vec4 temp = u_matrix * a_position;
+    temp.z = -1.0 * temp.z;
+    float dist = 4.0;
+    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
+
+    v_textcoord = a_textcoord;
 }

package/src/throttle.ts

@@ -1,52 +1,53 @@
-import type throttleOptionType from '../types/throttleOption'
-
-import mergeOption from './common/mergeOption'
-
-export default function (callback: Function, option: throttleOptionType = {}) {
-
-    // 校对缺省值
-    option = mergeOption(option, <throttleOptionType>{
-        time: 200,
-        keep: false,
-        opportunity: "end"
-    })
-
-    let hadInterval = false
-    let hadClick = false
-    let oneClick = false
-
-    let arg: any
-    return function () {
-        let _this = this
-        arg = arguments
-
-        // 如果前置任务都完成了
-        if (!hadInterval) {
-            if (option.opportunity != 'end') {
-                callback.apply(_this, arg)
-            }
-            hadInterval = true
-
-            let interval = setInterval(() => {
-                if (hadClick) {
-                    if (!option.keep) {
-                        callback.apply(_this, arg)
-                    }
-                } else {
-                    if (option.opportunity != 'begin') {
-                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg)
-                    }
-                    hadInterval = false
-                    oneClick = false
-                    clearInterval(interval)
-                }
-                hadClick = false
-            }, option.time)
-        } else {
-            hadClick = true
-            oneClick = true
-        }
-
-    }
-
+import type throttleOptionType from '../types/throttleOption'
+
+import mergeOption from './common/mergeOption'
+
+export default function (callback: Function, option: throttleOptionType = {}) {
+
+    // 校对缺省值
+    option = mergeOption(option, <throttleOptionType>{
+        time: 200,
+        keep: false,
+        opportunity: "end"
+    })
+
+    let hadInterval = false
+    let hadClick = false
+    let oneClick = false
+
+    let arg: any
+    return function () {
+        const _this = this
+        // eslint-disable-next-line prefer-rest-params
+        arg = arguments
+
+        // 如果前置任务都完成了
+        if (!hadInterval) {
+            if (option.opportunity != 'end') {
+                callback.apply(_this, arg)
+            }
+            hadInterval = true
+
+            const interval = setInterval(() => {
+                if (hadClick) {
+                    if (!option.keep) {
+                        callback.apply(_this, arg)
+                    }
+                } else {
+                    if (option.opportunity != 'begin') {
+                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg)
+                    }
+                    hadInterval = false
+                    oneClick = false
+                    clearInterval(interval)
+                }
+                hadClick = false
+            }, option.time)
+        } else {
+            hadClick = true
+            oneClick = true
+        }
+
+    }
+
 }

package/src/viewHandler.ts

@@ -1,159 +1,159 @@
-import type { callbackFun } from '../types/viewHandler'
-
-let mousePosition = (el: HTMLElement, event: any) => {
-    let bounding = el.getBoundingClientRect()
-    return {
-        "x": event.clientX - bounding.left,
-        "y": event.clientY - bounding.top
-    }
-}
-
-let getKeyString = (event: any) => {
-    return {
-        37: "left",
-        38: "up",
-        39: "right",
-        40: "down",
-    }[event.keyCode || event.which]
-}
-
-export default function (callback: callbackFun) {
-
-    let el = document.getElementsByTagName('body')[0]
-
-    // 键盘控制
-    el.addEventListener("keydown", function (event) {
-        let keyCode = getKeyString(event)
-
-        // 视角向上
-        if (keyCode == 'up') {
-            callback({
-                type: "lookUp",
-                normal: [],
-                value: 0.1,
-                event
-            })
-        }
-
-        // 视角向下
-        else if (keyCode == 'down') {
-            callback({
-                type: "lookDown",
-                normal: [],
-                value: 0.1,
-                event
-            })
-        }
-
-        // 视角向左
-        else if (keyCode == 'left') {
-            callback({
-                type: "lookLeft",
-                normal: [],
-                value: 0.1,
-                event
-            })
-        }
-
-        // 视角向右
-        else if (keyCode == 'right') {
-            callback({
-                type: "lookRight",
-                normal: [],
-                value: 0.1,
-                event
-            })
-        }
-
-    })
-
-    // 鼠标控制
-    let mouseP = null;
-    let doMove = function (event) {
-
-        // 单纯移动
-        if (mouseP == null) {
-            callback({
-                type: "hover",
-                normal: [],
-                value: 0,
-                event
-            })
-        }
-
-        // 按下移动
-        else {
-
-            let tempMouseP = mousePosition(el, event)
-
-            // 先求解出轨迹向量
-            let normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y]
-
-            // 方向向量旋转90deg得到旋转向量
-            let 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
-            })
-
-            mouseP = tempMouseP
-        }
-    }
-
-    el.addEventListener("mousedown", (event) => {
-        mouseP = mousePosition(el, event)
-    })
-    el.addEventListener("mouseup", (event) => {
-        mouseP = null
-    })
-    el.addEventListener("mousemove", (event) => {
-        doMove(event)
-    })
-
-    // 手指控制
-    el.addEventListener("touchend", (event) => {
-        mouseP = null;
-    })
-    el.addEventListener("touchstart", (event) => {
-        mouseP = mousePosition(el, event)
-    })
-    el.addEventListener("touchmove", (event) => {
-        doMove(event.touches[0])
-    })
-
-    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: [],
-            event
-        })
-    }
-
-    // 滚轮控制
-    el.addEventListener("mousewheel", function (event: any) {
-        doScale(event.wheelDelta, event)
-    })
-
-    if (window.addEventListener) {
-
-        // 针对火狐浏览器
-        window.addEventListener('DOMMouseScroll', function (event: any) {
-            doScale(-1 * event.detail, event)
-        }, false)
-    }
-
+import type { callbackFun } from '../types/viewHandler'
+
+const mousePosition = (el: HTMLElement, event: any) => {
+    const bounding = el.getBoundingClientRect()
+    return {
+        "x": event.clientX - bounding.left,
+        "y": event.clientY - bounding.top
+    }
+}
+
+const getKeyString = (event: any) => {
+    return {
+        37: "left",
+        38: "up",
+        39: "right",
+        40: "down",
+    }[event.keyCode || event.which]
+}
+
+export default function (callback: callbackFun) {
+
+    const el = document.getElementsByTagName('body')[0]
+
+    // 键盘控制
+    el.addEventListener("keydown", function (event) {
+        const keyCode = getKeyString(event)
+
+        // 视角向上
+        if (keyCode == 'up') {
+            callback({
+                type: "lookUp",
+                normal: [],
+                value: 0.1,
+                event
+            })
+        }
+
+        // 视角向下
+        else if (keyCode == 'down') {
+            callback({
+                type: "lookDown",
+                normal: [],
+                value: 0.1,
+                event
+            })
+        }
+
+        // 视角向左
+        else if (keyCode == 'left') {
+            callback({
+                type: "lookLeft",
+                normal: [],
+                value: 0.1,
+                event
+            })
+        }
+
+        // 视角向右
+        else if (keyCode == 'right') {
+            callback({
+                type: "lookRight",
+                normal: [],
+                value: 0.1,
+                event
+            })
+        }
+
+    })
+
+    // 鼠标控制
+    let mouseP = null;
+    const doMove = function (event) {
+
+        // 单纯移动
+        if (mouseP == null) {
+            callback({
+                type: "hover",
+                normal: [],
+                value: 0,
+                event
+            })
+        }
+
+        // 按下移动
+        else {
+
+            const tempMouseP = mousePosition(el, event)
+
+            // 先求解出轨迹向量
+            const normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y]
+
+            // 方向向量旋转90deg得到旋转向量
+            const 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
+            })
+
+            mouseP = tempMouseP
+        }
+    }
+
+    el.addEventListener("mousedown", (event) => {
+        mouseP = mousePosition(el, event)
+    })
+    el.addEventListener("mouseup", () => {
+        mouseP = null
+    })
+    el.addEventListener("mousemove", (event) => {
+        doMove(event)
+    })
+
+    // 手指控制
+    el.addEventListener("touchend", () => {
+        mouseP = null;
+    })
+    el.addEventListener("touchstart", (event) => {
+        mouseP = mousePosition(el, event)
+    })
+    el.addEventListener("touchmove", (event) => {
+        doMove(event.touches[0])
+    })
+
+    const doScale = function (value: number, event: Event) {
+        if (value == 0) return
+
+        const baseTimes = 0.899
+        callback({
+            type: "scale",
+            value: value < 0 ? baseTimes : 2 - baseTimes,
+            normal: [],
+            event
+        })
+    }
+
+    // 滚轮控制
+    el.addEventListener("mousewheel", function (event: any) {
+        doScale(event.wheelDelta, event)
+    })
+
+    if (window.addEventListener) {
+
+        // 针对火狐浏览器
+        window.addEventListener('DOMMouseScroll', function (event: any) {
+            doScale(-1 * event.detail, event)
+        }, false)
+    }
+
 }

package/types/Buffer.d.ts

@@ -1,24 +1,24 @@
-export default interface BufferType {
-
-    /**
-     * 使用这个缓冲区对象
-     * （先于写入和分配）
-     */
-    use(): this
-
-    /**
-     * 写入数据
-     * @param data 具体的数据内容
-     */
-    write(data: Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array): this
-
-    /**
-     * 分配使用
-     * @param location 变量位置
-     * @param size 一个数据的长度
-     * @param stride 一组数据的长度(可能包含多组)
-     * @param offset 读取位置偏移
-     */
-    divide(location: number, size: number, stride: number, offset?: number): this
-
+export default interface BufferType {
+
+    /**
+     * 使用这个缓冲区对象
+     * （先于写入和分配）
+     */
+    use(): this
+
+    /**
+     * 写入数据
+     * @param data 具体的数据内容
+     */
+    write(data: Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array): this
+
+    /**
+     * 分配使用
+     * @param location 变量位置
+     * @param size 一个数据的长度
+     * @param stride 一组数据的长度(可能包含多组)
+     * @param offset 读取位置偏移
+     */
+    divide(location: number, size: number, stride: number, offset?: number): this
+
 }

package/types/Canvas.d.ts

@@ -262,6 +262,14 @@ export default interface CanvasType {
      */
     getContext(isRegion?: boolean): CanvasRenderingContext2D
 
+    /**
+     * 获取画布信息
+     */
+    getInfo(): {
+        width: number
+        height: number
+    }
+
     /**
      * 创建线性渐变
      * @param x0 起点