vislite 0.7.1 → 0.8.0-alpha.0

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

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.7.1
+* VISLite JavaScript Library v0.8.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 Jan 20 2024 00:04:36 GMT+0800 (中国标准时间)
+* Publish Date:  Tue Feb 13 2024 21:00:43 GMT+0800 (中国标准时间)
 */
 var e,t;e=this,t=function(){"use strict";return function(e,t){void 0===t&&(t=1);var r=["rgba(84,112,198,"+t+")","rgba(145,204,117,"+t+")","rgba(250,200,88,"+t+")","rgba(238,102,102,"+t+")","rgba(115,192,222,"+t+")","rgba(59,162,114,"+t+")","rgba(252,132,82,"+t+")","rgba(154,96,180,"+t+")","rgba(234,124,204,"+t+")"],n=[];if(e<=r.length)return r;if(e%r.length==0)for(var o=0;o<e/r.length;o++)n=n.concat(r);else{for(var a=1;a<e/r.length;a++)n=n.concat(r);if(e%r.length==1)n=n.concat(r[4]);else for(var f=0;f<e%r.length;f++)n=n.concat(r[f])}return n}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_getLoopColors=t();

package/lib/getWebGLContext/index.umd.d.ts

@@ -0,0 +1,3 @@
+import { getWebGLContext } from "../../types/index"
+
+export default getWebGLContext

package/lib/getWebGLContext/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.7.1
+* VISLite JavaScript Library v0.8.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 Jan 20 2024 00:04:36 GMT+0800 (中国标准时间)
+* Publish Date:  Tue Feb 13 2024 21:00:43 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -14,8 +14,9 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.VISLite_getWebGLContext = factory());
 })(this, (function () { 'use strict';
 
-    function getWebGLContext (canvas, scale, opts) {
+    function getWebGLContext (canvas, scale, opts, mode) {
         if (opts === void 0) { opts = {}; }
+        if (mode === void 0) { mode = "scaleToFill"; }
         var names = ["experimental-webgl", "webkit-3d", "moz-webgl"];
         var painter = canvas.getContext("webgl", opts);
         for (var i = 0; i < names.length; i++) {
@@ -29,15 +30,32 @@
         if (!painter)
             throw new Error('Non canvas or browser does not support webgl.');
         var width = painter.canvas.width, height = painter.canvas.height;
-        var viewWidth = width * scale;
-        var viewHeight = height * scale;
+        var scaleX = scale, scaleY = scale;
+        if (mode == "aspectFit") {
+            if (width > height) {
+                scaleX *= height / width;
+            }
+            else if (height > width) {
+                scaleY *= width / height;
+            }
+        }
+        else if (mode == "aspectFill") {
+            if (width > height) {
+                scaleY *= width / height;
+            }
+            else if (height > width) {
+                scaleX *= height / width;
+            }
+        }
+        var viewWidth = width * scaleX;
+        var viewHeight = height * scaleY;
         painter.viewport((width - viewWidth) * 0.5, (height - viewHeight) * 0.5, viewWidth, viewHeight);
         painter.depthFunc(painter.LEQUAL);
         painter.enable(painter.DEPTH_TEST);
         return painter;
     }
 
-    var index = (function (el, scale) {
+    var index = (function (el, scale, mode) {
         if (scale === void 0) { scale = 1; }
         if (!el) {
             throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.");
@@ -58,7 +76,7 @@
         ViewCanvas.setAttribute('width', width + "");
         ViewCanvas.style.height = height + "px";
         ViewCanvas.setAttribute('height', height + "");
-        return getWebGLContext(ViewCanvas, scale);
+        return getWebGLContext(ViewCanvas, scale, {}, mode);
     });
 
     return index;

package/lib/getWebGLContext/index.umd.min.d.ts

@@ -0,0 +1,3 @@
+import { getWebGLContext } from "../../types/index"
+
+export default getWebGLContext

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

@@ -1,11 +1,11 @@
 /*!
-* VISLite JavaScript Library v0.7.1
+* VISLite JavaScript Library v0.8.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 Jan 20 2024 00:04:36 GMT+0800 (中国标准时间)
+* Publish Date:  Tue Feb 13 2024 21:00:43 GMT+0800 (中国标准时间)
 */
-var e,t;e=this,t=function(){"use strict";return function(e,t){if(void 0===t&&(t=1),!e)throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.");var n,i=e.clientWidth,o=e.clientHeight,r=e;return r._vislite_canvas_?n=r._vislite_canvas_:(n=document.createElement("canvas"),e.appendChild(n),r._vislite_canvas_=n,e.setAttribute("vislite","WebGL")),n.style.width=i+"px",n.setAttribute("width",i+""),n.style.height=o+"px",n.setAttribute("height",o+""),function(e,t,n){void 0===n&&(n={});for(var i=["experimental-webgl","webkit-3d","moz-webgl"],o=e.getContext("webgl",n),r=0;r<i.length;r++){try{o=e.getContext(i[r],n)}catch(e){}if(o)break}if(!o)throw new Error("Non canvas or browser does not support webgl.");var a=o.canvas.width,s=o.canvas.height,l=a*t,d=s*t;return o.viewport(.5*(a-l),.5*(s-d),l,d),o.depthFunc(o.LEQUAL),o.enable(o.DEPTH_TEST),o}(n,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_getWebGLContext=t();
+var e,t;e=this,t=function(){"use strict";return function(e,t,i){if(void 0===t&&(t=1),!e)throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.");var n,o=e.clientWidth,r=e.clientHeight,a=e;return a._vislite_canvas_?n=a._vislite_canvas_:(n=document.createElement("canvas"),e.appendChild(n),a._vislite_canvas_=n,e.setAttribute("vislite","WebGL")),n.style.width=o+"px",n.setAttribute("width",o+""),n.style.height=r+"px",n.setAttribute("height",r+""),function(e,t,i,n){void 0===i&&(i={}),void 0===n&&(n="scaleToFill");for(var o=["experimental-webgl","webkit-3d","moz-webgl"],r=e.getContext("webgl",i),a=0;a<o.length;a++){try{r=e.getContext(o[a],i)}catch(e){}if(r)break}if(!r)throw new Error("Non canvas or browser does not support webgl.");var l=r.canvas.width,s=r.canvas.height,c=t,d=t;"aspectFit"==n?l>s?c*=s/l:s>l&&(d*=l/s):"aspectFill"==n&&(l>s?d*=l/s:s>l&&(c*=s/l));var u=l*c,h=s*d;return r.viewport(.5*(l-u),.5*(s-h),u,h),r.depthFunc(r.LEQUAL),r.enable(r.DEPTH_TEST),r}(n,t,{},i)}},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).VISLite_getWebGLContext=t();

package/lib/index.umd.js

@@ -1,12 +1,12 @@
 /*!
-* VISLite JavaScript Library v0.7.1
+* VISLite JavaScript Library v0.8.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 Jan 20 2024 00:04:36 GMT+0800 (中国标准时间)
+* Publish Date:  Tue Feb 13 2024 21:00:43 GMT+0800 (中国标准时间)
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -1492,6 +1492,30 @@
             return this;
         };
         Painter.prototype.draw = function () { };
+        Painter.prototype.drawImage = function (img, x, y, w, h, isUniapp) {
+            var _this = this;
+            if (isUniapp === void 0) { isUniapp = false; }
+            return new Promise(function (resolve) {
+                if (_this.__region) {
+                    _this.__region.fillRect(x, y, w, h);
+                    resolve({});
+                }
+                if (_this.__isPainter && _this.__onlyRegion)
+                    return _this;
+                if (typeof img == 'string' && !isUniapp) {
+                    var imgInstance_1 = new Image();
+                    imgInstance_1.onload = function () {
+                        _this.painter.drawImage(imgInstance_1, x, y, w, h);
+                        resolve({});
+                    };
+                    imgInstance_1.src = img;
+                }
+                else {
+                    _this.painter.drawImage(img, x, y, w, h);
+                    resolve({});
+                }
+            });
+        };
         return Painter;
     }());
 
@@ -1729,8 +1753,9 @@
         return Canvas;
     }(Canvas$1));
 
-    function getWebGLContext$1 (canvas, scale, opts) {
+    function getWebGLContext$1 (canvas, scale, opts, mode) {
         if (opts === void 0) { opts = {}; }
+        if (mode === void 0) { mode = "scaleToFill"; }
         var names = ["experimental-webgl", "webkit-3d", "moz-webgl"];
         var painter = canvas.getContext("webgl", opts);
         for (var i = 0; i < names.length; i++) {
@@ -1744,8 +1769,25 @@
         if (!painter)
             throw new Error('Non canvas or browser does not support webgl.');
         var width = painter.canvas.width, height = painter.canvas.height;
-        var viewWidth = width * scale;
-        var viewHeight = height * scale;
+        var scaleX = scale, scaleY = scale;
+        if (mode == "aspectFit") {
+            if (width > height) {
+                scaleX *= height / width;
+            }
+            else if (height > width) {
+                scaleY *= width / height;
+            }
+        }
+        else if (mode == "aspectFill") {
+            if (width > height) {
+                scaleY *= width / height;
+            }
+            else if (height > width) {
+                scaleX *= height / width;
+            }
+        }
+        var viewWidth = width * scaleX;
+        var viewHeight = height * scaleY;
         painter.viewport((width - viewWidth) * 0.5, (height - viewHeight) * 0.5, viewWidth, viewHeight);
         painter.depthFunc(painter.LEQUAL);
         painter.enable(painter.DEPTH_TEST);
@@ -1998,7 +2040,7 @@
     var needUpdate = false;
     var scale = 10;
     var WebGL$1 = (function () {
-        function WebGL(ViewCanvas, RegionCanvas) {
+        function WebGL(ViewCanvas, RegionCanvas, mode) {
             this.name = "WebGL";
             this.__getColor = function (x, y) { return "rgba(0,0,0,1)"; };
             this.__regionList = {};
@@ -2015,9 +2057,9 @@
                 ])
             };
             this.__unique = new Date().valueOf();
-            this.painter = getWebGLContext$1(ViewCanvas, scale);
+            this.painter = getWebGLContext$1(ViewCanvas, scale, {}, mode);
             if (RegionCanvas) {
-                this.__regionPainter = getWebGLContext$1(RegionCanvas, scale, {});
+                this.__regionPainter = getWebGLContext$1(RegionCanvas, scale, {}, mode);
             }
             var proportion = this.painter.canvas.width / this.painter.canvas.height;
             var xProportion = 1;
@@ -2195,12 +2237,12 @@
                     canvas.setAttribute('height', height + "");
                 }
             }
-            return _super.call(this, ViewCanvas, RegionCanvas) || this;
+            return _super.call(this, ViewCanvas, RegionCanvas, option.mode) || this;
         }
         return WebGL;
     }(WebGL$1));
 
-    var getWebGLContext = (function (el, scale) {
+    var getWebGLContext = (function (el, scale, mode) {
         if (scale === void 0) { scale = 1; }
         if (!el) {
             throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.");
@@ -2221,7 +2263,7 @@
         ViewCanvas.setAttribute('width', width + "");
         ViewCanvas.style.height = height + "px";
         ViewCanvas.setAttribute('height', height + "");
-        return getWebGLContext$1(ViewCanvas, scale);
+        return getWebGLContext$1(ViewCanvas, scale, {}, mode);
     });
 
     var Shader = (function (_super) {
@@ -2791,13 +2833,16 @@
         return TreeLayout;
     }(Tree));
 
-    var splitNum = function (precision, radius) {
-        var num = Math.ceil(Math.PI * 2 /
+    var splitNum = function (precision, radius, deg) {
+        if (deg === void 0) { deg = Math.PI * 2; }
+        var num = Math.ceil(deg /
             Math.asin(precision / radius) * 2);
         return (isNaN(num) || num < 12) ? 12 : num;
     };
 
-    function prismHorizontal (normal, x, y, z, radius, num, d) {
+    function prismHorizontal (normal, x, y, z, radius, num, d, beginDeg, deg) {
+        if (beginDeg === void 0) { beginDeg = 0; }
+        if (deg === void 0) { deg = Math.PI * 2; }
         var beginX, beginZ;
         if (num == 4) {
             var temp = radius / 1.414;
@@ -2809,8 +2854,11 @@
             beginZ = z;
         }
         var point = [beginX, beginZ];
+        if (beginDeg != 0) {
+            point = rotate$1(x, z, beginDeg, beginX, beginZ);
+        }
         var points = [];
-        var deg = Math.PI * 2 / num;
+        var perDeg = deg / num;
         for (var i = 0; i < num; i++) {
             points.push(x, y, z);
             if (normal)
@@ -2818,7 +2866,7 @@
             points.push(point[0], y, point[1]);
             if (normal)
                 points.push(0, d, 0);
-            point = rotate$1(x, z, deg * (i + 1), beginX, beginZ);
+            point = rotate$1(x, z, perDeg * (i + 1), beginX, beginZ);
             points.push(point[0], y, point[1]);
             if (normal)
                 points.push(0, d, 0);
@@ -2826,7 +2874,9 @@
         return points;
     }
 
-    function prismVertical (normal, x, y, z, radius, height, num) {
+    function prismVertical (normal, x, y, z, radius, height, num, beginDeg, deg) {
+        if (beginDeg === void 0) { beginDeg = 0; }
+        if (deg === void 0) { deg = Math.PI * 2; }
         var points = [];
         var beginPosition;
         if (num == 4) {
@@ -2835,10 +2885,13 @@
         else {
             beginPosition = [x + radius, z];
         }
-        var deg = Math.PI * 2 / num, degHalf = Math.PI * 2 / (num * 2);
+        if (beginDeg != 0) {
+            beginPosition = rotate$1.apply(void 0, __spreadArray([x, z, beginDeg], beginPosition, false));
+        }
+        var perDeg = deg / num, degHalf = deg / (num * 2);
         var endPosition, normalPosition = [];
         for (var i = 0; i < num; i++) {
-            endPosition = rotate$1.apply(void 0, __spreadArray([x, z, deg], beginPosition, false));
+            endPosition = rotate$1.apply(void 0, __spreadArray([x, z, perDeg], beginPosition, false));
             if (normal) {
                 var halfPosition = rotate$1.apply(void 0, __spreadArray([x, z, degHalf], beginPosition, false));
                 normalPosition = [halfPosition[0], 0, halfPosition[1]];
@@ -2886,6 +2939,8 @@
 
     function rotateLineFactory (x, y, z, x2, y2, z2) {
         return function (x0, y0, z0, isNormal) {
+            if (x == x2 && z == z2)
+                return [x0, y0, z0];
             var sin, cos, temp;
             var _x0 = x0 - (isNormal ? 0 : x), _y0 = y0 - (isNormal ? 0 : y), _z0 = z0 - (isNormal ? 0 : z);
             var _x2 = x2 - x, _y2 = y2 - y, _z2 = z2 - z;
@@ -2923,6 +2978,43 @@
             }
             return this;
         };
+        Geometry.prototype.splitNum = function (radius, deg) {
+            return splitNum(this.__option.precision, radius, deg);
+        };
+        Geometry.prototype.rotateLine = function (x1, y1, z1, x2, y2, z2) {
+            var _this = this;
+            var rotateLine = rotateLineFactory(x1, y1, z1, x2, y2, z2);
+            return function (x, y, z) { return rotateLine(x, y, z, _this.__option.normal); };
+        };
+        Geometry.prototype.prismHorizontal = function (x, y, z, radius, num, d, beginDeg, deg) {
+            return prismHorizontal(this.__option.normal, x, y, z, radius, num, d, beginDeg, deg);
+        };
+        Geometry.prototype.prismVertical = function (x, y, z, radius, height, num, beginDeg, deg) {
+            return prismVertical(this.__option.normal, x, y, z, radius, height, num, beginDeg, deg);
+        };
+        Geometry.prototype.sphereFragment = function (cx, cy, cz, radius, num, index) {
+            return sphereFragment(this.__option.normal, cx, cy, cz, radius, num, index);
+        };
+        Geometry.prototype.pie = function (x, y, z, radius, height, beginDeg, deg) {
+            var num = splitNum(this.__option.precision, radius, deg);
+            var result = [{
+                    name: "bottom",
+                    points: prismHorizontal(this.__option.normal, x, y, z, radius, num, height > 0 ? -1 : 1, beginDeg, deg),
+                    length: 3 * num,
+                    method: "TRIANGLES"
+                }, {
+                    name: "top",
+                    points: prismHorizontal(this.__option.normal, x, y + height, z, radius, num, height > 0 ? 1 : -1, beginDeg, deg),
+                    length: 3 * num,
+                    method: "TRIANGLES"
+                }, {
+                    name: "side",
+                    points: prismVertical(this.__option.normal, x, y, z, radius, height, num, beginDeg, deg),
+                    length: 6 * num,
+                    method: "TRIANGLES"
+                }];
+            return result;
+        };
         Geometry.prototype.cylinder = function (x, y, z, radius, x2, y2, z2) {
             var num = splitNum(this.__option.precision, radius);
             if (arguments.length == 5) {
@@ -2940,7 +3032,7 @@
                 num = y2;
             }
             else {
-                height = Math.sqrt((x2 - x) * (x2 - x) + (y2 - y) * (y2 - y) + (z2 - z) * (z2 - z));
+                height = (y > y2 ? -1 : 1) * Math.sqrt((x2 - x) * (x2 - x) + (y2 - y) * (y2 - y) + (z2 - z) * (z2 - z));
                 rotateLine = rotateLineFactory(x, y, z, x2, y2, z2);
             }
             var result = [{