mxdraw 0.1.118 → 0.1.120

package/dist/index.d.ts

@@ -1752,6 +1752,15 @@ declare class MxDrawObject {
    * ```
    */
     getMxObjectImplement(): any;
+    /**
+    * 得到所有布局名
+    * @example
+    * ```typescript
+    *
+    *
+    * ```
+    */
+    getAllLayoutName(): string[];
 }
 
 /**
@@ -3161,10 +3170,14 @@ declare class MxDbSVGText {
     move: boolean;
     /** 文字移动到距图片远处，自动绘制一个连接线 */
     drawConnectingLine: boolean;
+    /** 连接线的临时绘制对象 */
+    _connectingLine: THREE.Line | null;
     /** 字体样式 */
     fontStyle: string;
     /** 下划线 */
     underline: boolean;
+    /** 下划线的临时绘制对象 */
+    _underLine: THREE.Line | null;
 }
 
 /** @module MxDbSVG*/
@@ -3343,21 +3356,143 @@ declare class MxDb2LineAngularDimension extends MxDbEntity {
     getTypeName(): string;
 }
 
-/**
- * Mx3PointArc 对象.
- * 通过三个坐标点绘制一段圆弧
- */
-declare class Mx3PointArc extends MxDbEntity {
+/** 动态绘制形状
+ * 基于THREE.Shape计算实现的2d形状 通过extrude3dConfig 配置可挤压缓冲为3d形状
+ *  **/
+declare class MxDbShape extends MxDbEntity {
+    protected _paths: THREE.CurvePath<THREE.Vector3 | THREE.Vector2>;
+    protected points: THREE.Vector3[];
+    protected closedLine: THREE.Curve<THREE.Vector3>;
+    /** 描边颜色 */
+    stroke: UnstableColor;
+    setStroke(stroke: UnstableColor): this;
+    /** 描边线段的宽度 */
+    strokeLineWidth: number;
+    setStrokeLineWidth(strokeLineWidth: number): this;
+    /** 描边是否为虚线 */
+    isStrokeDashLine: boolean;
+    setIsStrokeDashLine(isStrokeDashLine: boolean): this;
+    /** 填充 */
+    isFill: boolean;
+    setIsFill(isFill: boolean): this;
+    /** 线段细分数值 */
+    curveSegments: number;
+    setCurveSegments(curveSegments: number): this;
+    /** 闭合 */
+    closed: boolean;
+    setClosed(closed: boolean): this;
+    /** 圆角半径 (一个向量点对应一个角的半径值)*/
+    cornerRadius: number[] | number;
+    /**
+     * 设置圆角 圆角的半径（如果参数为数组则一个角度对应一个圆角半径）
+     * @param { number | number[] } radius 圆角半径 为数组时[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4； 或者直接设置半径值 则四个角统一半径
+     * */
+    setCornerRadius(radius: number | number[], isScreenCoord?: boolean): void;
+    /** 需要输入和输出的属性 */
+    protected _propertyDbKeys: string[];
+    getTypeName(): string;
+    /** 获取坐标集合 */
+    getShapePoints(paths: THREE.CurvePath<THREE.Vector3 | THREE.Vector2>): three.Vector3[];
+    /*** 创建路径 */
+    createPaths(shapes: THREE.Curve<THREE.Vector3 | THREE.Vector2> | THREE.Curve<THREE.Vector3 | THREE.Vector2>[]): three.CurvePath<three.Vector3 | three.Vector2>;
+    /** 动态绘制函数*/
+    _draw(pWorldDraw: McGiWorldDraw, vertices: THREE.Vector3[]): void;
+    /** 获取生成圆角后的点 */
+    getCornerRadiusPoints(points: THREE.Vector3[]): three.Vector3[];
+    /** 绘制描边 */
+    _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;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    dwgIn(obj: any): boolean;
+    dwgOut(obj: any): object;
+}
+
+/*** 椭圆(弧)形状 */
+declare class MxDbEllipseShape extends MxDbShape {
+    constructor();
+    getTypeName(): string;
+    /** 弧中心点 */
+    center: three.Vector3;
+    setCenter(center: THREE.Vector3): this;
+    /** X轴椭圆弧半径 默认当前坐标转换下的10像素 */
+    xRadius: number;
+    setXRadius(xRadius: number): this;
+    /**  Y轴椭圆弧半径 默认当前坐标转换下的10像素 */
+    yRadius: number;
+    setYRadius(yRadius: number): this;
+    /** 弧开始角度 默认0*/
+    startAngle: number;
+    setStartAngle(startAngle: number): this;
+    /** 弧结束角度 默认0*/
+    endAngle: number;
+    setEndAngle(endAngle: number): this;
+    /** 以顺时针方向创建（扫过）弧线 默认false */
+    clockwise: boolean;
+    setClockwise(clockwise: boolean): this;
+    /** 旋转角度 */
+    rotation: number;
+    setRotation(rotation: number): this;
+    /** 是否闭合到中心位置 */
+    isClosedToCenter: boolean;
+    setIsClosedToCenter(isClosedToCenter: boolean): this;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    /** 绘制椭圆形状 */
+    drawEllipseShape(pWorldDraw: McGiWorldDraw): {
+        /** 圆心角 */
+        centralAngle: number;
+        /** 圆弧曲线 */
+        curve: three.EllipseCurve;
+        /** 构成圆弧的向量点 */
+        points: three.Vector3[];
+    };
+    /** 创建圆弧 */
+    createEllipseCurve(x?: number, y?: number, xRadius?: number, yRadius?: number, startAngle?: number, endAngle?: number, clockwise?: boolean, rotation?: number): three.EllipseCurve;
+    getClosedLine(points: THREE.Vector3[]): three.CatmullRomCurve3;
+    getGripPoints(): three.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/*** 圆(弧)形状 */
+declare class MxDbCircleShape extends MxDbEllipseShape {
+    getTypeName(): string;
+    /*** 圆半径 */
+    get radius(): number;
+    set radius(radius: number);
+    setRadius(radius: number): this;
+    setXRadius(xRadius: number): this;
+    setYRadius(yRadius: number): this;
+}
+
+/** 三点动态绘制圆弧 point1圆弧起始点 point2是圆弧结束点, point3圆弧任意一点  */
+declare class Mx3PointArc extends MxDbCircleShape {
+    constructor();
     point1: three.Vector3;
     point2: three.Vector3;
     point3: three.Vector3;
+    /** 自动确定顺逆时针绘制 */
+    autoClockwise: boolean;
     getTypeName(): string;
-    create(): MxDbEntity;
+    create(): Mx3PointArc;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): THREE.Vector3[];
+    /** 计算三个控制点的角度 */
+    compute3PointAngle(): number[];
+    /** 根据三个控制点更新圆心 */
+    upDateCenter(point1: THREE.Vector3, point2: THREE.Vector3, point3: THREE.Vector3): three.Vector3;
+    /** 根据圆心和一个控制点自动更新半径大小 */
+    upDateRadius(point: THREE.Vector3): number;
+    /** 根据 三个控制点到圆心的角度  更新顺逆时针绘制 */
+    upDataClockwise(angle1: number, angle2: number, angle3: number): void;
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
-    dwgIn(obj: any): boolean;
-    dwgOut(obj: any): object;
 }
 
 /** @module MxDbCoord*/
@@ -3820,25 +3955,28 @@ declare class MxDbRectBoxLeadComment extends MxDbEntity {
     protected onViewChange(): boolean;
 }
 
-/**
- * MxDbEllipse 通过矩形绘制的椭圆
- */
-declare class MxDbEllipse extends MxDbEntity {
-    /** 矩形的开始点 */
+/** 通过两个构成矩形的点绘制椭圆形 */
+declare class MxDbEllipse extends MxDbEllipseShape {
+    constructor();
+    getTypeName(): string;
+    create(): MxDbEllipse;
+    /** 开始点 */
     point1: three.Vector3;
-    /** 矩形的结束点 */
+    setPoint1(point1: THREE.Vector3): this;
+    /** 结束点 */
     point2: three.Vector3;
-    getTypeName(): string;
+    setPoint2(point2: THREE.Vector3): this;
+    isClosedToCenter: boolean;
+    closed: boolean;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): THREE.Vector3[];
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
-    create(): MxDbEntity;
-    dwgIn(obj: any): boolean;
-    dwgOut(obj: any): object;
 }
 
 declare type SpriteTextColorType = THREE.Color | string | number | CanvasGradient | CanvasPattern | undefined;
 declare type SpriteTextObj = SpriteText;
+declare type TextFontWeight = 'normal' | 'bold' | 'lighter' | 'bolder' | 'inherit' | number;
+declare type TextFontStyle = 'normal' | 'italic' | 'oblique';
 declare class SpriteText extends THREE.Sprite {
     constructor(options?: SpriteTextOptions);
     text: string;
@@ -3851,7 +3989,7 @@ declare class SpriteText extends THREE.Sprite {
     borderColor: SpriteTextColorType;
     fontFace: string;
     fontSize: number;
-    fontWeight: string;
+    fontWeight: TextFontWeight;
     strokeWidth: number;
     strokeColor: SpriteTextColorType;
     textAlign: CanvasTextAlign;
@@ -3861,6 +3999,9 @@ declare class SpriteText extends THREE.Sprite {
     textShadowOffsetY: number;
     angle: number;
     textScale: number;
+    underline: boolean;
+    fontStyle: TextFontStyle;
+    fontVariant: string;
     private _genCanvas;
     dispose(): void;
 }
@@ -3877,7 +4018,7 @@ interface SpriteTextOptions {
     strokeColor?: SpriteTextColorType;
     fontFace?: string;
     fontSize?: number;
-    fontWeight?: string;
+    fontWeight?: TextFontWeight;
     textAlign?: CanvasTextAlign;
     textBaseline?: CanvasTextBaseline;
     textShadowBlur?: number;
@@ -3886,6 +4027,9 @@ interface SpriteTextOptions {
     textShadowOffsetY?: number;
     angle?: number;
     scale?: number;
+    underline?: boolean;
+    fontStyle?: TextFontStyle;
+    fontVariant?: string;
 }
 
 /**
@@ -3949,7 +4093,7 @@ declare class MxDbText extends MxDbEntity {
     set borderColor(borderColor: SpriteTextColorType);
     setBorderColor(borderColor: SpriteTextColorType): this;
     private _fontFace;
-    /** 字体 */
+    /** 客户端字体 */
     get fontFace(): string;
     set fontFace(fontFace: string);
     setFontFace(fontFace: string): this;
@@ -3960,9 +4104,9 @@ declare class MxDbText extends MxDbEntity {
     setFontSize(fontSize: number): this;
     private _fontWeight;
     /** 字体粗细 */
-    get fontWeight(): string;
-    set fontWeight(fontWeight: string);
-    setFontWeight(fontWeight: string): this;
+    get fontWeight(): TextFontWeight;
+    set fontWeight(fontWeight: TextFontWeight);
+    setFontWeight(fontWeight: TextFontWeight): this;
     private _strokeWidth;
     /** 笔划宽度 */
     get strokeWidth(): number;
@@ -4008,6 +4152,11 @@ declare class MxDbText extends MxDbEntity {
     get scale(): number;
     set scale(scale: number);
     setScale(scale: number): this;
+    private _underline;
+    /** 下划线 */
+    get underline(): boolean;
+    set underline(underline: boolean);
+    setUnderline(underline: boolean): void;
     /** SpriteText实例 */
     protected spriteText: SpriteTextObj;
     getTypeName(): string;
@@ -4099,6 +4248,102 @@ declare class MxDbGradientLine extends MxDbEntity {
     dwgOut(obj: any): object;
 }
 
+/**
+ * 根据中心点、椭圆开始点和结束点确定椭圆弧
+ *  */
+declare class MxDbEllipseArc extends MxDbEllipseShape {
+    getTypeName(): string;
+    constructor();
+    /** 椭圆弧决定开始点 控制x轴半径和开始角度 */
+    startPoint: THREE.Vector3;
+    setStartPoint(startPoint: THREE.Vector3): this;
+    /** 椭圆弧决定结束点 控制y轴半径和结束角度*/
+    endPoint: THREE.Vector3;
+    setEndPoint(endPoint: THREE.Vector3): this;
+    /** 控制椭圆弧旋转角度的点 */
+    rotationPoint: THREE.Vector3;
+    setRotationPoint(rotationPoint: THREE.Vector3): this;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): three.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/** 根据圆心、起始点、结束点位置动态绘制圆弧 **/
+declare class MxDbCircleArc extends MxDbCircleShape {
+    constructor();
+    getTypeName(): string;
+    /** 圆弧开始点 设置开始点将自动计算 radius、startAngle、endAngle */
+    startPoint: THREE.Vector3;
+    setStartPoint(startPoint: THREE.Vector3): this;
+    /** 圆弧结束点 设置结束点将自动计算 radius、startAngle、endAngle */
+    endPoint: THREE.Vector3;
+    setEndPoint(endPoint: THREE.Vector3): this;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    computePointAngle(point: THREE.Vector3): number;
+    getGripPoints(): three.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/** 弧形 */
+declare class MxDbArcShape extends MxDbCircleArc {
+    constructor();
+    getTypeName(): string;
+    create(): MxDbArcShape;
+    center: three.Vector3;
+    innerRadius: number;
+    outerRadius: number;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    drawArcShape(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/** 绘制弧形 */
+declare class MxDbArcShapeDraw extends MxDbArcShape {
+    getTypeName(): string;
+    constructor();
+    outerRadiusPoint: three.Vector3;
+    interRadiusPoint: three.Vector3;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/** 环形 */
+declare class MxDbRingShape extends MxDbArcShape {
+    getTypeName(): string;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+}
+
+/** 星形 */
+declare class MxDbStarShape extends MxDbShape {
+    getTypeName(): string;
+    constructor();
+    center: three.Vector3;
+    numPoints: number;
+    innerRadius: number;
+    outerRadius: number;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
+/** 等边多边形 */
+declare class MxDbRegularPolygonShape extends MxDbShape {
+    center: three.Vector3;
+    sides: number;
+    radius: number;
+    getTypeName(): string;
+    constructor();
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    _getPoints(): {
+        x: number;
+        y: number;
+    }[];
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}
+
 declare const Mx_loadCoreCode: typeof loadCoreCode;
 declare const Mx_useCanvasResizeListener: typeof useCanvasResizeListener;
 declare const Mx_store: typeof store;
@@ -4173,6 +4418,24 @@ declare const Mx_MxCADObject: typeof MxCADObject;
 type Mx_MxDbGroup = MxDbGroup;
 type Mx_MxDbGradientLine = MxDbGradientLine;
 declare const Mx_MxDbGradientLine: typeof MxDbGradientLine;
+type Mx_MxDbShape = MxDbShape;
+declare const Mx_MxDbShape: typeof MxDbShape;
+type Mx_MxDbEllipseShape = MxDbEllipseShape;
+declare const Mx_MxDbEllipseShape: typeof MxDbEllipseShape;
+type Mx_MxDbEllipseArc = MxDbEllipseArc;
+declare const Mx_MxDbEllipseArc: typeof MxDbEllipseArc;
+type Mx_MxDbCircleShape = MxDbCircleShape;
+declare const Mx_MxDbCircleShape: typeof MxDbCircleShape;
+type Mx_MxDbCircleArc = MxDbCircleArc;
+declare const Mx_MxDbCircleArc: typeof MxDbCircleArc;
+type Mx_MxDbArcShapeDraw = MxDbArcShapeDraw;
+declare const Mx_MxDbArcShapeDraw: typeof MxDbArcShapeDraw;
+type Mx_MxDbRingShape = MxDbRingShape;
+declare const Mx_MxDbRingShape: typeof MxDbRingShape;
+type Mx_MxDbStarShape = MxDbStarShape;
+declare const Mx_MxDbStarShape: typeof MxDbStarShape;
+type Mx_MxDbRegularPolygonShape = MxDbRegularPolygonShape;
+declare const Mx_MxDbRegularPolygonShape: typeof MxDbRegularPolygonShape;
 declare namespace Mx {
   export {
     Mx_loadCoreCode as loadCoreCode,
@@ -4219,7 +4482,16 @@ declare namespace Mx {
     Mx_MxCADObject as MxCADObject,
     Mx_MxDbGroup as MxDbGroup,
     Mx_MxDbGradientLine as MxDbGradientLine,
+    Mx_MxDbShape as MxDbShape,
+    Mx_MxDbEllipseShape as MxDbEllipseShape,
+    Mx_MxDbEllipseArc as MxDbEllipseArc,
+    Mx_MxDbCircleShape as MxDbCircleShape,
+    Mx_MxDbCircleArc as MxDbCircleArc,
+    Mx_MxDbArcShapeDraw as MxDbArcShapeDraw,
+    Mx_MxDbRingShape as MxDbRingShape,
+    Mx_MxDbStarShape as MxDbStarShape,
+    Mx_MxDbRegularPolygonShape as MxDbRegularPolygonShape,
   };
 }
 
-export { McEdGetPointWorldDrawObject, McGePoint3d, McGePoint3dArray, McGeTool, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MrxDbgUtils, Mx3PointArc, MxCADObject, MxDb2LineAngularDimension, MxDbAlignedDimension, MxDbAnyLine, MxDbArea, MxDbCloudLine, MxDbCoord, MxDbDatabase, MxDbEllipse, MxDbEntity, MxDbGradientLine, MxDbGroup, MxDbHatch, MxDbImage, MxDbLayerTableRecord, MxDbLeadComment, MxDbLeadTag, MxDbLine, MxDbPolyline, MxDbRect, MxDbRectBoxLeadComment, MxDbRegularPolygon, MxDbSVG, MxDbSVGText, MxDbText, MxDrawObject, MxFilters, MxFun, MxThreeJS, MxType, Mxassembly, Mx as default, loadCoreCode, store, useCanvasResizeListener };
+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 };

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

@@ -1,19 +1,24 @@
-/** @module Mx3PointArc*/
-import McGiWorldDraw from '../McGiWorldDraw';
-import MxDbEntity from '../MxDbEntity';
-/**
- * Mx3PointArc 对象.
- * 通过三个坐标点绘制一段圆弧
- */
-export default class Mx3PointArc extends MxDbEntity {
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbCircleShape from "../MxDbCircleShape";
+/** 三点动态绘制圆弧 point1圆弧起始点 point2是圆弧结束点, point3圆弧任意一点  */
+export default class Mx3PointArc extends MxDbCircleShape {
+    constructor();
     point1: import("three").Vector3;
     point2: import("three").Vector3;
     point3: import("three").Vector3;
+    /** 自动确定顺逆时针绘制 */
+    autoClockwise: boolean;
     getTypeName(): string;
-    create(): MxDbEntity;
+    create(): Mx3PointArc;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): THREE.Vector3[];
+    /** 计算三个控制点的角度 */
+    compute3PointAngle(): number[];
+    /** 根据三个控制点更新圆心 */
+    upDateCenter(point1: THREE.Vector3, point2: THREE.Vector3, point3: THREE.Vector3): import("three").Vector3;
+    /** 根据圆心和一个控制点自动更新半径大小 */
+    upDateRadius(point: THREE.Vector3): number;
+    /** 根据 三个控制点到圆心的角度  更新顺逆时针绘制 */
+    upDataClockwise(angle1: number, angle2: number, angle3: number): void;
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
-    dwgIn(obj: any): boolean;
-    dwgOut(obj: any): object;
 }

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

@@ -1 +1 @@
-import MxDbEntity from"../MxDbEntity";import{createThreePointArc}from"../../tools/three/index";export default class Mx3PointArc extends MxDbEntity{constructor(){super(...arguments),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.point3=new THREE.Vector3}getTypeName(){return"Mx3PointArc"}create(){return new Mx3PointArc}worldDraw(t){const{arc:i}=createThreePointArc(this.point1,this.point2,this.point3,!0);t.drawEntity(i)}getGripPoints(){return[this.point1,this.point2,this.point3]}moveGripPointsAt(t,i){return 0===t?this.point1.add(i):1===t?this.point2.add(i):2===t&&this.point3.add(i),!0}dwgIn(t){return this.onDwgIn(t),this.point1.copy(t.point1),this.point2.copy(t.point2),this.point3.copy(t.point3),t}dwgOut(t){return this.onDwgOut(t),t.point1=this.point1,t.point2=this.point2,t.point3=this.point3,t}};
+import{calculateArcAngle,calculateArcOrigin,calculateRadiusArc,judgementArcRenderDirection}from"../../tools/three";import MxDbCircleShape from"../MxDbCircleShape";export default class Mx3PointArc extends MxDbCircleShape{constructor(){super(),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.point3=new THREE.Vector3,this.autoClockwise=!0,this._propertyDbKeys=[...this._propertyDbKeys,"point1","point2","point3","autoClockwise"]}getTypeName(){return"Mx3PointArc"}create(){return new Mx3PointArc}worldDraw(t){let{point1:e,point2:i,point3:n}=this;this.upDateCenter(e,i,n),this.upDateRadius(e);const[r,s,o]=this.compute3PointAngle();this.upDataClockwise(r,s,o),this.startAngle=THREE.MathUtils.degToRad(r),this.endAngle=THREE.MathUtils.degToRad(s),this.drawEllipseShape(t)}getGripPoints(){return[this.point1,this.point2,this.point3,this.center]}compute3PointAngle(){const{point1:t,point2:e,point3:i}=this,n=calculateArcAngle(t,this.center,this.radius),r=calculateArcAngle(e,this.center,this.radius),s=calculateArcAngle(i,this.center,this.radius);return[n.angle,r.angle,s.angle]}upDateCenter(t,e,i){return this.center=calculateArcOrigin(t,e,i),this.center}upDateRadius(t){return this.radius=calculateRadiusArc(t,this.center),this.radius}upDataClockwise(t,e,i){const{autoClockwise:n}=this;n&&(this.clockwise=judgementArcRenderDirection(e,t,i))}moveGripPointsAt(t,e){return 0===t?this.point1.add(e):1===t?this.point2.add(e):2===t?this.point3.add(e):3===t&&(this.point1.add(e),this.point2.add(e),this.point3.add(e)),this.upDateCenter(this.point1,this.point2,this.point3),!0}};

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

@@ -0,0 +1,15 @@
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbCircleArc from "../MxDbCircleArc";
+/** 弧形 */
+export default class MxDbArcShape extends MxDbCircleArc {
+    constructor();
+    getTypeName(): string;
+    create(): MxDbArcShape;
+    center: import("three").Vector3;
+    innerRadius: number;
+    outerRadius: number;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    drawArcShape(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}

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

@@ -0,0 +1 @@
+import MxDbCircleArc from"../MxDbCircleArc";export default class MxDbArcShape extends MxDbCircleArc{constructor(){super(),this.center=new THREE.Vector3,this.innerRadius=10,this.outerRadius=20,this._propertyDbKeys=[...this._propertyDbKeys,"center","innerRadius","outerRadius"]}getTypeName(){return"MxDbArcShape"}create(){return new MxDbArcShape}worldDraw(e){this.drawArcShape(e)}drawArcShape(e){const{center:t,startAngle:r,endAngle:s,clockwise:i}=this,{x:n,y:a}=t;this.isClosedToCenter=!1;const c=this.createEllipseCurve(n,a,this.innerRadius,this.innerRadius,r,s,i),h=this.createEllipseCurve(n,a,this.outerRadius,this.outerRadius,s,r,!i),o=this.createPaths([c,h]);let u=this.getShapePoints(o);this._draw(e,u),this._drawStoreLine(e,u)}getGripPoints(){return[this.center]}moveGripPointsAt(e,t){return 0===e&&this.center.add(t),!0}};

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

@@ -0,0 +1,12 @@
+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;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): THREE.Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}

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

@@ -0,0 +1 @@
+import{calculateArcAngle}from"../../tools/three";import MxDbArcShape from"../MxDbArcShape";export default class MxDbArcShapeDraw extends MxDbArcShape{constructor(){super(),this.outerRadiusPoint=new THREE.Vector3,this.interRadiusPoint=new THREE.Vector3,this._propertyDbKeys=[...this._propertyDbKeys,"interRadiusPoint","outerRadiusPoint"]}getTypeName(){return"MxDbArcShapeDraw"}worldDraw(t){this.innerRadius=this.center.distanceTo(this.interRadiusPoint),this.outerRadius=this.center.distanceTo(this.outerRadiusPoint),this.startAngle=THREE.MathUtils.degToRad(calculateArcAngle(this.interRadiusPoint,this.center,this.innerRadius).angle),this.endAngle=THREE.MathUtils.degToRad(calculateArcAngle(this.outerRadiusPoint,this.center,this.outerRadius).angle),this.drawArcShape(t)}getGripPoints(){return[this.center,this.interRadiusPoint,this.outerRadiusPoint]}moveGripPointsAt(t,i){return 0===t&&(this.center.add(i),this.interRadiusPoint.add(i),this.outerRadiusPoint.add(i)),1===t&&this.interRadiusPoint.add(i),2===t&&this.outerRadiusPoint.add(i),!0}};

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

@@ -0,0 +1,17 @@
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbCircleShape from "../MxDbCircleShape";
+/** 根据圆心、起始点、结束点位置动态绘制圆弧 **/
+export default class MxDbCircleArc extends MxDbCircleShape {
+    constructor();
+    getTypeName(): string;
+    /** 圆弧开始点 设置开始点将自动计算 radius、startAngle、endAngle */
+    startPoint: THREE.Vector3;
+    setStartPoint(startPoint: THREE.Vector3): this;
+    /** 圆弧结束点 设置结束点将自动计算 radius、startAngle、endAngle */
+    endPoint: THREE.Vector3;
+    setEndPoint(endPoint: THREE.Vector3): this;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    computePointAngle(point: THREE.Vector3): number;
+    getGripPoints(): import("three").Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}

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

@@ -0,0 +1 @@
+import{calculateArcAngle}from"../../tools/three";import MxDbCircleShape from"../MxDbCircleShape";export default class MxDbCircleArc extends MxDbCircleShape{constructor(){super(),this._propertyDbKeys=[...this._propertyDbKeys,"startPoint","endPoint"]}getTypeName(){return"MxDbCircleArc"}setStartPoint(t){return this.startPoint=t,this}setEndPoint(t){return this.endPoint=t,this}worldDraw(t){let{startPoint:e,endPoint:i}=this;if(e&&(this.startAngle=this.computePointAngle(e)),i&&(this.endAngle=this.computePointAngle(i)),e&&i){const{points:e}=this.drawEllipseShape(t);this.startPoint=e[0]}}computePointAngle(t){return this.radius=this.center.distanceTo(t),THREE.MathUtils.degToRad(calculateArcAngle(t,this.center,this.radius).angle)}getGripPoints(){return[this.center,this.startPoint,this.endPoint]}moveGripPointsAt(t,e){return 0===t?(this.center.add(e),this.startPoint.add(e),this.endPoint.add(e)):1===t?this.startPoint.add(e):2===t&&this.endPoint.add(e),!0}};

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

@@ -0,0 +1,11 @@
+import MxDbEllipseShape from "../MxDbEllipseShape";
+/*** 圆(弧)形状 */
+export default class MxDbCircleShape extends MxDbEllipseShape {
+    getTypeName(): string;
+    /*** 圆半径 */
+    get radius(): number;
+    set radius(radius: number);
+    setRadius(radius: number): this;
+    setXRadius(xRadius: number): this;
+    setYRadius(yRadius: number): this;
+}

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

@@ -0,0 +1 @@
+import MxDbEllipseShape from"../MxDbEllipseShape";export default class MxDbCircleShape extends MxDbEllipseShape{getTypeName(){return"MxDbCircleShape"}get radius(){return this.xRadius}set radius(s){this.xRadius=s,this.yRadius=s}setRadius(s){return this.radius=s,this}setXRadius(s){return this.setRadius(s),this}setYRadius(s){return this.setRadius(s),this}};

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

@@ -1,19 +1,19 @@
-/** @module MxDbEllipse*/
-import McGiWorldDraw from '../McGiWorldDraw';
-import MxDbEntity from '../MxDbEntity';
-/**
- * MxDbEllipse 通过矩形绘制的椭圆
- */
-export default class MxDbEllipse extends MxDbEntity {
-    /** 矩形的开始点 */
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbEllipseShape from "../MxDbEllipseShape";
+/** 通过两个构成矩形的点绘制椭圆形 */
+export default class MxDbEllipse extends MxDbEllipseShape {
+    constructor();
+    getTypeName(): string;
+    create(): MxDbEllipse;
+    /** 开始点 */
     point1: import("three").Vector3;
-    /** 矩形的结束点 */
+    setPoint1(point1: THREE.Vector3): this;
+    /** 结束点 */
     point2: import("three").Vector3;
-    getTypeName(): string;
+    setPoint2(point2: THREE.Vector3): this;
+    isClosedToCenter: boolean;
+    closed: boolean;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): THREE.Vector3[];
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
-    create(): MxDbEntity;
-    dwgIn(obj: any): boolean;
-    dwgOut(obj: any): object;
 }

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

@@ -1 +1 @@
-import MxDbEntity from"../MxDbEntity";import{createThreeEllipse}from"../../tools/three/index";import McGiWorldDrawType from"../McGiWorldDrawType";export default class MxDbEllipse extends MxDbEntity{constructor(){super(...arguments),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3}getTypeName(){return"MxDbEllipse"}worldDraw(t){const e=createThreeEllipse(this.point1,this.point2,t.getColor());let i=t.getMxObject();e.geometry.computeBoundingBox();let o=new THREE.Vector3;if(e.geometry.boundingBox.getCenter(o),t.getType()===McGiWorldDrawType.kSelectDraw){const n=new THREE.Vector3;e.geometry.boundingBox.getSize(n),n.addScalar(i.screenCoordLong2Doc(10));const r=n.x/2,p=n.y/2,s={x:o.x-r,y:o.y-p},y={x:o.x+r,y:o.y-p},x={x:o.x+r,y:o.y+p},d={x:o.x-r,y:o.y+p};t.drawLine(s.x,s.y,y.x,y.y),t.drawLine(y.x,y.y,x.x,x.y),t.drawLine(x.x,x.y,d.x,d.y),t.drawLine(d.x,d.y,s.x,s.y)}t.drawEntity(e)}getGripPoints(){let t=new THREE.Vector3(.5*(this.point2.x+this.point1.x),.5*(this.point2.y+this.point1.y),0);return[this.point1,this.point2,t]}moveGripPointsAt(t,e){return 0===t?this.point1.add(e):1===t?this.point2.add(e):2===t&&(this.point1.add(e),this.point2.add(e)),!0}create(){return new MxDbEllipse}dwgIn(t){return this.onDwgIn(t),this.point1.copy(t.point1),this.point2.copy(t.point2),t}dwgOut(t){return this.onDwgOut(t),t.point1=this.point1,t.point2=this.point2,t}};
+import McGiWorldDrawType from"../McGiWorldDrawType";import MxDbEllipseShape from"../MxDbEllipseShape";export default class MxDbEllipse extends MxDbEllipseShape{constructor(){super(),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.isClosedToCenter=!1,this.closed=!1,this._propertyDbKeys=[...this._propertyDbKeys,"point1","point2"]}getTypeName(){return"MxDbEllipse"}create(){return new MxDbEllipse}setPoint1(t){return this.point1=t,this}setPoint2(t){return this.point2=t,this}worldDraw(t){const{point1:i,point2:e}=this,s=i.clone().set(e.x,i.y,e.z),o=e.clone().set(i.x,e.y,i.z);this.xRadius=i.distanceTo(s)/2,this.yRadius=i.distanceTo(o)/2;const n=i.x>e.x,r=i.y>e.y,p=n?i.x-this.xRadius:i.x+this.xRadius,h=r?i.y-this.yRadius:i.y+this.yRadius;this.center=new THREE.Vector3(p,h,0),this.drawEllipseShape(t),t.getType()===McGiWorldDrawType.kSelectDraw&&t.drawLines([i,new THREE.Vector3(i.x,e.y),e,new THREE.Vector3(e.x,i.y),i])}getGripPoints(){let t=new THREE.Vector3(.5*(this.point2.x+this.point1.x),.5*(this.point2.y+this.point1.y),0);return[this.point1,this.point2,t]}moveGripPointsAt(t,i){return 0===t?this.point1.add(i):1===t?this.point2.add(i):2===t&&(this.point1.add(i),this.point2.add(i)),!0}};

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

@@ -0,0 +1,21 @@
+import McGiWorldDraw from "../McGiWorldDraw";
+import MxDbEllipseShape from "../MxDbEllipseShape";
+/**
+ * 根据中心点、椭圆开始点和结束点确定椭圆弧
+ *  */
+export default class MxDbEllipseArc extends MxDbEllipseShape {
+    getTypeName(): string;
+    constructor();
+    /** 椭圆弧决定开始点 控制x轴半径和开始角度 */
+    startPoint: THREE.Vector3;
+    setStartPoint(startPoint: THREE.Vector3): this;
+    /** 椭圆弧决定结束点 控制y轴半径和结束角度*/
+    endPoint: THREE.Vector3;
+    setEndPoint(endPoint: THREE.Vector3): this;
+    /** 控制椭圆弧旋转角度的点 */
+    rotationPoint: THREE.Vector3;
+    setRotationPoint(rotationPoint: THREE.Vector3): this;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): import("three").Vector3[];
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+}

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

@@ -0,0 +1 @@
+import{calculateArcAngle}from"../../tools/three";import MxDbEllipseShape from"../MxDbEllipseShape";export default class MxDbEllipseArc extends MxDbEllipseShape{constructor(){super(),this._propertyDbKeys=[...this._propertyDbKeys,"startPoint","endPoint","rotationPoint"]}getTypeName(){return"MxDbEllipseArc"}setStartPoint(t){return this.startPoint=t,this}setEndPoint(t){return this.endPoint=t,this}setRotationPoint(t){return this.rotationPoint=t,this}worldDraw(t){let{center:i,startPoint:e,endPoint:s,rotationPoint:n}=this;e&&(this.xRadius=i.distanceTo(e),this.startAngle=THREE.MathUtils.degToRad(calculateArcAngle(e,i,this.xRadius).angle)),s&&(this.yRadius=i.distanceTo(s),this.endAngle=THREE.MathUtils.degToRad(calculateArcAngle(s,i,this.yRadius).angle)),n&&(this.rotation=THREE.MathUtils.degToRad(calculateArcAngle(n,i,i.distanceTo(n)).angle)),this.drawEllipseShape(t)}getGripPoints(){return[this.center,this.startPoint,this.endPoint,this.rotationPoint]}moveGripPointsAt(t,i){return 0===t&&(this.center.add(i),this.startPoint.add(i),this.endPoint.add(i),this.rotationPoint.add(i)),1===t&&this.startPoint.add(i),2===t&&this.endPoint.add(i),3===t&&this.rotationPoint.add(i),!0}};