mxdraw 0.1.7 → 0.1.10

package/dist/lib/MxModule/MxDbEntity/MxDbEntity.js

@@ -1,4 +1,9 @@
 "use strict";
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
 /** @module MxDbEntity*/
 Object.defineProperty(exports, "__esModule", { value: true });
 var MxType_1 = require("../MxType");
@@ -25,8 +30,16 @@ var store_1 = require("../store/store");
  */
 var MxDbEntity = /** @class */ (function () {
     function MxDbEntity() {
-        this.iColor = 0xffffff;
-        this.iRenderOrder = 30;
+        this.color = 0xffffff;
+        this.renderOrder = 30;
+        /**
+         * opacity 设置透明度 0 ~ 1,1表示完全不透明，0表示全透明.
+         * */
+        this.opacity = 1;
+        /**
+         * visible 该矩形对象是否可见
+         * */
+        this.visible = true;
     }
     /**
      * 自定义实体的坐标变换.
@@ -66,6 +79,34 @@ var MxDbEntity = /** @class */ (function () {
             return false;
         }
     };
+    /**
+     * 返回对象所在的控件对象。
+     * @param
+     * @returns boolean
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
+    MxDbEntity.prototype.getMxObject = function () {
+        var imp = this.getImp();
+        if (imp)
+            return imp.getMxObject();
+        else
+            return null;
+    };
+    /**
+     * 视区显示比较发生成变化，继承类可以向应该事件，更新显示大小。
+     * @param
+     * @returns boolean
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
+    MxDbEntity.prototype.onViewChange = function () {
+        return false;
+    };
     /**
      * 得到对象的id.
      * @param
@@ -111,8 +152,8 @@ var MxDbEntity = /** @class */ (function () {
      *
      * ```
      */
-    MxDbEntity.prototype.setColor = function (iColor) {
-        this.iColor = iColor;
+    MxDbEntity.prototype.setColor = function (color) {
+        this.color = color;
     };
     /**
      * 得到颜色
@@ -124,7 +165,7 @@ var MxDbEntity = /** @class */ (function () {
      * ```
      */
     MxDbEntity.prototype.getColor = function () {
-        return this.iColor;
+        return this.color;
     };
     /**
      * 复制对象。
@@ -147,16 +188,16 @@ var MxDbEntity = /** @class */ (function () {
      * @param obj dwgIn抽象方法的回调数据
      */
     MxDbEntity.prototype.onDwgIn = function (obj) {
-        this.iColor = obj['iColor'];
-        this.iRenderOrder = obj['iRenderOrder'];
+        this.color = obj['color'];
+        this.renderOrder = obj['renderOrder'];
     };
     /**
      * 自定义对象内部数据输出同步（实现dwgIn抽象方法 必须在实现中调用 this.onDwgIn()
      * @param obj dwgOut抽象方法的回调数据
      */
     MxDbEntity.prototype.onDwgOut = function (obj) {
-        obj['iColor'] = this.iColor;
-        obj['iRenderOrder'] = this.iRenderOrder;
+        obj['color'] = this.color;
+        obj['renderOrder'] = this.renderOrder;
     };
     /**
      * 初始自定义对象的类型信息.
@@ -180,8 +221,8 @@ var MxDbEntity = /** @class */ (function () {
      *
      * ```
      */
-    MxDbEntity.prototype.setRenderOrder = function (iRenderOrder) {
-        this.iRenderOrder = iRenderOrder;
+    MxDbEntity.prototype.setRenderOrder = function (renderOrder) {
+        this.renderOrder = renderOrder;
     };
     /**
      * 得到显示顺序
@@ -193,7 +234,7 @@ var MxDbEntity = /** @class */ (function () {
      * ```
      */
     MxDbEntity.prototype.getRenderOrder = function () {
-        return this.iRenderOrder;
+        return this.renderOrder;
     };
     return MxDbEntity;
 }());

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

@@ -70,6 +70,7 @@ var MxDbImage = /** @class */ (function (_super) {
             }
             else if (this.imagePath.length > 0 && this.isLoadMaterialFromPath) {
                 var myThis_1 = this;
+                var mxobj_1 = pWorldDraw.getMxObject();
                 MxFun_1.default.loadImageMaterial(this.imagePath, function (material) {
                     _this.isLoadMaterialFromPath = false;
                     if (!material) {
@@ -77,7 +78,7 @@ var MxDbImage = /** @class */ (function (_super) {
                     }
                     myThis_1.setMaterial(material);
                     myThis_1.setNeedUpdateDisplay();
-                    MxFun_1.default.updateDisplay();
+                    mxobj_1.updateDisplay();
                 });
             }
         }

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

@@ -26,11 +26,17 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
 var MxDbEntity_1 = require("../MxDbEntity");
 var three_1 = require("three");
 var index_1 = require("../../tools/three/index");
-var _ = require("lodash");
+// import * as _ from 'lodash'
 var MxFun_1 = require("../MxFun");
+var McGiWorldDrawType_1 = require("../McGiWorldDrawType");
 /**
  * MxRectEntity 矩形对象.
  */
@@ -49,25 +55,11 @@ var MxDbRect = /** @class */ (function (_super) {
          * */
         _this.pt2 = new three_1.Vector3();
         /**
-         * width: 在绘制时自动计算矩形像素宽度 单位px
+         * 是否需要颜色填充.
          * */
-        _this.width = 0;
-        /**
-         * height: 在绘制时自动计算矩形像素高度 单位px
-         * */
-        _this.height = 0;
-        /**
-         * transparent 开启透明度
-         * */
-        _this.transparent = true;
-        /**
-         * opacity 设置透明度 0 ~ 1
-         * */
-        _this.opacity = 1;
-        /**
-         * visible 该矩形对象是否可见
-         * */
-        _this.visible = true;
+        _this.isSolidColorFill = false;
+        _this.isLoadMaterialFromPath = true;
+        _this.material = null;
         return _this;
     }
     MxDbRect.prototype.worldDraw = function (pWorldDraw) {
@@ -77,87 +69,95 @@ var MxDbRect = /** @class */ (function (_super) {
         if (this.cornerRadius.length > 0) {
             points = (0, index_1.getToGenerateRoundedCorners)(points, this.cornerRadius);
         }
-        var geometry;
-        var material;
-        var line = new three_1.Object3D();
+        if (pWorldDraw.getType() != McGiWorldDrawType_1.default.kWorldDraw) {
+            // 动态拖动绘制，或选择绘制 。
+            // 组成闭合区域。
+            points.push(points[0]);
+            pWorldDraw.drawLines(points);
+            return;
+        }
         // 公共的material参数
         var materialParam = {
-            transparent: this.transparent,
+            transparent: true,
+            depthTest: false,
             opacity: this.opacity,
             visible: this.visible
         };
         // 如果是填充模式
-        if (this.fillColor || this.fillImageSrc) {
+        if (this.isSolidColorFill) {
             // 三维坐标转二位坐标
             points = points.map(function (_a) {
                 var x = _a.x, y = _a.y;
                 return new three_1.Vector2(x, y);
             });
             // 计算矩形宽高
+            var geometry = void 0;
             geometry = new three_1.ShapeGeometry(new three_1.Shape(points));
-            geometry.computeBoundingBox();
-            var size_1 = new three_1.Vector3();
-            geometry.boundingBox.getSize(size_1);
-            this.width = MxFun_1.default.docCoord2Screen(size_1.x).x;
-            this.height = MxFun_1.default.docCoord2Screen(size_1.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 material = new three_1.MeshBasicMaterial(__assign({ color: this.filter
+                    ? this.filter._getFilterColor(this.color, this.opacity)
+                    : new three_1.Color(this.color) }, materialParam));
+            var mash = new three_1.Mesh(geometry, material);
+            pWorldDraw.drawEntity(mash);
+        }
+        else if (this.fillImageSrc) {
+            // 图片填充.
+            if (this.material) {
+                // 三维坐标转二位坐标
+                points = points.map(function (_a) {
+                    var x = _a.x, y = _a.y;
+                    return new three_1.Vector2(x, y);
+                });
+                var material = this.material;
+                var geometry = new three_1.ShapeGeometry(new three_1.Shape(points));
+                // 修复集合体的uv坐标
+                geometry = (0, index_1.repairGeometryFaceVertexUvs)(geometry);
+                // 有滤镜对象使用自定义着色器
+                if (this.filter) {
                     // 纹理属性设置
+                    var mate = material;
                     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.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));
+                    var data = this.filter._getFilterShaderData(map);
+                    material = new three_1.ShaderMaterial(__assign(__assign({}, data), materialParam));
+                }
+                // 设置材质属性
+                material.depthTest = false;
+                material.transparent = true;
+                material.opacity = this.opacity;
+                material.visible = this.visible;
+                var mash = new three_1.Mesh(geometry, material);
+                pWorldDraw.drawEntity(mash);
+            }
+            else if (this.fillImageSrc.length > 0 && this.isLoadMaterialFromPath) {
+                var myThis_1 = this;
+                MxFun_1.default.loadImageMaterial(this.fillImageSrc, function (material) {
+                    _this.isLoadMaterialFromPath = false;
+                    if (!material) {
+                        return;
                     }
-                    // 设置材质属性
-                    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);
+                    myThis_1.material = material;
+                    myThis_1.setNeedUpdateDisplay();
+                    MxFun_1.default.updateDisplay();
                 });
-                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);
+            var geometry = new three_1.BufferGeometry().setFromPoints(points);
+            var material = new three_1.LineBasicMaterial(__assign({ color: this.getColor() }, materialParam));
+            var line = new three_1.LineLoop(geometry, material);
+            pWorldDraw.drawEntity(line);
         }
-        // 计算矩形宽高
-        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;
-        pWorldDraw.drawEntity(line);
     };
     MxDbRect.prototype.getGripPoints = function () {
         var ret = [];
@@ -186,28 +186,24 @@ var MxDbRect = /** @class */ (function (_super) {
         this.onDwgIn(obj);
         this.pt1.copy(obj['pt1']);
         this.pt2.copy(obj['pt2']);
-        this.fillColor = obj['fillColor'];
+        this.isSolidColorFill = obj['isSolidColorFill'];
         this.fillImageSrc = obj['fillImageSrc'];
-        this.fillImageSrc = obj['fillImageParam'];
+        this.fillImageParam = obj['fillImageParam'];
         this.cornerRadius = obj['cornerRadius'];
         this.filter = obj['filter'];
-        this.transparent = obj['transparent'];
-        this.opacity = obj['opacity'];
-        this.visible = obj['visible'];
+        this.isLoadMaterialFromPath = true;
+        this.material = null;
         return true;
     };
     MxDbRect.prototype.dwgOut = function (obj) {
         this.onDwgOut(obj);
         obj['pt1'] = this.pt1;
         obj['pt2'] = this.pt2;
-        obj['fillColor'] = this.fillColor;
+        obj['isSolidColorFill'] = this.isSolidColorFill;
         obj['fillImageSrc'] = this.fillImageSrc;
         obj['fillImageParam'] = this.fillImageParam;
         obj['cornerRadius'] = this.cornerRadius;
         obj['filter'] = this.filter;
-        obj['transparent'] = this.transparent;
-        obj['opacity'] = this.opacity;
-        obj['visible'] = this.visible;
         return obj;
     };
     MxDbRect.prototype.create = function () {
@@ -221,20 +217,29 @@ var MxDbRect = /** @class */ (function (_super) {
      * setRadius 设置圆角 圆角的半径  如[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4
      * @param { number | number[] } radius 圆角半径 为数组时[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4； 或者直接设置半径值 则四个角统一半径
      * */
-    MxDbRect.prototype.setRadius = function (radius) {
-        if (_.isArray(radius)) {
+    MxDbRect.prototype.setRadius = function (radius, isScreenCoord) {
+        if (isScreenCoord === void 0) { isScreenCoord = true; }
+        if (radius instanceof Array) {
             this.cornerRadius = radius.map(function (r) {
-                return MxFun_1.default.screenCoordLong2Doc(r);
+                if (isScreenCoord)
+                    return MxFun_1.default.screenCoordLong2Doc(r);
+                else
+                    return r;
             });
         }
-        else if (_.isNumber(radius)) {
+        else {
             if (radius > 0) {
-                this.cornerRadius = [
-                    MxFun_1.default.screenCoordLong2Doc(radius),
-                    MxFun_1.default.screenCoordLong2Doc(radius),
-                    MxFun_1.default.screenCoordLong2Doc(radius),
-                    MxFun_1.default.screenCoordLong2Doc(radius)
-                ];
+                if (isScreenCoord) {
+                    this.cornerRadius = [
+                        MxFun_1.default.screenCoordLong2Doc(radius),
+                        MxFun_1.default.screenCoordLong2Doc(radius),
+                        MxFun_1.default.screenCoordLong2Doc(radius),
+                        MxFun_1.default.screenCoordLong2Doc(radius)
+                    ];
+                }
+                else {
+                    this.cornerRadius = [radius, radius, radius, radius];
+                }
             }
             else {
                 this.cornerRadius = [];
@@ -244,6 +249,25 @@ var MxDbRect = /** @class */ (function (_super) {
     MxDbRect.prototype.getTypeName = function () {
         return 'MxDbRect';
     };
+    MxDbRect.prototype.getFilter = function () {
+        return this.filter;
+    };
+    MxDbRect.prototype.setFilter = function (filter) {
+        this.filter = filter;
+        this.isLoadMaterialFromPath = true;
+        this.material = null;
+    };
+    MxDbRect.prototype.setFillImagePath = function (sPath) {
+        this.fillImageSrc = sPath;
+        this.isLoadMaterialFromPath = true;
+        this.material = null;
+        if (this.fillImageSrc) {
+            this.isSolidColorFill = false;
+        }
+    };
+    MxDbRect.prototype.getFillImagePath = function () {
+        return this.fillImageSrc;
+    };
     return MxDbRect;
 }(MxDbEntity_1.default));
 exports.default = MxDbRect;