vislite 1.2.1 → 1.3.0-alpha.1

package/miniprogram/ui-canvas/index.js

@@ -1,117 +1,117 @@
-import RawCanvas from "../../lib/RawCanvas/index.es.min.js";
-import drawImage from "./drawImage.js";
-
-let dpr = wx.getSystemInfoSync().pixelRatio;
-
-// https://developers.weixin.qq.com/miniprogram/dev/reference/api/Component.html
-
-Component({
-    properties: {
-        width: {
-            type: Number,
-            value: 300
-        },
-        height: {
-            type: Number,
-            value: 150
-        },
-        region: {
-            type: Boolean,
-            value: true
-        }
-    },
-    data: {
-        help: {}
-    },
-    lifetimes: {
-        ready() {
-
-        }
-    },
-    methods: {
-        fetch() {
-            return new Promise((resolve, reject) => {
-
-                let getCanvasContext = (idName, doback) => {
-                    if (idName != 'region' || this.data.region) {
-                        const query = wx.createSelectorQuery().in(this);
-                        query.select('#' + idName)
-                            .fields({ node: true, size: true })
-                            .exec((res) => {
-                                const canvas = res[0].node;
-                                const ctx = canvas.getContext('2d');
-
-                                canvas.width = res[0].width * (idName == "region" ? 1 : dpr);
-                                canvas.height = res[0].height * (idName == "region" ? 1 : dpr);
-
-                                if (idName != "region") {
-                                    ctx.scale(dpr, dpr);
-                                }
-
-                                doback(ctx, idName != 'region' ? canvas : null);
-                            });
-                    } else {
-                        doback(null);
-                    }
-                };
-
-                getCanvasContext("painter", (painter, panvas) => {
-                    getCanvasContext("region", region => {
-                        this.data.help.instance = new RawCanvas({
-                            getContext() {
-                                return painter;
-                            }
-                        }, this.data.region ? {
-                            getContext() {
-                                return region;
-                            }
-                        } : null);
-
-                        this.data.help.instance.toDataURL = () => {
-                            return new Promise((resolveUrl) => {
-                                if (panvas.toDataURL) {
-                                    resolveUrl(panvas.toDataURL());
-                                } else {
-                                    wx.canvasToTempFilePath({
-                                        canvasId: "painter",
-                                        success: function (e) {
-                                            resolveUrl(e.tempFilePath);
-                                        },
-                                        fail: function (e) {
-                                            console.log(e)
-                                        }
-                                    }, this);
-                                }
-                            });
-                        };
-
-                        this.data.help.instance.drawImage = drawImage(
-                            this.data.help.instance,
-                            this.data.help.instance.drawImage,
-                            panvas
-                        );
-
-                        resolve(this.data.help.instance);
-                    });
-                });
-
-            });
-        },
-        doit(event) {
-            let x = event.touches[0].x;
-            let y = event.touches[0].y;
-
-            this.data.help.instance.getRegion(x, y).then((regionName) => {
-                this.triggerEvent('dotouchstart', {
-                    name: regionName,
-                    x: x,
-                    y: y
-                })
-            });
-        },
-        doitstart(event) {
-            this.doit(event);
-        }
-    }
-
-});
+import RawCanvas from "../../lib/RawCanvas/index.es.min.js";
+import drawImage from "./drawImage.js";
+
+let dpr = wx.getSystemInfoSync().pixelRatio;
+
+// https://developers.weixin.qq.com/miniprogram/dev/reference/api/Component.html
+
+Component({
+    properties: {
+        width: {
+            type: Number,
+            value: 300
+        },
+        height: {
+            type: Number,
+            value: 150
+        },
+        region: {
+            type: Boolean,
+            value: true
+        }
+    },
+    data: {
+        help: {}
+    },
+    lifetimes: {
+        ready() {
+
+        }
+    },
+    methods: {
+        fetch() {
+            return new Promise((resolve, reject) => {
+
+                let getCanvasContext = (idName, doback) => {
+                    if (idName != 'region' || this.data.region) {
+                        const query = wx.createSelectorQuery().in(this);
+                        query.select('#' + idName)
+                            .fields({ node: true, size: true })
+                            .exec((res) => {
+                                const canvas = res[0].node;
+                                const ctx = canvas.getContext('2d');
+
+                                canvas.width = res[0].width * (idName == "region" ? 1 : dpr);
+                                canvas.height = res[0].height * (idName == "region" ? 1 : dpr);
+
+                                if (idName != "region") {
+                                    ctx.scale(dpr, dpr);
+                                }
+
+                                doback(ctx, idName != 'region' ? canvas : null);
+                            });
+                    } else {
+                        doback(null);
+                    }
+                };
+
+                getCanvasContext("painter", (painter, panvas) => {
+                    getCanvasContext("region", region => {
+                        this.data.help.instance = new RawCanvas({
+                            getContext() {
+                                return painter;
+                            }
+                        }, this.data.region ? {
+                            getContext() {
+                                return region;
+                            }
+                        } : null);
+
+                        this.data.help.instance.toDataURL = () => {
+                            return new Promise((resolveUrl) => {
+                                if (panvas.toDataURL) {
+                                    resolveUrl(panvas.toDataURL());
+                                } else {
+                                    wx.canvasToTempFilePath({
+                                        canvasId: "painter",
+                                        success: function (e) {
+                                            resolveUrl(e.tempFilePath);
+                                        },
+                                        fail: function (e) {
+                                            console.log(e)
+                                        }
+                                    }, this);
+                                }
+                            });
+                        };
+
+                        this.data.help.instance.drawImage = drawImage(
+                            this.data.help.instance,
+                            this.data.help.instance.drawImage,
+                            panvas
+                        );
+
+                        resolve(this.data.help.instance);
+                    });
+                });
+
+            });
+        },
+        doit(event) {
+            let x = event.touches[0].x;
+            let y = event.touches[0].y;
+
+            this.data.help.instance.getRegion(x, y).then((regionName) => {
+                this.triggerEvent('dotouchstart', {
+                    name: regionName,
+                    x: x,
+                    y: y
+                })
+            });
+        },
+        doitstart(event) {
+            this.doit(event);
+        }
+    }
+
+});

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 wx:if="{{region}}" 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 wx:if="{{region}}" 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/Buffer/index.ts

@@ -1,3 +1,3 @@
-import Buffer from '../../src/common/webgl/buffer'
-
+import Buffer from '../../src/common/webgl/buffer'
+
 export default Buffer

package/package/Canvas/index.ts

@@ -1,3 +1,3 @@
-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/MapCoordinate/index.ts

@@ -0,0 +1,3 @@
+import MapCoordinate from "../../src/coordinate/MapCoordinate"
+
+export default MapCoordinate

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/Mercator/index.ts

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

package/package/RawCanvas/index.ts

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

package/package/SVG/index.ts

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

package/package/Shader/index.ts

@@ -1,3 +1,3 @@
-import Shader from '../../src/common/webgl/shader'
-
+import Shader from '../../src/common/webgl/shader'
+
 export default Shader

package/package/Texture/index.ts

@@ -1,3 +1,3 @@
-import Texture from '../../src/common/webgl/texture'
-
+import Texture from '../../src/common/webgl/texture'
+
 export default Texture

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/animation/index.ts

@@ -1,3 +1,3 @@
-import { animation } from "oipage/corejs/animation/index"
-
+import { animation } from "oipage/corejs/animation/index"
+
 export default animation

package/package/assemble/index.ts

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

package/package/getLoopColors/index.ts

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

package/package/getWebGLContext/index.ts

@@ -1,41 +1,41 @@
-import getWebGLContext from "../../src/common/webgl/getWebGLContext"
-import type { WebGLmodeType } from "../../types/getWebGLContext"
-
-export default (el: HTMLElement | null, scale: number = 1, mode?: WebGLmodeType) => {
-    if (!el) {
-        throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.")
-    }
-
-    let width = el.clientWidth, height = el.clientHeight
-
-    let ViewCanvas: HTMLCanvasElement
-
-    let _el = el as any
-
-    // 如果已经初始化过了
-    if (_el._vislite_canvas_) {
-        ViewCanvas = _el._vislite_canvas_
-    }
-
-    // 否则就初始化
-    else {
-
-        ViewCanvas = document.createElement('canvas')
-        el.appendChild(ViewCanvas)
-
-        _el._vislite_canvas_ = ViewCanvas
-
-        el.setAttribute('vislite', 'WebGL')
-
-    }
-
-    // 设置画布大小
-
-    ViewCanvas.style.width = width + "px"
-    ViewCanvas.setAttribute('width', width + "")
-
-    ViewCanvas.style.height = height + "px"
-    ViewCanvas.setAttribute('height', height + "")
-
-    return getWebGLContext(ViewCanvas, scale, {}, mode)
+import getWebGLContext from "../../src/common/webgl/getWebGLContext"
+import type { WebGLmodeType } from "../../types/getWebGLContext"
+
+export default (el: HTMLElement | null, scale: number = 1, mode?: WebGLmodeType) => {
+    if (!el) {
+        throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.")
+    }
+
+    let width = el.clientWidth, height = el.clientHeight
+
+    let ViewCanvas: HTMLCanvasElement
+
+    let _el = el as any
+
+    // 如果已经初始化过了
+    if (_el._vislite_canvas_) {
+        ViewCanvas = _el._vislite_canvas_
+    }
+
+    // 否则就初始化
+    else {
+
+        ViewCanvas = document.createElement('canvas')
+        el.appendChild(ViewCanvas)
+
+        _el._vislite_canvas_ = ViewCanvas
+
+        el.setAttribute('vislite', 'WebGL')
+
+    }
+
+    // 设置画布大小
+
+    ViewCanvas.style.width = width + "px"
+    ViewCanvas.setAttribute('width', width + "")
+
+    ViewCanvas.style.height = height + "px"
+    ViewCanvas.setAttribute('height', height + "")
+
+    return getWebGLContext(ViewCanvas, scale, {}, mode)
 }

package/package/index.ts

@@ -1,76 +1,81 @@
-import Cardinal from "./Cardinal/index"
-import Hermite from "./Hermite/index"
-
-import Matrix4 from "./Matrix4/index"
-import rotate from "./rotate/index"
-import move from "./move/index"
-import scale from "./scale/index"
-
-import getLoopColors from "./getLoopColors/index"
-import animation from "./animation/index"
-import ruler from "./ruler/index"
-
-import SVG from "./SVG/index"
-import Canvas from "./Canvas/index"
-import RawCanvas from "../src/common/canvas/index"
-
-import getWebGLContext from "./getWebGLContext/index"
-import Shader from "./Shader/index"
-import Texture from "./Texture/index"
-import Buffer from "./Buffer/index"
-
-import Eoap from "./Eoap/index"
-import Mercator from "./Mercator/index"
-
-import throttle from "./throttle/index"
-
-import TreeLayout from "./TreeLayout/index"
-
-import initOption from "./initOption/index"
-import mergeOption from "./mergeOption/index"
-
-import assemble from "./assemble/index"
-
-export default {
-
-    // 插值
-    Cardinal,
-    Hermite,
-
-    // 变换
-    Matrix4,
-    rotate,
-    move,
-    scale,
-
-    // 工具
-    getLoopColors,
-    animation,
-    ruler,
-
-    // 画笔
-    SVG,
-    Canvas,
-    RawCanvas,
-
-    // WebGL
-    getWebGLContext,
-    Shader,
-    Texture,
-    Buffer,
-
-    // 投影
-    Eoap,
-    Mercator,
-
-    // 辅助
-    throttle,
-    assemble,
-
-    // 布局
-    TreeLayout,
-
-    // 配置项
-    initOption,
-    mergeOption
+import Cardinal from "./Cardinal/index"
+import Hermite from "./Hermite/index"
+
+import Matrix4 from "./Matrix4/index"
+import rotate from "./rotate/index"
+import move from "./move/index"
+import scale from "./scale/index"
+
+import getLoopColors from "./getLoopColors/index"
+import animation from "./animation/index"
+import ruler from "./ruler/index"
+
+import SVG from "./SVG/index"
+import Canvas from "./Canvas/index"
+import RawCanvas from "../src/common/canvas/index"
+
+import getWebGLContext from "./getWebGLContext/index"
+import Shader from "./Shader/index"
+import Texture from "./Texture/index"
+import Buffer from "./Buffer/index"
+
+import Eoap from "./Eoap/index"
+import Mercator from "./Mercator/index"
+
+import throttle from "./throttle/index"
+
+import MapCoordinate from "./MapCoordinate/index"
+
+import TreeLayout from "./TreeLayout/index"
+
+import initOption from "./initOption/index"
+import mergeOption from "./mergeOption/index"
+
+import assemble from "./assemble/index"
+
+export default {
+
+    // 插值
+    Cardinal,
+    Hermite,
+
+    // 变换
+    Matrix4,
+    rotate,
+    move,
+    scale,
+
+    // 工具
+    getLoopColors,
+    animation,
+    ruler,
+
+    // 画笔
+    SVG,
+    Canvas,
+    RawCanvas,
+
+    // WebGL
+    getWebGLContext,
+    Shader,
+    Texture,
+    Buffer,
+
+    // 投影
+    Eoap,
+    Mercator,
+
+    // 辅助
+    throttle,
+    assemble,
+
+    // 坐标系
+    MapCoordinate,
+
+    // 布局
+    TreeLayout,
+
+    // 配置项
+    initOption,
+    mergeOption
 }

package/package/initOption/index.ts

@@ -1,3 +1,3 @@
-import { initOption } from "../../src/common/option"
-
+import { initOption } from "../../src/common/option"
+
 export default initOption

package/package/mergeOption/index.ts

@@ -1,3 +1,3 @@
-import { mergeOption } from "../../src/common/option"
-
+import { mergeOption } from "../../src/common/option"
+
 export default mergeOption

package/package/move/index.ts

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

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