mxdraw 0.1.3 → 0.1.4

package/dist/lib/MxModule/MxDbImage/MxDbImage.js

@@ -1,11 +1,8 @@
 "use strict";
 ///////////////////////////////////////////////////////////////////////////////
 //版权所有（C）2002-2022，成都梦想凯德科技有限公司。
-//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司
-//应用包含本软件的程序必须包括以下声明
-//在版权声明中：
-//此应用程序与成都梦想凯德科技有限公司成协议。
-//通过使用本软件、其文档或相关材料
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
 ///////////////////////////////////////////////////////////////////////////////
 /** @module MxDbImage*/
 var __extends = (this && this.__extends) || (function () {

package/dist/lib/MxModule/MxDbLine/MxDbLine.js

@@ -0,0 +1,94 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
+/** @module MxDbLine*/
+var THREE = require("three");
+var MxDbEntity_1 = require("../MxDbEntity");
+/**
+ * MxDbLine 直线对象.
+ */
+var MxDbLine = /** @class */ (function (_super) {
+    __extends(MxDbLine, _super);
+    function MxDbLine() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        // pt1,pt2
+        _this.pt1 = new THREE.Vector3();
+        _this.pt2 = new THREE.Vector3();
+        return _this;
+    }
+    MxDbLine.prototype.getTypeName = function () {
+        return 'MxDbLine';
+    };
+    MxDbLine.prototype.worldDraw = function (pWorldDraw) {
+        pWorldDraw.drawLine(this.pt1, this.pt2);
+    };
+    MxDbLine.prototype.setPoint1 = function (pt1) {
+        this.pt1 = pt1;
+    };
+    MxDbLine.prototype.getPoint1 = function () {
+        return this.pt1;
+    };
+    MxDbLine.prototype.setPoint2 = function (pt2) {
+        this.pt2 = pt2;
+    };
+    MxDbLine.prototype.getPoint2 = function () {
+        return this.pt2;
+    };
+    MxDbLine.prototype.getGripPoints = function () {
+        var ret = [];
+        ret.push(this.pt1);
+        ret.push(this.pt2);
+        var midPoint = new THREE.Vector3(this.pt1.x + (this.pt2.x - this.pt1.x) * 0.5, this.pt1.y + (this.pt2.y - this.pt1.y) * 0.5, 0);
+        ret.push(midPoint);
+        return ret;
+    };
+    MxDbLine.prototype.moveGripPointsAt = function (index, offset) {
+        if (index == 0) {
+            this.pt1.add(offset);
+        }
+        else if (index == 1) {
+            this.pt2.add(offset);
+        }
+        else if (index == 2) {
+            this.pt1.add(offset);
+            this.pt2.add(offset);
+        }
+        return true;
+    };
+    MxDbLine.prototype.dwgIn = function (obj) {
+        this.onDwgIn(obj);
+        this.pt1.copy(obj['pt1']);
+        this.pt2.copy(obj['pt2']);
+        return true;
+    };
+    MxDbLine.prototype.dwgOut = function (obj) {
+        this.onDwgOut(obj);
+        obj['pt1'] = this.pt1;
+        obj['pt2'] = this.pt2;
+        return obj;
+    };
+    MxDbLine.prototype.create = function () {
+        return new MxDbLine();
+    };
+    return MxDbLine;
+}(MxDbEntity_1.default));
+exports.default = MxDbLine;

package/dist/lib/MxModule/MxDbLine/index.js

@@ -0,0 +1,5 @@
+"use strict";
+/** @module McEdGetPointWorldDrawObject*/
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxDbLine_1 = require("./MxDbLine");
+exports.default = MxDbLine_1.default;

package/dist/lib/MxModule/MxDbRect/MxDbRect.js

@@ -0,0 +1,219 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxDbEntity_1 = require("../MxDbEntity");
+var three_1 = require("three");
+var index_1 = require("../../tools/three/index");
+var MxFun_1 = require("../MxFun");
+/**
+ * MxRectEntity 矩形对象.
+ */
+var MxDbRect = /** @class */ (function (_super) {
+    __extends(MxDbRect, _super);
+    function MxDbRect() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        /**
+         * pt1: 构成矩形的第一个点
+         * */
+        _this.pt1 = new three_1.Vector3();
+        /**
+         * pt1: 构成矩形的第二个点(对角点)
+         * */
+        _this.pt2 = new three_1.Vector3();
+        /**
+         * width: 在绘制时自动计算矩形像素宽度 单位px
+         * */
+        _this.width = 0;
+        /**
+         * height: 在绘制时自动计算矩形像素高度 单位px
+         * */
+        _this.height = 0;
+        /**
+         * cornerRadius(优先级大于radius属性): 圆角的半径  如[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4
+         * */
+        _this.cornerRadius = [];
+        /**
+         * transparent 开启透明度
+         * */
+        _this.transparent = true;
+        /**
+         * opacity 设置透明度 0 ~ 1
+         * */
+        _this.opacity = 1;
+        /**
+         * visible 该矩形对象是否可见
+         * */
+        _this.visible = true;
+        return _this;
+    }
+    MxDbRect.prototype.worldDraw = function (pWorldDraw) {
+        var _this = this;
+        //    根据第一个点和对角点 计算矩形的四个点位
+        var points = (0, index_1.computeRectPoints)(this.pt1, this.pt2);
+        // 计算圆角顶点坐标
+        if (this.cornerRadius.length <= 0 && this.radius) {
+            this.cornerRadius = [
+                MxFun_1.default.screenCoordLong2Doc(this.radius),
+                MxFun_1.default.screenCoordLong2Doc(this.radius),
+                MxFun_1.default.screenCoordLong2Doc(this.radius),
+                MxFun_1.default.screenCoordLong2Doc(this.radius)
+            ];
+        }
+        if (this.cornerRadius.length > 0) {
+            points = (0, index_1.getToGenerateRoundedCorners)(points, this.cornerRadius);
+        }
+        var geometry;
+        var material;
+        var line = new three_1.Object3D();
+        // 公共的material参数
+        var materialParam = {
+            transparent: this.transparent,
+            opacity: this.opacity,
+            visible: this.visible
+        };
+        // 如果是填充模式
+        if (this.fillColor || this.fillImageSrc) {
+            // 三维坐标转二位坐标
+            points = points.map(function (_a) {
+                var x = _a.x, y = _a.y;
+                return new three_1.Vector2(x, y);
+            });
+            // 计算矩形宽高
+            geometry = new three_1.ShapeGeometry(new three_1.Shape(points));
+            geometry.computeBoundingBox();
+            var size = new three_1.Vector3();
+            geometry.boundingBox.getSize(size);
+            this.width = MxFun_1.default.docCoord2Screen(size.x).x;
+            this.height = MxFun_1.default.docCoord2Screen(size.y).x;
+            // 如果是图片填充
+            if (this.fillImageSrc) {
+                var imgSrc = this.fillImageSrc;
+                MxFun_1.default.loadImageMaterial(imgSrc, function (mate) {
+                    if (!mate)
+                        return;
+                    material = mate;
+                    geometry = new three_1.ShapeGeometry(new three_1.Shape(points));
+                    // 修复集合体的uv坐标
+                    geometry = (0, index_1.repairGeometryFaceVertexUvs)(geometry);
+                    // 纹理属性设置
+                    var map = mate.map;
+                    if (_this.fillImageParam) {
+                        if (_this.fillImageParam.center)
+                            map.center = _this.fillImageParam.center;
+                        if (_this.fillImageParam.offset)
+                            map.offset = _this.fillImageParam.offset;
+                        if (_this.fillImageParam.repeat)
+                            map.repeat = _this.fillImageParam.repeat;
+                        if (_this.fillImageParam.rotation)
+                            map.rotation = _this.fillImageParam.rotation;
+                    }
+                    // 有滤镜对象使用自定义着色器
+                    if (_this.filter) {
+                        var data = _this.filter._getFilterShaderData(map);
+                        material = new three_1.ShaderMaterial(__assign(__assign({}, data), materialParam));
+                    }
+                    // 设置材质属性
+                    material.depthTest = false;
+                    material.transparent = _this.transparent;
+                    material.opacity = _this.opacity;
+                    material.visible = _this.visible;
+                    line = new three_1.Mesh(geometry, material);
+                    pWorldDraw.drawEntity(line);
+                });
+                return;
+            }
+            else {
+                //   颜色填充
+                material = new three_1.MeshBasicMaterial(__assign({ color: this.filter
+                        ? this.filter._getFilterColor(this.fillColor, this.opacity)
+                        : new three_1.Color(this.fillColor) }, materialParam));
+                line = new three_1.Mesh(geometry, material);
+            }
+        }
+        else {
+            // 线框模式
+            geometry = new three_1.BufferGeometry().setFromPoints(points);
+            material = new three_1.LineBasicMaterial(__assign({ color: this.getColor() }, materialParam));
+            line = new three_1.LineLoop(geometry, material);
+        }
+        pWorldDraw.drawEntity(line);
+    };
+    MxDbRect.prototype.getGripPoints = function () {
+        var ret = [];
+        ret.push(this.pt1);
+        var lineMath = new three_1.Line3(this.pt1, this.pt2);
+        var corePt = new three_1.Vector3();
+        lineMath.getCenter(corePt);
+        ret.push(corePt);
+        ret.push(this.pt2);
+        return ret;
+    };
+    MxDbRect.prototype.moveGripPointsAt = function (index, offset) {
+        if (index == 0) {
+            this.pt1.add(offset);
+        }
+        else if (index == 1) {
+            this.pt1.add(offset);
+            this.pt2.add(offset);
+        }
+        else if (index == 2) {
+            this.pt2.add(offset);
+        }
+        return true;
+    };
+    MxDbRect.prototype.dwgIn = function (obj) {
+        this.onDwgIn(obj);
+        this.pt1.copy(obj['pt1']);
+        this.pt2.copy(obj['pt2']);
+        this.cornerRadius = obj['cornerRadius'];
+        this.radius = obj['radius'];
+        this.filter = obj['filter'];
+        return true;
+    };
+    MxDbRect.prototype.dwgOut = function (obj) {
+        this.onDwgOut(obj);
+        obj['pt1'] = this.pt1;
+        obj['pt2'] = this.pt2;
+        obj['cornerRadius'] = this.cornerRadius;
+        obj['radius'] = this.radius;
+        obj['filter'] = this.filter;
+        return obj;
+    };
+    MxDbRect.prototype.create = function () {
+        return new MxDbRect();
+    };
+    MxDbRect.prototype.transformBy = function (mat) {
+        this.pt1.applyMatrix4(mat);
+        this.pt2.applyMatrix4(mat);
+    };
+    MxDbRect.prototype.getTypeName = function () {
+        return 'MxRectEntity';
+    };
+    return MxDbRect;
+}(MxDbEntity_1.default));
+exports.default = MxDbRect;

package/dist/lib/MxModule/MxDbRect/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxDbRect_1 = require("./MxDbRect");
+exports.default = MxDbRect_1.default;

package/dist/lib/MxModule/MxFilters/MxFilters.js

@@ -0,0 +1,201 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/** 简单颜色滤镜矩阵 */
+var three_1 = require("three");
+var MxFilters = /** @class */ (function () {
+    function MxFilters() {
+        this.uniformObj = {};
+        this.filtersStr = '';
+        this.filtersTypes = '';
+        //顶点着色器代码片段
+        this.VSHADER_SOURCE = "\n  varying vec2 v_Uv; \n  void main () {\n      v_Uv = uv;\n      gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n  }\n  ";
+        //片元着色器代码片段
+        this.FSHADER_SOURCE = "\n  varying vec2 v_Uv;\n  uniform sampler2D e_Texture;\n  uniform mat4 colorMatrix;\n  ".concat(this.filtersStr, "\n  void main () {\n    vec4 color = texture2D( e_Texture, v_Uv );\n    color = color * colorMatrix;\n    ").concat(this.filtersTypes, "\n    gl_FragColor = color;\n  }");
+        this._matrix = new three_1.Matrix4();
+    }
+    /**
+     * 过滤或增强某个颜色通道
+     * @param {ChannelParamTypes}
+     * */
+    MxFilters.prototype.channel = function (_a) {
+        var _b = _a.r, r = _b === void 0 ? 1 : _b, _c = _a.g, g = _c === void 0 ? 1 : _c, _d = _a.b, b = _d === void 0 ? 1 : _d;
+        this._matrix = new three_1.Matrix4()
+            .set(r, 0, 0, 0, 0, g, 0, 0, 0, 0, b, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 改变亮度
+     * @param {number} p
+     * p = 0 全暗，p > 0 且 p < 1 调暗，p = 1 原色， p > 1 调亮
+     * */
+    MxFilters.prototype.brightness = function (p) {
+        this._matrix = new three_1.Matrix4()
+            .set(p, 0, 0, 0, 0, p, 0, 0, 0, 0, p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 饱和度
+     * @param {number} p
+     * p = 0 完全灰度化，p = 1 原色，p > 1 增强饱和度
+     * */
+    MxFilters.prototype.saturate = function (p) {
+        var r = 0.2126 * (1 - p);
+        var g = 0.7152 * (1 - p);
+        var b = 0.0722 * (1 - p);
+        this._matrix = new three_1.Matrix4()
+            .set(r + p, g, b, 0, r, g + p, b, 0, r, g, b + p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 对比度
+     * @param {number} p
+     *  p = 1 原色， p < 1 减弱对比度，p > 1 增强对比度
+     * */
+    MxFilters.prototype.contrast = function (p) {
+        var d = 0.5 * (1 - p);
+        this._matrix = new three_1.Matrix4()
+            .set(p, 0, 0, 0, 0, p, 0, 0, 0, 0, p, 0, d, d, d, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 透明度
+     * @param {number} p
+     * p = 0 全透明，p = 1 原色
+     * */
+    MxFilters.prototype.opacity = function (p) {
+        this._matrix = new three_1.Matrix4()
+            .set(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, p)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 反色
+     * @param {number} p
+     * p = 0 原色， p = 1 完全反色
+     * */
+    MxFilters.prototype.invert = function (p) {
+        var d = 1 - 2 * p;
+        this._matrix = new three_1.Matrix4()
+            .set(d, 0, 0, 0, 0, d, 0, 0, 0, 0, d, 0, p, p, p, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 灰度
+     * @param {number} p 0~1
+     * */
+    MxFilters.prototype.grayscale = function (p) {
+        if (p === void 0) { p = 1; }
+        var r = 0.2126 * p;
+        var g = 0.7152 * p;
+        var b = 0.0722 * p;
+        this._matrix = new three_1.Matrix4()
+            .set(r + 1 - p, g, b, 0, r, g + 1 - p, b, 0, r, g, b + 1 - p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 深褐色
+     * @param {number} p 0~1
+     * */
+    MxFilters.prototype.sepia = function (p) {
+        if (p === void 0) { p = 1; }
+        this._matrix = new three_1.Matrix4()
+            .set(1 - 0.607 * p, 0.769 * p, 0.189 * p, 0, 0.349 * p, 1 - 0.314 * p, 0.168 * p, 0, 0.272 * p, 0.534 * p, 1 - 0.869 * p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 色相旋转，将色调沿极坐标转过deg角度
+     * @param {number} deg 0~360
+     * */
+    MxFilters.prototype.hueRotate = function (deg) {
+        var rotation = (deg / 180) * Math.PI;
+        var cos = Math.cos(rotation), sin = Math.sin(rotation), lumR = 0.2126, lumG = 0.7152, lumB = 0.0722;
+        this._matrix = new three_1.Matrix4()
+            .set(lumR + cos * (1 - lumR) + sin * -lumR, lumG + cos * -lumG + sin * -lumG, lumB + cos * -lumB + sin * (1 - lumB), 0, lumR + cos * -lumR + sin * 0.143, lumG + cos * (1 - lumG) + sin * 0.14, lumB + cos * -lumB + sin * -0.283, 0, lumR + cos * -lumR + sin * -(1 - lumR), lumG + cos * -lumG + sin * lumG, lumB + cos * (1 - lumB) + sin * lumB, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 色相旋转，将色调沿极坐标转过deg角度
+     * @param {number} deg 0~360
+     * */
+    /**
+     * 卷积
+     * @param {Matrix3} cKernel 3*3的矩阵
+     * @param {number} stStep 1 / 9
+     * @param {number} scaleFactor 521
+     * */
+    MxFilters.prototype.convolution = function (cKernel, stStep, scaleFactor) {
+        if (stStep === void 0) { stStep = 1 / 9; }
+        if (scaleFactor === void 0) { scaleFactor = 521; }
+        this.uniformObj = __assign(__assign({}, this.uniformObj), { cKernel: {
+                value: cKernel.toArray()
+            }, stStep: {
+                value: stStep
+            }, scaleFactor: {
+                value: scaleFactor
+            } });
+        if (this.filtersTypes.indexOf('convolutionTextureColor') < 0) {
+            this.filtersStr += "\n        uniform float cKernel[9];\n        uniform float stStep;\n        uniform float scaleFactor;\n        vec4 convolutionTextureColor(vec4 color) {\n            vec2 offsets[9];\n            offsets[0] = vec2(-1.0,-1.0);\n            offsets[1] =  vec2(0.0,-1.0);\n            offsets[2] = vec2(1.0,-1.0);\n            offsets[3] =  vec2(-1.0,0.0);\n            offsets[4] = vec2(0.0,0.0);\n            offsets[5] = vec2(1.0,0.0);\n            offsets[6] =  vec2(-1.0,1.0);\n            offsets[7] = vec2(0.0,1.0);\n            offsets[8] = vec2(1.0,1.0);\n        \n            vec4 sum = color;\n            for(int i = 0; i < 9; i++) {\n                sum = sum + cKernel[i] * scaleFactor * texture2D(e_Texture, v_Uv + offsets[i] / stStep);\n            };\n            return sum;\n        }";
+            this.filtersTypes += 'color = convolutionTextureColor(color);\n';
+        }
+        return this;
+    };
+    /**
+     * 重置所有滤镜效果
+     * */
+    MxFilters.prototype.reset = function () {
+        this.uniformObj = {};
+        this.filtersStr = '';
+        this.filtersTypes = '';
+        this._matrix = new three_1.Matrix4();
+        return this;
+    };
+    // 获取滤镜自定义着色器数据
+    MxFilters.prototype._getFilterShaderData = function (texture) {
+        return {
+            uniforms: __assign({ e_Texture: {
+                    value: texture
+                }, colorMatrix: {
+                    value: this._matrix
+                } }, this.uniformObj),
+            // 顶点着色器
+            vertexShader: this.VSHADER_SOURCE,
+            // 片元着色器
+            fragmentShader: this.FSHADER_SOURCE
+        };
+    };
+    // 获取转换后的颜色
+    MxFilters.prototype._getFilterColor = function (color, opacity) {
+        if (color === void 0) { color = '#000000'; }
+        if (opacity === void 0) { opacity = 1; }
+        color = new three_1.Color(color);
+        var r = color.r, g = color.g, b = color.b;
+        var arr = this._matrix.toArray();
+        var A = arr[12] * opacity + arr[13] * opacity + arr[14] * opacity + arr[15] * opacity + 0;
+        var R = arr[0] * r + arr[1] * r + arr[2] * r + arr[3] * opacity;
+        var G = arr[4] * g + arr[5] * g + arr[6] * g + arr[7] * opacity;
+        var B = arr[8] * b + arr[9] * b + arr[10] * b + arr[11] * opacity;
+        color.setRGB(R, G, B);
+        return color;
+    };
+    return MxFilters;
+}());
+exports.default = MxFilters;

package/dist/lib/MxModule/MxFilters/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxFilters_1 = require("./MxFilters");
+exports.default = MxFilters_1.default;

package/dist/lib/MxModule/MxFun/MxFun.js

@@ -14,6 +14,7 @@ var create_1 = require("../../tools/dom/create");
 var proxy_1 = require("../../tools/proxy");
 var MxDrawObject_1 = require("../MxDrawObject");
 var store_1 = require("../store/store");
+var useCanvasResizeListener_1 = require("../useCanvasResizeListener");
 /**
  * MxFun 模块
  * 导出库时已实例化，只需要调用实例方法 例如：
@@ -50,7 +51,7 @@ var MxFun = /** @class */ (function () {
      * ```
      */
     MxFun.prototype.createMxObject = function (_a) {
-        var _b = _a.canvasId, canvasId = _b === void 0 ? (0, random_1.createReandomId)() : _b, _c = _a.cadFile, cadFile = _c === void 0 ? '' : _c, callback = _a.callback, _d = _a.isNewFile, isNewFile = _d === void 0 ? true : _d;
+        var _b = _a.canvasId, canvasId = _b === void 0 ? (0, random_1.createReandomId)() : _b, _c = _a.cadFile, cadFile = _c === void 0 ? '' : _c, callback = _a.callback, _d = _a.isNewFile, isNewFile = _d === void 0 ? false : _d, _e = _a.useWebsocket, useWebsocket = _e === void 0 ? false : _e;
         // 获取canvas和其父级
         var canvas = (0, create_1.createCanvas)(canvasId);
         var canvasParent = (0, create_1.createCanvasParent)(canvas);
@@ -75,12 +76,14 @@ var MxFun = /** @class */ (function () {
                     height: canvasParent.clientHeight
                 };
             });
+            // 使用canvas侦听器 监听canvas元素的大小变化
+            (0, useCanvasResizeListener_1.default)(mxdrawObj, canvas);
             callback &&
                 callback(mxdrawObj, {
                     canvas: canvas,
                     canvasParent: canvasParent
                 });
-        }, isNewFile);
+        }, undefined, isNewFile, useWebsocket);
     };
     /**
      * 为程序设置服务器地址

package/dist/lib/MxModule/MxThreeJS/MxThreeJS.mixin.js

@@ -116,7 +116,7 @@ function default_1(MxThreeJS) {
             });
             if (materialTexture.map)
                 materialTexture.map.needsUpdate = true;
-            (0, three_2.setGeometryPostion)(geometry, pos);
+            (0, three_2.setGeometrPostion)(geometry, pos);
             //var mesh = new Mesh(geometry, material);
             var mesh = new three_1.Mesh(geometry, materialTexture);
             mesh.material['depthTest'] = false;

package/dist/lib/MxModule/loadCoreCode/loadCoreCode.js

@@ -44,10 +44,12 @@ var mxcadassembly_es5_js_1 = require("./mxcadassembly_es5.js");
 var MxDbImage_1 = require("../MxDbImage");
 var MxDbSVG_1 = require("../MxDbSVG");
 var MxDbAlignedDimension_1 = require("../MxDbAlignedDimension");
+var MxDbLine_1 = require("../MxDbLine");
 function rxInitMxEntity() {
     new MxDbImage_1.default().rxInit();
     new MxDbSVG_1.default().rxInit();
     new MxDbAlignedDimension_1.default().rxInit();
+    new MxDbLine_1.default().rxInit();
 }
 /**
  * 加载MxDraw库的核心代码 才能使用Mx的其他模块