mxdraw 0.1.1 → 0.1.4

package/dist/lib/MxModule/MxDrawObject/MxDrawObject.js

@@ -273,6 +273,8 @@ var MxDrawObject = /** @class */ (function () {
      * Mx.MxFun.getCurrentDraw().addEvent("render", (renderer)=> {})
      * 视区大小被修改事件.,viewsize={viewWidth:viewWidth,viewHeight:viewHeight}
      * Mx.MxFun.getCurrentDraw().addEvent("viewsizechange", (viewsize)=> {})
+     * 实体选择状态发生改变的事件.
+     * Mx.MxFun.getCurrentDraw().addEvent("MxEntitySelectChange", (aryId:Array<number>)=> {})
      * ```
      */
     MxDrawObject.prototype.addEvent = function (eventNaem, fun) {
@@ -304,7 +306,7 @@ var MxDrawObject = /** @class */ (function () {
         return this._mxdrawObj.screenCoord2World(x, y, z);
     };
     /**
-     * ThreeJS坐标到屏幕坐标
+     * ThreeJS坐标到屏幕坐标,屏幕坐标的Y轴向下。坐标原点在左上角.
      * @returns THREE.Vector3
      * @example
      * ```typescript
@@ -324,8 +326,8 @@ var MxDrawObject = /** @class */ (function () {
      *
      * ```
      */
-    MxDrawObject.prototype.screenCoord2Doc = function (x, y, z) {
-        return this._mxdrawObj.screenCoord2Doc(x, y, z);
+    MxDrawObject.prototype.screenCoord2Doc = function (x, y) {
+        return this._mxdrawObj.screenCoord2Doc(x, y, 0);
     };
     /**
      * ThreeJS坐标长度到DWG文档坐标长度
@@ -408,8 +410,8 @@ var MxDrawObject = /** @class */ (function () {
      *
      * ```
      */
-    MxDrawObject.prototype.docCoord2Screen = function (x, y, z) {
-        return this._mxdrawObj.docCoord2Screen(x, y, z);
+    MxDrawObject.prototype.docCoord2Screen = function (x, y) {
+        return this._mxdrawObj.docCoord2Screen(x, y, 0);
     };
     /**
      * 屏幕坐标长度到DWG文档坐标长度
@@ -497,6 +499,30 @@ var MxDrawObject = /** @class */ (function () {
     MxDrawObject.prototype.getMxCurrentSelect = function () {
         return this._mxdrawObj.getMxAllSelect();
     };
+    /**
+     * 把对象添加到当前选择中.
+     * @returns void
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.addMxCurrentSelect = function (id) {
+        return this._mxdrawObj.addMxCurrentSelect(id);
+    };
+    /**
+     * 清除当前所有选择
+     * @returns void
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.clearMxCurrentSelect = function () {
+        return this._mxdrawObj.clearMxCurrentSelect();
+    };
     /**
      *通过id获取绘制的对象.
      * @param id 返回对象的id
@@ -508,12 +534,11 @@ var MxDrawObject = /** @class */ (function () {
      * ```
      */
     MxDrawObject.prototype.getMxEntity = function (id) {
-        return this._mxdrawObj.getMxEntity(id);
+        return this._mxdrawObj.getMxEntityUserObject(id);
     };
     /**
      * 查找某点位置处的用户自绘对象.
-     * @param ptMouse 查找的点位 THREE.Vector3
-     * @param isWorldCoord 点是否是默认坐标 默认为 true
+     * @param ptMouse 查找的点位 THREE.Vector3,默认是文档坐标
      * @returns MxDbEntity[] 返回用户自绘对象数组
      * @example
      * ```typescript
@@ -521,10 +546,8 @@ var MxDrawObject = /** @class */ (function () {
      *
      * ```
      */
-    MxDrawObject.prototype.findMxEntityAtPoint = function (ptMouse, isWorldCoord) {
-        if (isWorldCoord == undefined)
-            isWorldCoord = true;
-        return this._mxdrawObj.findMxEntityAtPoint(ptMouse, isWorldCoord);
+    MxDrawObject.prototype.findMxEntityAtPoint = function (ptMouse) {
+        return this._mxdrawObj.findMxEntityAtPoint(ptMouse);
     };
     /**
      *得到所有用户自绘对象.
@@ -589,7 +612,71 @@ var MxDrawObject = /** @class */ (function () {
     MxDrawObject.prototype.enablePan = function (isEnable) {
         return this._mxdrawObj.enablePan(isEnable);
     };
+    /**
+     * 删除MxEntity
+     * @param id 实体id.
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.eraseMxEntity = function (id) {
+        return this._mxdrawObj.eraseMxEntity(id);
+    };
+    /**
+     * 移除安视图坐标绘制的对象.
+     * @param obj 对象.
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.removeViewObject = function (obj) {
+        this._mxdrawObj.removeViewObject(obj);
+    };
+    /**
+     * 保存所有MxEntity的数据到json字符串.
+     * @param
+     * @returns json字符串
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.saveMxEntityToJson = function () {
+        return this._mxdrawObj.saveMxEntityToJson();
+    };
+    /**
+     * 从json字符串恢复MxEntity
+     * @param dataString json字符串.
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.loadMxEntityFromJson = function (dataString) {
+        return this._mxdrawObj.loadMxEntityFromJson(dataString);
+    };
+    /**
+     * 删除所有对MxEntity
+     * @param
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.eraseAllMxEntity = function () {
+        return this._mxdrawObj.eraseAllMxEntity();
+    };
     return MxDrawObject;
 }());
 exports.default = MxDrawObject;
-//# sourceMappingURL=MxDrawObject.js.map

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

@@ -3,4 +3,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var MxDrawObject_1 = require("./MxDrawObject");
 exports.default = MxDrawObject_1.default;
-//# sourceMappingURL=index.js.map

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 模块
  * 导出库时已实例化，只需要调用实例方法 例如：
@@ -30,7 +31,7 @@ var MxFun = /** @class */ (function () {
      * 创建图纸展示控件实例
      * @param canvasId 提供一个canvas元素或者唯一的ID或者class类亦或者Jquery选中的元素
      * @paramType string | HTMLCanvasElement | JQuery<HTMLElement>
-     * @param drawName 提供要展示的图纸名称
+     * @param cadFile 提供要展示的图纸名称
      * @paramType string
      * @param callback 图纸展示控件创建完成后的回调函数 回调参数mxDraw和dom
      * @paramType function
@@ -41,7 +42,7 @@ var MxFun = /** @class */ (function () {
      * ``` typescript
      * Mx.MxFun.createMxObject({
      *   canvasId: "my-app",
-     *   drawName： "test2.dwg",
+     *   cadFile： "test2.dwg",
      *   callback(mxDraw, { canvas, canvasParent }) {
      *       console.log(mxDraw, canvas, canvasParent)
      *   },
@@ -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.drawName, drawName = _c === void 0 ? 'test2.dwg' : _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);
@@ -64,7 +65,7 @@ var MxFun = /** @class */ (function () {
         // canvasParent.style.position = 'relative';
         // 创建实例
         ;
-        store_1.default.state.MxFun.createMxObject(canvasId, drawName, function (mxDraw) {
+        store_1.default.state.MxFun.createMxObject(canvasId, cadFile, function (mxDraw) {
             var mxdrawObj = new MxDrawObject_1.default(mxDraw);
             mxDraw.setMouseRightRotate(false);
             mxDraw.setIniset({ EnableOsnapFunction: true });
@@ -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);
     };
     /**
      * 为程序设置服务器地址
@@ -166,7 +169,7 @@ var MxFun = /** @class */ (function () {
      * @example
      * ``` typescript
      * Mx.MxFun.call("getDrawObject", {
-     *   drawName: "test.dwg"
+     *   cadFile: "test.dwg"
      * }, (res)=> {
      *   console.log(res)
      * })
@@ -200,6 +203,32 @@ var MxFun = /** @class */ (function () {
     MxFun.prototype.screenCoordLong2World = function (len) {
         return store_1.default.state.MxFun.screenCoordLong2World(len);
     };
+    /**
+     * 屏幕坐标长度转文档坐标长度
+     * @param len 屏幕坐标长度
+     * @return number 文档坐标长度
+     * @example
+     * ``` typescript
+     * const len = Mx.MxFun.screenCoordLong2Doc(36)
+     * console.log(len)
+     * ```
+     */
+    MxFun.prototype.screenCoordLong2Doc = function (len) {
+        return store_1.default.state.MxFun.screenCoordLong2Doc(len);
+    };
+    /**
+     * 文档坐标长度转屏幕坐标长度
+     * @param len 文档坐标长度
+     * @return number 屏幕坐标长度
+     * @example
+     * ``` typescript
+     * const len = Mx.MxFun.docCoordLong2Screen(36)
+     * console.log(len)
+     * ```
+     */
+    MxFun.prototype.docCoordLong2Screen = function (len) {
+        return store_1.default.state.MxFun.docCoordLong2Screen(len);
+    };
     /**
      * THREE.JS坐标长度转屏幕坐标长度
      * @param len THREE.JS坐标长度
@@ -213,6 +242,18 @@ var MxFun = /** @class */ (function () {
     MxFun.prototype.worldCoordLong2Doc = function (len) {
         return store_1.default.state.MxFun.worldCoordLong2Doc(len);
     };
+    /**
+     * DWG文档坐标长度到ThreeJS坐标长度
+     * @returns number
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxFun.prototype.docCoordLong2World = function (l) {
+        return store_1.default.state.MxFun.docCoordLong2World(l);
+    };
     /**
      * 屏幕坐标转THREE.JS坐标.
      * @param  x 坐标x
@@ -229,7 +270,7 @@ var MxFun = /** @class */ (function () {
         return store_1.default.state.MxFun.screenCoord2World(x, y, z);
     };
     /**
-     * THREE.JS坐标转屏幕坐标.
+     * THREE.JS坐标转屏幕坐标.,屏幕坐标的Y轴向下。坐标原点在左上角.
      * @param  x 坐标x
      * @param  y 坐标y
      * @param  z 坐标z
@@ -245,6 +286,7 @@ var MxFun = /** @class */ (function () {
     };
     /**
      * 文档坐标转THREE.JS坐标
+     * 说明： 文档坐标，THREE.JS坐标的X轴都是从左到右，Y轴是下到上,但是屏幕像素坐标系：X轴都是从左到右，Y轴是上到下
      * @param  x 坐标x
      * @param  y 坐标y
      * @param  z 坐标z
@@ -285,8 +327,8 @@ var MxFun = /** @class */ (function () {
      * console.log(vector3)
      * ```
      */
-    MxFun.prototype.screenCoord2Doc = function (x, y, z) {
-        return store_1.default.state.MxFun.screenCoord2Doc(x, y, z);
+    MxFun.prototype.screenCoord2Doc = function (x, y) {
+        return store_1.default.state.MxFun.screenCoord2Doc(x, y, 0);
     };
     /**
      * 文档转屏幕坐标.
@@ -300,8 +342,8 @@ var MxFun = /** @class */ (function () {
      * console.log(vector3)
      * ```
      */
-    MxFun.prototype.docCoord2Screen = function (x, y, z) {
-        return store_1.default.state.MxFun.docCoord2Screen(x, y, z);
+    MxFun.prototype.docCoord2Screen = function (x, y) {
+        return store_1.default.state.MxFun.docCoord2Screen(x, y, 0);
     };
     /**
      * 更新显示，使用Three.js绘制了对象，调用该函数更新显示。
@@ -463,7 +505,7 @@ var MxFun = /** @class */ (function () {
         return 5 + 6;
     };
     /**
-     * 加载一个Image对象。
+     * 加载一个图片对象，返回Three.js材质对象，该函数具有缓存功能，下次加载同样的图片，可以直接返回.
      * @param p
      * @return any
      * @example
@@ -471,10 +513,51 @@ var MxFun = /** @class */ (function () {
      *
      * ```
      */
-    MxFun.prototype.loadImage = function (imageUrlPath, callResult) {
-        return store_1.default.state.MxFun.loadImage(imageUrlPath, callResult);
+    MxFun.prototype.loadImageMaterial = function (imageUrlPath, callResult) {
+        return store_1.default.state.MxFun.loadImageMaterial(imageUrlPath, callResult);
+    };
+    /**
+     * 判断点是否在一个闭合的多边形区域。
+     * @param p
+     * @return any
+     * @example
+     * ``` typescript
+     *      let aryPoint:Array<THREE.Vector3> = [];
+     *      aryPoint.push(new THREE.Vector3(0,0,0));
+     *      aryPoint.push(new THREE.Vector3(0,100,0));
+     *      aryPoint.push(new THREE.Vector3(100,100,0));
+     *      aryPoint.push(new THREE.Vector3(100,0,0));
+     *      let pt:THREE.Vector3 = new THREE.Vector3(150,150);
+     *      if(MxFun.pointInPolyline(pt,aryPoint) ){
+     *        console.log("in");
+     *      }
+     * ```
+     */
+    MxFun.prototype.pointInPolyline = function (pt, vecPolyline) {
+        return store_1.default.state.MxFun.pointInPolyline(pt, vecPolyline);
+    };
+    /**
+     * 计算多边形区域的面积
+     * @param p
+     * @return any
+     * @example
+     * ``` typescript
+     * ```
+     */
+    MxFun.prototype.calcArea = function (aryPoint) {
+        return store_1.default.state.MxFun.calcArea(aryPoint);
+    };
+    /**
+     * 重新打开cad文件，该函数在控件创建完后，需要再次重新打开文件，调用。
+     * @param sFile 打的cad文件路径
+     * @return any
+     * @example
+     * ``` typescript
+     * ```
+     */
+    MxFun.prototype.openFile = function (sFile) {
+        return store_1.default.state.MxFun.openFile(sFile);
     };
     return MxFun;
 }());
 exports.default = MxFun;
-//# sourceMappingURL=MxFun.js.map

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

@@ -7,4 +7,3 @@ var MxFun_1 = require("./MxFun");
 //   loadCoreCode()
 // }
 exports.default = new MxFun_1.default();
-//# sourceMappingURL=index.js.map

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

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
 var three_1 = require("three");
 var math_1 = require("../../tools/algorithm/math");
 var formatting_1 = require("../../tools/formatting");
@@ -139,8 +144,8 @@ var MxThreeJS = /** @class */ (function () {
         context.font = sFont;
         context.textAlign = 'center';
         context.textBaseline = 'middle';
-        var sColor = (0, formatting_1.formatString)('#{0}', iColor.toString(16));
-        context.fillStyle = sColor;
+        context.fillStyle = (0, formatting_1.formatString)('rgba({0}, {1}, {2}, 1.0)', ((iColor >> 16) & 0xff) + '', ((iColor >> 8) & 0xff) + '', (iColor & 0xff) + '');
+        //const sColor = formatString('#{0}', iColor.toString(16))
         context.fillText(message, textWidth / 2, textHeight / 2);
         var texture = new three_1.Texture(canvas);
         texture.needsUpdate = true;
@@ -241,7 +246,7 @@ var MxThreeJS = /** @class */ (function () {
     };
     /**
      * 创建Image
-     * @param pos 图片位置
+     * @param pos 图片中心点位置,屏幕坐标，屏幕坐标的Y轴向上。坐标原点在左下角.
      * @param w 图片宽度
      * @param h 图片高度
      * @param imageUrlPath 图片URl地址
@@ -255,38 +260,9 @@ var MxThreeJS = /** @class */ (function () {
      * ```
      */
     MxThreeJS.prototype.createImage = function (pos, w, h, imageUrlPath, callResult) { };
-    // createImage(pos:Vector3,w:number,h:number,imageUrlPath:string,callResult:(mesh:Mesh | null)=>void): void{
-    //     new TextureLoader().load(
-    //         imageUrlPath,
-    //         function (texture) {
-    //             let geometry = new PlaneGeometry(w, w);
-    //             // 测试 transparent: true,打开，renderOrder才管用。
-    //             let materialTexture = new MeshLambertMaterial({
-    //                     map: texture,
-    //                     transparent: true,
-    //                     side: DoubleSide
-    //             });
-    //             if(materialTexture.map)
-    //                 materialTexture.map.needsUpdate = true;
-    //             setGeometryPostion(geometry,pos);
-    //             //var mesh = new Mesh(geometry, material);
-    //             let mesh:any = new Mesh(geometry, materialTexture);
-    //             mesh.material["depthTest"]=false;
-    //             //mesh.renderOrder = renderOrder;
-    //             callResult(mesh);
-    //         },
-    //         undefined,
-    //         function (err) {
-    //             console.log(err)
-    //             callResult(null);
-    //         });
-    // }
     /**
      * 加载SVG
-     * @param url SVG路径地址
-     * @param x X轴位置
-     * @param y Y轴位置
-     * @param scale 缩放比
+     * @param url SVG路径地址,该函数具有缓存功能，下次加载同样的图片，可以直接返回.
      * @param color 颜色
      * @param callResult SVG加载完成的回调 回调参数：THREE.Object3D和Array<THREE.MeshBasicMaterial>
      * @returns void
@@ -297,8 +273,7 @@ var MxThreeJS = /** @class */ (function () {
      * })
      * ```
      */
-    MxThreeJS.prototype.loadSVG = function (url, x, y, scale, color, callResult) { };
+    MxThreeJS.prototype.loadSVG = function (url, color, callResult) { };
     return MxThreeJS;
 }());
 exports.default = MxThreeJS;
-//# sourceMappingURL=MxThreeJS.js.map