mxdraw 0.1.120 → 0.1.122

package/dist/index.d.ts

@@ -787,6 +787,16 @@ declare abstract class MxDbEntity {
      * @returns void
      */
     removeEvent(name: string): void;
+    /**
+    * 把一个对象变成一个json字体串.
+    * @returns void
+    */
+    toJsonString(type?: MxType.MxCloneType): string;
+    /**
+     * 从一个josn字符串加载数据.
+     * @returns void
+     */
+    fromJsonString(str: string): boolean;
 }
 
 /** @module MxDbGroup */
@@ -1744,7 +1754,7 @@ declare class MxDrawObject {
      */
     isMxCAD(): boolean;
     /**
-   * 得到实执行的内部MxObject对象.
+   * 得执行的内部MxObject对象.
    * @example
    * ```typescript
    *
@@ -1761,6 +1771,15 @@ declare class MxDrawObject {
     * ```
     */
     getAllLayoutName(): string[];
+    /**
+  * 得到数据库Json字符串数据.
+  * @example
+  * ```typescript
+  *
+  *
+  * ```
+  */
+    getDtabaseJsonString(): string;
 }
 
 /**
@@ -3356,13 +3375,113 @@ declare class MxDb2LineAngularDimension extends MxDbEntity {
     getTypeName(): string;
 }
 
+/** 简单颜色滤镜矩阵 */
+interface ChannelParamTypes {
+    r?: number;
+    g?: number;
+    b?: number;
+}
+declare class MxFilters {
+    private uniformObj;
+    private filtersStr;
+    private filtersTypes;
+    private VSHADER_SOURCE;
+    private FSHADER_SOURCE;
+    private _matrix;
+    /**
+     * 过滤或增强某个颜色通道
+     * @param {ChannelParamTypes}
+     * */
+    channel({ r, g, b }: ChannelParamTypes): this;
+    /**
+     * 改变亮度
+     * @param {number} p
+     * p = 0 全暗，p > 0 且 p < 1 调暗，p = 1 原色， p > 1 调亮
+     * */
+    brightness(p: number): this;
+    /**
+     * 饱和度
+     * @param {number} p
+     * p = 0 完全灰度化，p = 1 原色，p > 1 增强饱和度
+     * */
+    saturate(p: number): this;
+    /**
+     * 对比度
+     * @param {number} p
+     *  p = 1 原色， p < 1 减弱对比度，p > 1 增强对比度
+     * */
+    contrast(p: number): this;
+    /**
+     * 透明度
+     * @param {number} p
+     * p = 0 全透明，p = 1 原色
+     * */
+    opacity(p: number): this;
+    /**
+     * 反色
+     * @param {number} p
+     * p = 0 原色， p = 1 完全反色
+     * */
+    invert(p: number): this;
+    /**
+     * 灰度
+     * @param {number} p 0~1
+     * */
+    grayscale(p?: number): this;
+    /**
+     * 深褐色
+     * @param {number} p 0~1
+     * */
+    sepia(p?: number): this;
+    /**
+     * 色相旋转，将色调沿极坐标转过deg角度
+     * @param {number} deg 0~360
+     * */
+    hueRotate(deg: number): this;
+    /**
+     * 色相旋转，将色调沿极坐标转过deg角度
+     * @param {number} deg 0~360
+     * */
+    /**
+     * 卷积
+     * @param {Matrix3} cKernel 3*3的矩阵
+     * @param {number} stStep 1 / 9
+     * @param {number} scaleFactor 521
+     * */
+    convolution(cKernel: THREE.Matrix3, stStep?: number, scaleFactor?: number): this;
+    /**
+     * 重置所有滤镜效果
+     * */
+    reset(): this;
+    _getFilterShaderData(texture: THREE.Texture): {
+        uniforms: {
+            e_Texture: {
+                value: three.Texture;
+            };
+            colorMatrix: {
+                value: three.Matrix4;
+            };
+        };
+        vertexShader: string;
+        fragmentShader: string;
+    };
+    _getFilterColor(color?: string | number | THREE.Color, opacity?: number): three.Color;
+    /** 转成JSON字符串 */
+    toJSON(): string;
+    /** 还原序列化的数据 */
+    static fromJSON(json: string): MxFilters;
+}
+
 /** 动态绘制形状
- * 基于THREE.Shape计算实现的2d形状 通过extrude3dConfig 配置可挤压缓冲为3d形状
+ * 基于THREE.Shape计算实现的形状
+ * 通过扩展可以实现各种2d 3d形状
  *  **/
 declare class MxDbShape extends MxDbEntity {
     protected _paths: THREE.CurvePath<THREE.Vector3 | THREE.Vector2>;
     protected points: THREE.Vector3[];
     protected closedLine: THREE.Curve<THREE.Vector3>;
+    protected isLoadMaterialFromPath: boolean;
+    protected material: THREE.MeshLambertMaterial | null;
     /** 描边颜色 */
     stroke: UnstableColor;
     setStroke(stroke: UnstableColor): this;
@@ -3375,12 +3494,28 @@ declare class MxDbShape extends MxDbEntity {
     /** 填充 */
     isFill: boolean;
     setIsFill(isFill: boolean): this;
+    /** 填充图片路径 */
+    fillImageSrc?: string;
+    setFillImageSrc(fillImageSrc: string): this;
+    /**
+    * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)
+    * */
+    fillImageParam: {
+        offset?: THREE.Vector2;
+        repeat?: THREE.Vector2;
+        rotation?: number;
+        center?: THREE.Vector2;
+    } | undefined;
     /** 线段细分数值 */
     curveSegments: number;
     setCurveSegments(curveSegments: number): this;
     /** 闭合 */
     closed: boolean;
     setClosed(closed: boolean): this;
+    /**
+     * 设置滤镜对象{@link MxFilters} 默认为undefined | null 则不使用该滤镜效果
+     * */
+    filter: MxFilters | undefined | null;
     /** 圆角半径 (一个向量点对应一个角的半径值)*/
     cornerRadius: number[] | number;
     /**
@@ -3403,13 +3538,13 @@ declare class MxDbShape extends MxDbEntity {
     _drawStoreLine(pWorldDraw: McGiWorldDraw, points: THREE.Vector3[], draw?: (pWorldDraw: McGiWorldDraw) => void): void;
     /** 获取线段闭合后的曲线点数 */
     getClosedPoints(points: THREE.Vector3[]): three.Vector3[];
-    /** 获取闭合线段 */
-    getClosedLine(points: THREE.Vector3[]): THREE.Curve<THREE.Vector3>;
     /** 获取长度 */
     getTotalLength(): number;
     /** 获取面积 */
     getArea(): number;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
+    /** 图片填充 */
+    _fillImg(pWorldDraw: McGiWorldDraw, points: THREE.Vector3[]): void;
     getGripPoints(): THREE.Vector3[];
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
     dwgIn(obj: any): boolean;
@@ -3456,6 +3591,9 @@ declare class MxDbEllipseShape extends MxDbShape {
     };
     /** 创建圆弧 */
     createEllipseCurve(x?: number, y?: number, xRadius?: number, yRadius?: number, startAngle?: number, endAngle?: number, clockwise?: boolean, rotation?: number): three.EllipseCurve;
+    /** 获取圆角的点集合(椭圆不需要) */
+    getCornerRadiusPoints(points: THREE.Vector3[]): three.Vector3[];
+    getClosedPoints(points: THREE.Vector3[]): THREE.Vector3[];
     getClosedLine(points: THREE.Vector3[]): three.CatmullRomCurve3;
     getGripPoints(): three.Vector3[];
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
@@ -3546,99 +3684,6 @@ declare class MxDbLine extends MxDbEntity {
     getGetLength(): number;
 }
 
-/** 简单颜色滤镜矩阵 */
-interface ChannelParamTypes {
-    r?: number;
-    g?: number;
-    b?: number;
-}
-declare class MxFilters {
-    private uniformObj;
-    private filtersStr;
-    private filtersTypes;
-    private VSHADER_SOURCE;
-    private FSHADER_SOURCE;
-    private _matrix;
-    /**
-     * 过滤或增强某个颜色通道
-     * @param {ChannelParamTypes}
-     * */
-    channel({ r, g, b }: ChannelParamTypes): this;
-    /**
-     * 改变亮度
-     * @param {number} p
-     * p = 0 全暗，p > 0 且 p < 1 调暗，p = 1 原色， p > 1 调亮
-     * */
-    brightness(p: number): this;
-    /**
-     * 饱和度
-     * @param {number} p
-     * p = 0 完全灰度化，p = 1 原色，p > 1 增强饱和度
-     * */
-    saturate(p: number): this;
-    /**
-     * 对比度
-     * @param {number} p
-     *  p = 1 原色， p < 1 减弱对比度，p > 1 增强对比度
-     * */
-    contrast(p: number): this;
-    /**
-     * 透明度
-     * @param {number} p
-     * p = 0 全透明，p = 1 原色
-     * */
-    opacity(p: number): this;
-    /**
-     * 反色
-     * @param {number} p
-     * p = 0 原色， p = 1 完全反色
-     * */
-    invert(p: number): this;
-    /**
-     * 灰度
-     * @param {number} p 0~1
-     * */
-    grayscale(p?: number): this;
-    /**
-     * 深褐色
-     * @param {number} p 0~1
-     * */
-    sepia(p?: number): this;
-    /**
-     * 色相旋转，将色调沿极坐标转过deg角度
-     * @param {number} deg 0~360
-     * */
-    hueRotate(deg: number): this;
-    /**
-     * 色相旋转，将色调沿极坐标转过deg角度
-     * @param {number} deg 0~360
-     * */
-    /**
-     * 卷积
-     * @param {Matrix3} cKernel 3*3的矩阵
-     * @param {number} stStep 1 / 9
-     * @param {number} scaleFactor 521
-     * */
-    convolution(cKernel: THREE.Matrix3, stStep?: number, scaleFactor?: number): this;
-    /**
-     * 重置所有滤镜效果
-     * */
-    reset(): this;
-    _getFilterShaderData(texture: THREE.Texture): {
-        uniforms: {
-            e_Texture: {
-                value: three.Texture;
-            };
-            colorMatrix: {
-                value: three.Matrix4;
-            };
-        };
-        vertexShader: string;
-        fragmentShader: string;
-    };
-    _getFilterColor(color?: string | number | THREE.Color, opacity?: number): three.Color;
-}
-
 /**
  * MxRectEntity 矩形对象.
  */
@@ -3879,10 +3924,7 @@ declare class MxDbCloudLine extends MxDbEntity {
     dwgOut(obj: any): object;
 }
 
-/**
- * MxDbRegularPolygon 正多边形
- */
-declare class MxDbRegularPolygon extends MxDbEntity {
+declare class MxDbRegularPolygon extends MxDbShape {
     /** 正多边形的中心点位置 */
     centerPoint: three.Vector3;
     /** 正多边形两条边之间的交点位置 */
@@ -3890,12 +3932,13 @@ declare class MxDbRegularPolygon extends MxDbEntity {
     /** 正多边形边的数量 */
     sidesNumber: number;
     getTypeName(): string;
+    /**
+     * MxDbRegularPolygon 正多边形
+     */
+    constructor();
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): THREE.Vector3[];
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
-    create(): MxDbEntity;
-    dwgIn(obj: any): boolean;
-    dwgOut(obj: any): object;
 }
 
 /** @module MxDbLeadComment*/
@@ -4002,7 +4045,7 @@ declare class SpriteText extends THREE.Sprite {
     underline: boolean;
     fontStyle: TextFontStyle;
     fontVariant: string;
-    private _genCanvas;
+    _genCanvas(): void;
     dispose(): void;
 }
 interface SpriteTextOptions {
@@ -4248,11 +4291,11 @@ declare class MxDbGradientLine extends MxDbEntity {
     dwgOut(obj: any): object;
 }
 
-/**
- * 根据中心点、椭圆开始点和结束点确定椭圆弧
- *  */
 declare class MxDbEllipseArc extends MxDbEllipseShape {
     getTypeName(): string;
+    /**
+     * 根据中心点、椭圆开始点和结束点确定椭圆弧
+     *  */
     constructor();
     /** 椭圆弧决定开始点 控制x轴半径和开始角度 */
     startPoint: THREE.Vector3;
@@ -4268,8 +4311,8 @@ declare class MxDbEllipseArc extends MxDbEllipseShape {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
 }
 
-/** 根据圆心、起始点、结束点位置动态绘制圆弧 **/
 declare class MxDbCircleArc extends MxDbCircleShape {
+    /** 根据圆心、起始点、结束点位置动态绘制圆弧 **/
     constructor();
     getTypeName(): string;
     /** 圆弧开始点 设置开始点将自动计算 radius、startAngle、endAngle */
@@ -4284,8 +4327,8 @@ declare class MxDbCircleArc extends MxDbCircleShape {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
 }
 
-/** 弧形 */
 declare class MxDbArcShape extends MxDbCircleArc {
+    /** 环形 */
     constructor();
     getTypeName(): string;
     create(): MxDbArcShape;
@@ -4298,9 +4341,9 @@ declare class MxDbArcShape extends MxDbCircleArc {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
 }
 
-/** 绘制弧形 */
 declare class MxDbArcShapeDraw extends MxDbArcShape {
     getTypeName(): string;
+    /** 绘制弧形 */
     constructor();
     outerRadiusPoint: three.Vector3;
     interRadiusPoint: three.Vector3;
@@ -4315,9 +4358,9 @@ declare class MxDbRingShape extends MxDbArcShape {
     worldDraw(pWorldDraw: McGiWorldDraw): void;
 }
 
-/** 星形 */
 declare class MxDbStarShape extends MxDbShape {
     getTypeName(): string;
+    /** 星形 */
     constructor();
     center: three.Vector3;
     numPoints: number;
@@ -4331,11 +4374,12 @@ declare class MxDbStarShape extends MxDbShape {
 /** 等边多边形 */
 declare class MxDbRegularPolygonShape extends MxDbShape {
     center: three.Vector3;
-    sides: number;
+    sidesNumber: number;
     radius: number;
     getTypeName(): string;
     constructor();
     worldDraw(pWorldDraw: McGiWorldDraw): void;
+    _drawPolygonShape(pWorldDraw: McGiWorldDraw): void;
     _getPoints(): {
         x: number;
         y: number;
@@ -4344,6 +4388,45 @@ declare class MxDbRegularPolygonShape extends MxDbShape {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
 }
 
+declare class MxDbArrow extends MxDbShape {
+    /** 箭头图形 */
+    constructor();
+    /** 开始是否为尖角 */
+    isSharpCorner: boolean;
+    /** 内部偏移量 */
+    innerOffset: number;
+    /** 外部偏移量 */
+    outerOffset: number;
+    /** 顶部偏移量 */
+    topOffset: number;
+    startPoint: three.Vector3;
+    endPoint: three.Vector3;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getArrowVertex(p1: THREE.Vector3, p2: THREE.Vector3, isSharpCorner?: boolean): three.Vector3[] | undefined;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/** 线形状 */
+declare class MxDbLineShape extends MxDbShape {
+    points: THREE.Vector3[];
+    setPoints(points: THREE.Vector3[]): this;
+    addPoint(point: THREE.Vector3): this;
+    removePoint(index: number): this;
+    constructor();
+    getTypeName(): string;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): Array<THREE.Vector3>;
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    /** 获取包围盒 */
+    getGeomExtents(): THREE.Box3 | null;
+    /**
+     * 返回曲线长度.
+     * @returns number
+     */
+    getGetLength(): number;
+}
+
 declare const Mx_loadCoreCode: typeof loadCoreCode;
 declare const Mx_useCanvasResizeListener: typeof useCanvasResizeListener;
 declare const Mx_store: typeof store;
@@ -4436,6 +4519,10 @@ type Mx_MxDbStarShape = MxDbStarShape;
 declare const Mx_MxDbStarShape: typeof MxDbStarShape;
 type Mx_MxDbRegularPolygonShape = MxDbRegularPolygonShape;
 declare const Mx_MxDbRegularPolygonShape: typeof MxDbRegularPolygonShape;
+type Mx_MxDbArrow = MxDbArrow;
+declare const Mx_MxDbArrow: typeof MxDbArrow;
+type Mx_MxDbLineShape = MxDbLineShape;
+declare const Mx_MxDbLineShape: typeof MxDbLineShape;
 declare namespace Mx {
   export {
     Mx_loadCoreCode as loadCoreCode,
@@ -4491,7 +4578,16 @@ declare namespace Mx {
     Mx_MxDbRingShape as MxDbRingShape,
     Mx_MxDbStarShape as MxDbStarShape,
     Mx_MxDbRegularPolygonShape as MxDbRegularPolygonShape,
+    Mx_MxDbArrow as MxDbArrow,
+    Mx_MxDbLineShape as MxDbLineShape,
   };
 }
 
-export { McEdGetPointWorldDrawObject, McGePoint3d, McGePoint3dArray, McGeTool, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MrxDbgUtils, Mx3PointArc, MxCADObject, MxDb2LineAngularDimension, MxDbAlignedDimension, MxDbAnyLine, MxDbArcShapeDraw, MxDbArea, MxDbCircleArc, MxDbCircleShape, MxDbCloudLine, MxDbCoord, MxDbDatabase, MxDbEllipse, MxDbEllipseArc, MxDbEllipseShape, MxDbEntity, MxDbGradientLine, MxDbGroup, MxDbHatch, MxDbImage, MxDbLayerTableRecord, MxDbLeadComment, MxDbLeadTag, MxDbLine, MxDbPolyline, MxDbRect, MxDbRectBoxLeadComment, MxDbRegularPolygon, MxDbRegularPolygonShape, MxDbRingShape, MxDbSVG, MxDbSVGText, MxDbShape, MxDbStarShape, MxDbText, MxDrawObject, MxFilters, MxFun, MxThreeJS, MxType, Mxassembly, Mx as default, loadCoreCode, store, useCanvasResizeListener };
+declare global {
+    type THREE = typeof THREE;
+    interface Window {
+        THREE: typeof THREE;
+    }
+}
+
+export { McEdGetPointWorldDrawObject, McGePoint3d, McGePoint3dArray, McGeTool, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MrxDbgUtils, Mx3PointArc, MxCADObject, MxDb2LineAngularDimension, MxDbAlignedDimension, MxDbAnyLine, MxDbArcShapeDraw, MxDbArea, MxDbArrow, MxDbCircleArc, MxDbCircleShape, MxDbCloudLine, MxDbCoord, MxDbDatabase, MxDbEllipse, MxDbEllipseArc, MxDbEllipseShape, MxDbEntity, MxDbGradientLine, MxDbGroup, MxDbHatch, MxDbImage, MxDbLayerTableRecord, MxDbLeadComment, MxDbLeadTag, MxDbLine, MxDbLineShape, MxDbPolyline, MxDbRect, MxDbRectBoxLeadComment, MxDbRegularPolygon, MxDbRegularPolygonShape, MxDbRingShape, MxDbSVG, MxDbSVGText, MxDbShape, MxDbStarShape, MxDbText, MxDrawObject, MxFilters, MxFun, MxThreeJS, MxType, Mxassembly, Mx as default, loadCoreCode, store, useCanvasResizeListener };

package/dist/lib/MxModule/MxDbArcShape/index.d.ts

@@ -1,7 +1,7 @@
 import McGiWorldDraw from "../McGiWorldDraw";
 import MxDbCircleArc from "../MxDbCircleArc";
-/** 弧形 */
 export default class MxDbArcShape extends MxDbCircleArc {
+    /** 环形 */
     constructor();
     getTypeName(): string;
     create(): MxDbArcShape;

package/dist/lib/MxModule/MxDbArcShapeDraw/index.d.ts

@@ -1,8 +1,8 @@
 import McGiWorldDraw from "../McGiWorldDraw";
 import MxDbArcShape from "../MxDbArcShape";
-/** 绘制弧形 */
 export default class MxDbArcShapeDraw extends MxDbArcShape {
     getTypeName(): string;
+    /** 绘制弧形 */
     constructor();
     outerRadiusPoint: import("three").Vector3;
     interRadiusPoint: import("three").Vector3;

package/dist/lib/MxModule/MxDbArrow/index.d.ts

@@ -0,0 +1,20 @@
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbShape from "../MxDbShape";
+export default class MxDbArrow extends MxDbShape {
+    /** 箭头图形 */
+    constructor();
+    /** 开始是否为尖角 */
+    isSharpCorner: boolean;
+    /** 内部偏移量 */
+    innerOffset: number;
+    /** 外部偏移量 */
+    outerOffset: number;
+    /** 顶部偏移量 */
+    topOffset: number;
+    startPoint: import("three").Vector3;
+    endPoint: import("three").Vector3;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getArrowVertex(p1: THREE.Vector3, p2: THREE.Vector3, isSharpCorner?: boolean): import("three").Vector3[] | undefined;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}

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

@@ -0,0 +1 @@
+import MxDbShape from"../MxDbShape";export default class MxDbArrow extends MxDbShape{constructor(){super(),this.isSharpCorner=!0,this.innerOffset=10,this.outerOffset=22,this.topOffset=36,this.startPoint=new THREE.Vector3,this.endPoint=new THREE.Vector3,this._propertyDbKeys=[...this._propertyDbKeys,"outerOffset","topOffset","innerOffset","isSharpCorner","startPoint","endPoint"]}worldDraw(t){const e=this.getArrowVertex(this.startPoint,this.endPoint);e&&(this._draw(t,e),this._drawStoreLine(t,e))}getArrowVertex(t,e,r=this.isSharpCorner){let{innerOffset:s,topOffset:n,outerOffset:o}=this;const i=[];i[3]=e;const x=Math.sqrt((t.x-e.x)*(t.x-e.x)+(t.y-e.y)*(t.y-e.y));if(0===x)return;const h=-(e.x-t.x)/x,y=(e.y-t.y)/x,a=t.x+s,f=t.y+x-n,d=t.x+o,E=t.y+x-n,p=t.x-s,c=t.y+x-n,w=t.x-o,P=t.y+x-n;return r?(i[0]=t,i[6]=i[0]):(i[0]=new THREE.Vector3(t.x-(p-t.x)*y,t.y-(p-t.x)*h),i[6]=new THREE.Vector3(t.x+(p-t.x)*y,t.y+(p-t.x)*h),i[7]=i[0]),i[1]=new THREE.Vector3(t.x+(a-t.x)*y-(f-t.y)*h,t.y+(a-t.x)*h+(f-t.y)*y),i[2]=new THREE.Vector3(t.x+(d-t.x)*y-(E-t.y)*h,t.y+(d-t.x)*h+(E-t.y)*y),i[4]=new THREE.Vector3(t.x+(w-t.x)*y-(P-t.y)*h,t.y+(w-t.x)*h+(P-t.y)*y),i[5]=new THREE.Vector3(t.x+(p-t.x)*y-(c-t.y)*h,t.y+(p-t.x)*h+(c-t.y)*y),i}getGripPoints(){const t=new THREE.Vector3;return new THREE.Line3(this.startPoint,this.endPoint).getCenter(t),[this.startPoint,t,this.endPoint]}moveGripPointsAt(t,e){return 0===t&&this.startPoint.add(e),1===t&&(this.startPoint.add(e),this.endPoint.add(e)),2===t&&this.endPoint.add(e),!0}};

package/dist/lib/MxModule/MxDbCircleArc/index.d.ts

@@ -1,7 +1,7 @@
 import McGiWorldDraw from "../McGiWorldDraw";
 import MxDbCircleShape from "../MxDbCircleShape";
-/** 根据圆心、起始点、结束点位置动态绘制圆弧 **/
 export default class MxDbCircleArc extends MxDbCircleShape {
+    /** 根据圆心、起始点、结束点位置动态绘制圆弧 **/
     constructor();
     getTypeName(): string;
     /** 圆弧开始点 设置开始点将自动计算 radius、startAngle、endAngle */

package/dist/lib/MxModule/MxDbEllipseArc/index.d.ts

@@ -1,10 +1,10 @@
 import McGiWorldDraw from "../McGiWorldDraw";
 import MxDbEllipseShape from "../MxDbEllipseShape";
-/**
- * 根据中心点、椭圆开始点和结束点确定椭圆弧
- *  */
 export default class MxDbEllipseArc extends MxDbEllipseShape {
     getTypeName(): string;
+    /**
+     * 根据中心点、椭圆开始点和结束点确定椭圆弧
+     *  */
     constructor();
     /** 椭圆弧决定开始点 控制x轴半径和开始角度 */
     startPoint: THREE.Vector3;

package/dist/lib/MxModule/MxDbEllipseShape/index.d.ts

@@ -40,6 +40,9 @@ export default class MxDbEllipseShape extends MxDbShape {
     };
     /** 创建圆弧 */
     createEllipseCurve(x?: number, y?: number, xRadius?: number, yRadius?: number, startAngle?: number, endAngle?: number, clockwise?: boolean, rotation?: number): import("three").EllipseCurve;
+    /** 获取圆角的点集合(椭圆不需要) */
+    getCornerRadiusPoints(points: THREE.Vector3[]): import("three").Vector3[];
+    getClosedPoints(points: THREE.Vector3[]): THREE.Vector3[];
     getClosedLine(points: THREE.Vector3[]): import("three").CatmullRomCurve3;
     getGripPoints(): import("three").Vector3[];
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;

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

@@ -1 +1 @@
-import MxDbShape from"../MxDbShape";export default class MxDbEllipseShape extends MxDbShape{constructor(){super(),this.center=new THREE.Vector3,this.xRadius=10,this.yRadius=10,this.startAngle=0,this.endAngle=2*Math.PI,this.clockwise=!1,this.rotation=0,this.isClosedToCenter=!0,this._propertyDbKeys=[...this._propertyDbKeys,"center","xRadius","yRadius","startAngle","endAngle","clockwise","rotation","isClosedToCenter"]}getTypeName(){return"MxDbEllipseShape"}setCenter(t){return this.center=t,this}setXRadius(t){return this.xRadius=t,this}setYRadius(t){return this.yRadius=t,this}setStartAngle(t){return this.startAngle=t,this}setEndAngle(t){return this.endAngle=t,this}setClockwise(t){return this.clockwise=t,this}setRotation(t){return this.rotation=t,this}setIsClosedToCenter(t){return this.isClosedToCenter=t,this}worldDraw(t){this.drawEllipseShape(t)}drawEllipseShape(t){let{startAngle:e,endAngle:s,clockwise:r}=this;const i=this.createEllipseCurve(),n=this.createPaths(i);let a,l=this.getShapePoints(n);return this._draw(t,l),this._drawStoreLine(t,l),{centralAngle:a=r?s>e?THREE.MathUtils.radToDeg(i.aEndAngle-i.aStartAngle):360-Math.abs(THREE.MathUtils.radToDeg(i.aEndAngle-i.aStartAngle)):e>s?Math.abs(THREE.MathUtils.radToDeg(i.aEndAngle-i.aStartAngle)):360-THREE.MathUtils.radToDeg(i.aEndAngle-i.aStartAngle),curve:i,points:l}}createEllipseCurve(t=this.center.x,e=this.center.y,s=this.xRadius,r=this.yRadius,i=this.startAngle,n=this.endAngle,a=this.clockwise,l=this.rotation){return new THREE.EllipseCurve(t,e,s,r,i,n,a,l)}getClosedLine(t){const{isClosedToCenter:e,center:s}=this;let r=e?[t[t.length-1],s,t[0]]:[t[t.length-1],t[0]];return new THREE.CatmullRomCurve3(r,!1,"catmullrom",.01)}getGripPoints(){return[this.center]}moveGripPointsAt(t,e){return 0===t&&this.center.add(e),!0}};
+import MxDbShape from"../MxDbShape";export default class MxDbEllipseShape extends MxDbShape{constructor(){super(),this.center=new THREE.Vector3,this.xRadius=10,this.yRadius=10,this.startAngle=0,this.endAngle=2*Math.PI,this.clockwise=!1,this.rotation=0,this.isClosedToCenter=!0,this._propertyDbKeys=[...this._propertyDbKeys,"center","xRadius","yRadius","startAngle","endAngle","clockwise","rotation","isClosedToCenter"]}getTypeName(){return"MxDbEllipseShape"}setCenter(t){return this.center=t,this}setXRadius(t){return this.xRadius=t,this}setYRadius(t){return this.yRadius=t,this}setStartAngle(t){return this.startAngle=t,this}setEndAngle(t){return this.endAngle=t,this}setClockwise(t){return this.clockwise=t,this}setRotation(t){return this.rotation=t,this}setIsClosedToCenter(t){return this.isClosedToCenter=t,this}worldDraw(t){this.drawEllipseShape(t)}drawEllipseShape(t){let{startAngle:e,endAngle:s,clockwise:i}=this;const r=this.createEllipseCurve(),n=this.createPaths(r);let a,h=this.getShapePoints(n);return this._draw(t,h),this._drawStoreLine(t,h),{centralAngle:a=i?s>e?THREE.MathUtils.radToDeg(r.aEndAngle-r.aStartAngle):360-Math.abs(THREE.MathUtils.radToDeg(r.aEndAngle-r.aStartAngle)):e>s?Math.abs(THREE.MathUtils.radToDeg(r.aEndAngle-r.aStartAngle)):360-THREE.MathUtils.radToDeg(r.aEndAngle-r.aStartAngle),curve:r,points:h}}createEllipseCurve(t=this.center.x,e=this.center.y,s=this.xRadius,i=this.yRadius,r=this.startAngle,n=this.endAngle,a=this.clockwise,h=this.rotation){return new THREE.EllipseCurve(t,e,s,i,r,n,a,h)}getCornerRadiusPoints(t){return t}getClosedPoints(t){try{let e=(this._paths||new THREE.CatmullRomCurve3(t,!1,"catmullrom",0)).getLength();this.closedLine=this.getClosedLine(t);const s=this.closedLine.getLength();let i=this.curveSegments/e,r=2.5*(e>this.curveSegments?s*i:1);if(r>20*this.curveSegments&&(r=20*this.curveSegments),r<=0)return t;const n=this.closedLine.getPoints(r);return[...t,...n]}catch(e){return[...t,t[0]]}}getClosedLine(t){const{isClosedToCenter:e,center:s}=this;let i=e?[t[t.length-1],s,t[0]]:[t[t.length-1],t[0]];return new THREE.CatmullRomCurve3(i,!1,"catmullrom",.01)}getGripPoints(){return[this.center]}moveGripPointsAt(t,e){return 0===t&&this.center.add(e),!0}};

package/dist/lib/MxModule/MxDbEntity/index.d.ts

@@ -352,4 +352,14 @@ export default abstract class MxDbEntity {
      * @returns void
      */
     removeEvent(name: string): void;
+    /**
+    * 把一个对象变成一个json字体串.
+    * @returns void
+    */
+    toJsonString(type?: MxType.MxCloneType): string;
+    /**
+     * 从一个josn字符串加载数据.
+     * @returns void
+     */
+    fromJsonString(str: string): boolean;
 }

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

@@ -1 +1 @@
-import _ from"lodash";import MxType from"../MxType";import store from"../store";export var DataType;!function(t){t[t.Default=0]="Default",t[t.Color=1]="Color",t[t.Vector2=2]="Vector2",t[t.Vector3=3]="Vector3",t[t.Vector4=4]="Vector4",t[t.Matrix3=5]="Matrix3",t[t.Matrix4=6]="Matrix4"}(DataType||(DataType={}));export const MXDBDATATYPE="datatype";const propertyDbKeys=["color","renderOrder","opacity","visible","userData","sGuid","dLineWidth","lineWidthByPixels","dDashArray","dDashRatio","layer"];function getDwgKeyVal(t,e){let i,r="";return _.isObject(e)?(i=e.default,r=e.key):"string"==typeof e&&(r=e),[r,void 0===t[r]?i:t[r]]}export default class MxDbEntity{constructor(){this.color=16777215,this.renderOrder=30,this.opacity=1,this.visible=!0,this.userData={},this.sGuid="",this.dLineWidth=0,this.lineWidthByPixels=!0,this.dDashArray=0,this.dDashRatio=0,this.layer="",this._event={}}initGuid(t){this.sGuid.length>0?console.log("mx: init guid error"):this.sGuid=t}dwgInHelp(t,e,i){let r=this;const s=t.type===MxType.MxCloneType.kMxFileClone||t.type===MxType.MxCloneType.kSaveDwgClone,a=t=>{if(!t)return;const{value:e,[MXDBDATATYPE]:r}=t;switch(r){case DataType.Color:return new THREE.Color(...e);case DataType.Vector2:return new THREE.Vector2(...e);case DataType.Vector3:return new THREE.Vector3(...e);case DataType.Vector4:return new THREE.Vector4(...e);case DataType.Matrix3:return(new THREE.Matrix3).fromArray(e);case DataType.Matrix4:return(new THREE.Matrix4).fromArray(e)}return i&&i.getCacheVal?i.getCacheVal(t):void 0};function n(t){return t instanceof THREE.Color||t instanceof THREE.Vector2||t instanceof THREE.Vector3||t instanceof THREE.Vector4||t instanceof THREE.Matrix3||t instanceof THREE.Matrix4?t.clone():i&&i.getVal?i.getVal(t):void 0}return e.forEach(e=>{const[i,h]=getDwgKeyVal(t,e);r[i]=_.cloneDeepWith(h,s?a:n)}),!0}dwgOutHelp(t,e){const i=t=>t instanceof THREE.Color?{[MXDBDATATYPE]:DataType.Color,value:t.toArray()}:t instanceof THREE.Vector2?{[MXDBDATATYPE]:DataType.Vector2,value:t.toArray()}:t instanceof THREE.Vector3?{[MXDBDATATYPE]:DataType.Vector3,value:t.toArray()}:t instanceof THREE.Vector4?{[MXDBDATATYPE]:DataType.Vector4,value:t.toArray()}:t instanceof THREE.Matrix3?{[MXDBDATATYPE]:DataType.Matrix3,value:t.toArray()}:t instanceof THREE.Matrix4?{[MXDBDATATYPE]:DataType.Matrix4,value:t.toArray()}:void 0;let r=this;const s=t.type===MxType.MxCloneType.kMxFileClone||t.type===MxType.MxCloneType.kSaveDwgClone;return e.forEach(e=>{const[a,n]=getDwgKeyVal(r,e);t[a]=s?_.cloneDeepWith(n,i):n}),t}callEvent(t,e){return void 0!=this._event[t]?this._event[t](e):void 0}create(t){return new(0,this.constructor)(t)}transformBy(t){}getGeomExtents(){return null}getClosestPointTo(t,e=0){return null}getImp(){return this.MxDbEntityImp}setNeedUpdateDisplay(t){let e=this.getImp();return!!e&&(t?e.upDisplay():e.setDirtyDisplay(!0),!0)}getMxObject(){let t=this.getImp();return t?t.getMxObject():null}onViewChange(){return!1}objectId(){let t=this.getImp();return t?t.objectId():0}erase(){let t=this.getImp();return!!t&&t.erase()}setLayer(t){let e=this.getImp();e&&e.nodifySetLayer(),this.layer=t}getLayer(){return this.layer}setColor(t){return this.color=t,this}getColor(){return this.color||16777215}clone(t){let e=this.create(),i={type:t||MxType.MxCloneType.kClone};return this.dwgOut(i),e.dwgIn(i),e.sGuid="",e}onDwgIn(t){this.color=t.color,this.renderOrder=t.renderOrder,this.opacity=t.opacity,this.visible=t.visible,t.userData?this.userData=JSON.parse(JSON.stringify(t.userData)):this.userData={},this.dLineWidth=t.lineWidth,this.lineWidthByPixels=t.lineWidthByPixels,this.dDashArray=t.dashArray,this.dDashRatio=t.dashRatio,this.layer=t.layer,t.guid&&(this.sGuid=t.guid)}onDwgOut(t){t.color=this.color,t.renderOrder=this.renderOrder,t.opacity=this.opacity,t.visible=this.visible,t.lineWidth=this.dLineWidth,t.lineWidthByPixels=this.lineWidthByPixels,t.dashArray=this.dDashArray,t.dashRatio=this.dDashRatio,t.layer=this.layer,t.guid=this.sGuid,Object.keys(this.userData).length>0&&(t.userData=this.userData)}rxInit(){store.state.MxFun.initMxDbEntityType(this)}setRenderOrder(t){this.renderOrder=t}getRenderOrder(){return this.renderOrder}setLineWidthByPixels(t){return this.lineWidthByPixels=t,this}getLineWidthByPixels(){return this.lineWidthByPixels}setLineWidth(t){return this.dLineWidth=t,this}getLineWidth(){return this.dLineWidth}getGetLength(){return 0}setDashLen(t){let e=this.getGetLength();if(e<1e-6||t<1e-6)return this;let i=Math.floor(e/t);return i<1e-6&&(this.dDashRatio=0),this.dDashArray=1/i,this}setDashRatio(t){return this.dDashRatio=t,this}setDashArray(t){return this.dDashArray=t,this}setDash(t,e){return this.dDashArray=t,this.dDashRatio=e,0==this.dLineWidth&&(this.dLineWidth=6,this.lineWidthByPixels=!0),this}getDash(){return{dDashArray:this.dDashArray,dDashRatio:this.dDashRatio}}setDashLineDisplay(t){return t?(this.dDashArray<1e-5&&(this.dDashArray=.03),this.dDashRatio<1e-5&&(this.dDashRatio=.1),0==this.dLineWidth&&(this.dLineWidth=6,this.lineWidthByPixels=!0)):(this.dDashArray=0,this.dDashRatio=0),this}isDashLineDisplay(){return this.dDashArray>0&&this.dDashRatio>0}guid(){return this.sGuid}onEndGripEidt(){this.callEvent("onEndGripEidt")}onStartGripEidt(){return this.callEvent("onStartGripEidt")}addEvent(t,e){this._event[t]=e}removeEvent(t){this._event[t]=void 0}};
+import _ from"lodash";import MxType from"../MxType";import store from"../store";export var DataType;!function(t){t[t.Default=0]="Default",t[t.Color=1]="Color",t[t.Vector2=2]="Vector2",t[t.Vector3=3]="Vector3",t[t.Vector4=4]="Vector4",t[t.Matrix3=5]="Matrix3",t[t.Matrix4=6]="Matrix4"}(DataType||(DataType={}));export const MXDBDATATYPE="datatype";const propertyDbKeys=["color","renderOrder","opacity","visible","userData","sGuid","dLineWidth","lineWidthByPixels","dDashArray","dDashRatio","layer"];function getDwgKeyVal(t,e){let i,r="";return _.isObject(e)?(i=e.default,r=e.key):"string"==typeof e&&(r=e),[r,void 0===t[r]?i:t[r]]}export default class MxDbEntity{constructor(){this.color=16777215,this.renderOrder=30,this.opacity=1,this.visible=!0,this.userData={},this.sGuid="",this.dLineWidth=0,this.lineWidthByPixels=!0,this.dDashArray=0,this.dDashRatio=0,this.layer="",this._event={}}initGuid(t){this.sGuid.length>0?console.log("mx: init guid error"):this.sGuid=t}dwgInHelp(t,e,i){let r=this;const s=t.type===MxType.MxCloneType.kMxFileClone||t.type===MxType.MxCloneType.kSaveDwgClone,a=t=>{if(!t)return;const{value:e,[MXDBDATATYPE]:r}=t;switch(r){case DataType.Color:return new THREE.Color(...e);case DataType.Vector2:return new THREE.Vector2(...e);case DataType.Vector3:return new THREE.Vector3(...e);case DataType.Vector4:return new THREE.Vector4(...e);case DataType.Matrix3:return(new THREE.Matrix3).fromArray(e);case DataType.Matrix4:return(new THREE.Matrix4).fromArray(e)}return i&&i.getCacheVal?i.getCacheVal(t):void 0};function n(t){return t instanceof THREE.Color||t instanceof THREE.Vector2||t instanceof THREE.Vector3||t instanceof THREE.Vector4||t instanceof THREE.Matrix3||t instanceof THREE.Matrix4?t.clone():i&&i.getVal?i.getVal(t):void 0}return e.forEach(e=>{const[i,o]=getDwgKeyVal(t,e);r[i]=_.cloneDeepWith(o,s?a:n)}),!0}dwgOutHelp(t,e){const i=t=>t instanceof THREE.Color?{[MXDBDATATYPE]:DataType.Color,value:t.toArray()}:t instanceof THREE.Vector2?{[MXDBDATATYPE]:DataType.Vector2,value:t.toArray()}:t instanceof THREE.Vector3?{[MXDBDATATYPE]:DataType.Vector3,value:t.toArray()}:t instanceof THREE.Vector4?{[MXDBDATATYPE]:DataType.Vector4,value:t.toArray()}:t instanceof THREE.Matrix3?{[MXDBDATATYPE]:DataType.Matrix3,value:t.toArray()}:t instanceof THREE.Matrix4?{[MXDBDATATYPE]:DataType.Matrix4,value:t.toArray()}:void 0;let r=this;const s=t.type===MxType.MxCloneType.kMxFileClone||t.type===MxType.MxCloneType.kSaveDwgClone;return e.forEach(e=>{const[a,n]=getDwgKeyVal(r,e);t[a]=s?_.cloneDeepWith(n,i):n}),t}callEvent(t,e){return void 0!=this._event[t]?this._event[t](e):void 0}create(t){return new(0,this.constructor)(t)}transformBy(t){}getGeomExtents(){return null}getClosestPointTo(t,e=0){return null}getImp(){return this.MxDbEntityImp}setNeedUpdateDisplay(t){let e=this.getImp();return!!e&&(t?e.upDisplay():e.setDirtyDisplay(!0),!0)}getMxObject(){let t=this.getImp();return t?t.getMxObject():null}onViewChange(){return!1}objectId(){let t=this.getImp();return t?t.objectId():0}erase(){let t=this.getImp();return!!t&&t.erase()}setLayer(t){let e=this.getImp();e&&e.nodifySetLayer(),this.layer=t}getLayer(){return this.layer}setColor(t){return this.color=t,this}getColor(){return this.color||16777215}clone(t){let e=this.create(),i={type:t||MxType.MxCloneType.kClone};return this.dwgOut(i),e.dwgIn(i),e.sGuid="",e}onDwgIn(t){this.color=t.color,this.renderOrder=t.renderOrder,this.opacity=t.opacity,this.visible=t.visible,t.userData?this.userData=JSON.parse(JSON.stringify(t.userData)):this.userData={},this.dLineWidth=t.lineWidth,this.lineWidthByPixels=t.lineWidthByPixels,this.dDashArray=t.dashArray,this.dDashRatio=t.dashRatio,this.layer=t.layer,t.guid&&(this.sGuid=t.guid)}onDwgOut(t){t.color=this.color,t.renderOrder=this.renderOrder,t.opacity=this.opacity,t.visible=this.visible,t.lineWidth=this.dLineWidth,t.lineWidthByPixels=this.lineWidthByPixels,t.dashArray=this.dDashArray,t.dashRatio=this.dDashRatio,t.layer=this.layer,t.guid=this.sGuid,Object.keys(this.userData).length>0&&(t.userData=this.userData)}rxInit(){store.state.MxFun.initMxDbEntityType(this)}setRenderOrder(t){this.renderOrder=t}getRenderOrder(){return this.renderOrder}setLineWidthByPixels(t){return this.lineWidthByPixels=t,this}getLineWidthByPixels(){return this.lineWidthByPixels}setLineWidth(t){return this.dLineWidth=t,this}getLineWidth(){return this.dLineWidth}getGetLength(){return 0}setDashLen(t){let e=this.getGetLength();if(e<1e-6||t<1e-6)return this;let i=Math.floor(e/t);return i<1e-6&&(this.dDashRatio=0),this.dDashArray=1/i,this}setDashRatio(t){return this.dDashRatio=t,this}setDashArray(t){return this.dDashArray=t,this}setDash(t,e){return this.dDashArray=t,this.dDashRatio=e,0==this.dLineWidth&&(this.dLineWidth=6,this.lineWidthByPixels=!0),this}getDash(){return{dDashArray:this.dDashArray,dDashRatio:this.dDashRatio}}setDashLineDisplay(t){return t?(this.dDashArray<1e-5&&(this.dDashArray=.03),this.dDashRatio<1e-5&&(this.dDashRatio=.1),0==this.dLineWidth&&(this.dLineWidth=6,this.lineWidthByPixels=!0)):(this.dDashArray=0,this.dDashRatio=0),this}isDashLineDisplay(){return this.dDashArray>0&&this.dDashRatio>0}guid(){return this.sGuid}onEndGripEidt(){this.callEvent("onEndGripEidt")}onStartGripEidt(){return this.callEvent("onStartGripEidt")}addEvent(t,e){this._event[t]=e}removeEvent(t){this._event[t]=void 0}toJsonString(t=MxType.MxCloneType.kMxFileClone){let e={type:t};return this.dwgOut(e),e.TypeName=this.getTypeName(),JSON.stringify(e)}fromJsonString(t){let e=JSON.parse(t);return(e.type==MxType.MxCloneType.kMxFileClone||e.type==MxType.MxCloneType.kClone)&&this.dwgIn(e)}};

package/dist/lib/MxModule/MxDbLineShape/index.d.ts

@@ -0,0 +1,21 @@
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbShape from "../MxDbShape";
+/** 线形状 */
+export default class MxDbLineShape extends MxDbShape {
+    points: THREE.Vector3[];
+    setPoints(points: THREE.Vector3[]): this;
+    addPoint(point: THREE.Vector3): this;
+    removePoint(index: number): this;
+    constructor();
+    getTypeName(): string;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): Array<THREE.Vector3>;
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    /** 获取包围盒 */
+    getGeomExtents(): THREE.Box3 | null;
+    /**
+     * 返回曲线长度.
+     * @returns number
+     */
+    getGetLength(): number;
+}

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

@@ -0,0 +1 @@
+import MxDbShape from"../MxDbShape";export default class MxDbLineShape extends MxDbShape{constructor(){super(),this.points=[],this._propertyDbKeys=[...this._propertyDbKeys,"points"]}setPoints(t){return this.points=t,this}addPoint(t){return this.points.push(t),this}removePoint(t){return this.points.splice(t,1),this}getTypeName(){return"MxDbLineShape"}worldDraw(t){this._draw(t,this.points),this._drawStoreLine(t,this.points)}getGripPoints(){return this.points}moveGripPointsAt(t,s){return this.points[t].add(s),!0}getGeomExtents(){return(new THREE.Box3).setFromPoints(this.points)}getGetLength(){let t=0;for(let s=0;s++;s<this.points.length)this.points[s+1]&&(t+=this.points[s].distanceTo(this.points[s+1]));return t}};