mxdraw 0.1.122 → 0.1.123

package/dist/index.d.ts

@@ -3495,7 +3495,9 @@ declare class MxDbShape extends MxDbEntity {
     isFill: boolean;
     setIsFill(isFill: boolean): this;
     /** 填充图片路径 */
-    fillImageSrc?: string;
+    protected _fillImageSrc: string | false | null;
+    get fillImageSrc(): string | false | null;
+    set fillImageSrc(src: string | false | null);
     setFillImageSrc(fillImageSrc: string): this;
     /**
     * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)
@@ -4291,11 +4293,11 @@ declare class MxDbGradientLine extends MxDbEntity {
     dwgOut(obj: any): object;
 }
 
+/**
+    * 根据中心点、椭圆开始点和结束点确定椭圆弧
+    *  */
 declare class MxDbEllipseArc extends MxDbEllipseShape {
     getTypeName(): string;
-    /**
-     * 根据中心点、椭圆开始点和结束点确定椭圆弧
-     *  */
     constructor();
     /** 椭圆弧决定开始点 控制x轴半径和开始角度 */
     startPoint: THREE.Vector3;
@@ -4303,9 +4305,6 @@ declare class MxDbEllipseArc extends MxDbEllipseShape {
     /** 椭圆弧决定结束点 控制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;
@@ -4331,7 +4330,6 @@ declare class MxDbArcShape extends MxDbCircleArc {
     /** 环形 */
     constructor();
     getTypeName(): string;
-    create(): MxDbArcShape;
     center: three.Vector3;
     innerRadius: number;
     outerRadius: number;
@@ -4358,13 +4356,16 @@ declare class MxDbRingShape extends MxDbArcShape {
     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[];

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

@@ -4,7 +4,6 @@ export default class MxDbArcShape extends MxDbCircleArc {
     /** 环形 */
     constructor();
     getTypeName(): string;
-    create(): MxDbArcShape;
     center: import("three").Vector3;
     innerRadius: number;
     outerRadius: number;

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

@@ -1 +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}};
+import McGiWorldDrawType from"../McGiWorldDrawType";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"}worldDraw(e){e.getType()===McGiWorldDrawType.kDynDragDraw?(e.drawCircle(this.center,this.innerRadius),e.drawCircle(this.center,this.outerRadius)):this.drawArcShape(e)}drawArcShape(e){const{center:r,startAngle:t,endAngle:i,clockwise:s}=this,{x:a,y:n}=r;this.isClosedToCenter=!1;const c=this.createEllipseCurve(a,n,this.innerRadius,this.innerRadius,t,i,s),h=this.createEllipseCurve(a,n,this.outerRadius,this.outerRadius,i,t,!s),o=this.createPaths([c,h]);let d=this.getShapePoints(o);this._draw(e,d),this._drawStoreLine(e,d)}getGripPoints(){return[this.center]}moveGripPointsAt(e,r){return 0===e&&this.center.add(r),!0}};

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;
@@ -12,9 +12,6 @@ export default class MxDbEllipseArc extends MxDbEllipseShape {
     /** 椭圆弧决定结束点 控制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

@@ -1 +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}};
+import{calculateArcAngle}from"../../tools/three";import MxDbEllipseShape from"../MxDbEllipseShape";export default class MxDbEllipseArc extends MxDbEllipseShape{constructor(){super(),this._propertyDbKeys=[...this._propertyDbKeys,"startPoint","endPoint"]}getTypeName(){return"MxDbEllipseArc"}setStartPoint(t){return this.startPoint=t,this}setEndPoint(t){return this.endPoint=t,this}worldDraw(t){let{center:e,startPoint:i,endPoint:s}=this;i&&(this.xRadius=e.distanceTo(i),this.startAngle=THREE.MathUtils.degToRad(calculateArcAngle(i,e,this.xRadius).angle)),s&&(this.yRadius=e.distanceTo(s),this.endAngle=THREE.MathUtils.degToRad(calculateArcAngle(s,e,this.yRadius).angle)),this.drawEllipseShape(t)}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/MxDbShape/index.d.ts

@@ -25,7 +25,9 @@ export default class MxDbShape extends MxDbEntity {
     isFill: boolean;
     setIsFill(isFill: boolean): this;
     /** 填充图片路径 */
-    fillImageSrc?: string;
+    protected _fillImageSrc: string | false | null;
+    get fillImageSrc(): string | false | null;
+    set fillImageSrc(src: string | false | null);
     setFillImageSrc(fillImageSrc: string): this;
     /**
     * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)

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

@@ -1 +1 @@
-import{getToGenerateRoundedCorners,repairGeometryFaceVertexUvs}from"../../tools/three";import McGeTool from"../McGeTool";import MxDbEntity from"../MxDbEntity";import MxFilters from"../MxFilters";import MxFun from"../MxFun";import MxType from"../MxType";export default class MxDbShape extends MxDbEntity{constructor(){super(...arguments),this.isLoadMaterialFromPath=!0,this.strokeLineWidth=2,this.isStrokeDashLine=!1,this.isFill=!1,this.curveSegments=50,this.closed=!0,this.cornerRadius=[],this._propertyDbKeys=["isFill","stroke","strokeLineWidth","isStrokeDashLine","closed","cornerRadius","fillImageSrc","fillImageParam"]}setStroke(t){return this.stroke=t,this}setStrokeLineWidth(t){return this.strokeLineWidth=t,this}setIsStrokeDashLine(t){return this.isStrokeDashLine=t,this}setIsFill(t){return this.isFill=t,this}setFillImageSrc(t){return this.fillImageSrc=t,this}setCurveSegments(t){return this.curveSegments=t,this}setClosed(t){return this.closed=t,this}setCornerRadius(t,e=!0){t instanceof Array?this.cornerRadius=t.map(t=>e?MxFun.screenCoordLong2Doc(t):t):this.cornerRadius=e?MxFun.screenCoordLong2Doc(t):t}getTypeName(){return"MxDbShape"}getShapePoints(t){const{curveSegments:e}=this;return this.points=t.getPoints(e).map(t=>t instanceof THREE.Vector2?new THREE.Vector3(t.x,t.y,0):t),this.points}createPaths(t){return this._paths=new THREE.CurvePath,Array.isArray(t)?t.forEach(t=>this._paths.add(t)):this._paths.add(t),this._paths}_draw(t,e){const i=t.getColor(),{isFill:s,closed:r}=this;t.setColor(this.filter?this.filter._getFilterColor(this.color,this.opacity):this.color);const o=this.getCornerRadiusPoints(r?this.getClosedPoints(e):e);s?!this.fillImageSrc&&t.drawSolid(o):t.drawLines(o),this._fillImg(t,o),t.setColor(i)}getCornerRadiusPoints(t){const{cornerRadius:e}=this;if(!e)return t;const i="number"==typeof e?t.map(()=>e):e;return i.length>0?getToGenerateRoundedCorners(t,i):t}_drawStoreLine(t,e,i){const{isFill:s,stroke:r,strokeLineWidth:o}=this,a=t.getLineWidth(),n=t.getColor(),h=t.isDashLineDisplay();r&&s&&(t.setDashLineDisplay(this.isStrokeDashLine),t.setColor(r),t.setLineWidth(o),i?i(t):t.drawLines(this.getCornerRadiusPoints(this.getClosedPoints(e))),t.setColor(n),t.setLineWidth(a),t.setDashLineDisplay(h))}getClosedPoints(t){return[...t,t[0]]}getTotalLength(){return this._paths?this._paths.getLength()+(this.closedLine?this.closedLine.getLength():0):0}getArea(){return this.points?McGeTool.calcArea(this.closed?this.getClosedPoints(this.points):this.points):0}worldDraw(t){const e=this.createPaths(new THREE.Curve),i=this.getShapePoints(e);this._draw(t,i),this._drawStoreLine(t,i)}_fillImg(t,e){const i={transparent:!0,depthTest:!1,opacity:this.opacity,visible:this.visible};if(!this.isFill||!this.fillImageSrc)return;if(!this.material){let t=this;return void MxFun.loadImageMaterial(this.fillImageSrc,e=>{t.isLoadMaterialFromPath=!1,e&&(t.material=e,t.setNeedUpdateDisplay(),MxFun.updateDisplay())})}const s=e.map(({x:t,y:e})=>new THREE.Vector2(t,e));let r=this.material,o=new THREE.ShapeGeometry(new THREE.Shape(s));if(o=repairGeometryFaceVertexUvs(o),this.filter){const t=r.map,e=this.filter._getFilterShaderData(t);r=new THREE.ShaderMaterial(Object.assign(Object.assign({},e),i))}if(r.depthTest=!1,r.transparent=!0,r.opacity=this.opacity,r.visible=this.visible,this.fillImageParam){const t=this.fillImageParam;for(let e in this.fillImageParam){this.material.map[e]=t[e]}}let a=new THREE.Mesh(o,r);t.drawEntity(a)}getGripPoints(){return[]}moveGripPointsAt(t,e){return!0}dwgIn(t){return this.dwgInHelp(t,this._propertyDbKeys),this.isLoadMaterialFromPath=!0,this.material=null,t.type===MxType.MxCloneType.kMxFileClone?this.filter=MxFilters.fromJSON(t.filter):t.filter&&(this.filter=t.filter),!0}dwgOut(t){var e;return this.dwgOutHelp(t,this._propertyDbKeys),t.type===MxType.MxCloneType.kMxFileClone?this.filter&&(t.filter=null===(e=this.filter)||void 0===e?void 0:e.toJSON()):t.filter=this.filter,t}};
+import{getToGenerateRoundedCorners,repairGeometryFaceVertexUvs}from"../../tools/three";import McGeTool from"../McGeTool";import MxDbEntity from"../MxDbEntity";import MxFilters from"../MxFilters";import MxFun from"../MxFun";import MxType from"../MxType";export default class MxDbShape extends MxDbEntity{constructor(){super(...arguments),this.isLoadMaterialFromPath=!0,this.strokeLineWidth=2,this.isStrokeDashLine=!1,this.isFill=!1,this.curveSegments=50,this.closed=!0,this.cornerRadius=[],this._propertyDbKeys=["isFill","stroke","strokeLineWidth","isStrokeDashLine","closed","cornerRadius","fillImageSrc","fillImageParam"]}setStroke(t){return this.stroke=t,this}setStrokeLineWidth(t){return this.strokeLineWidth=t,this}setIsStrokeDashLine(t){return this.isStrokeDashLine=t,this}setIsFill(t){return this.isFill=t,this}get fillImageSrc(){return this._fillImageSrc}set fillImageSrc(t){this._fillImageSrc=t,this.isLoadMaterialFromPath=!0,this.material=null}setFillImageSrc(t){return this.fillImageSrc=t,this}setCurveSegments(t){return this.curveSegments=t,this}setClosed(t){return this.closed=t,this}setCornerRadius(t,e=!0){t instanceof Array?this.cornerRadius=t.map(t=>e?MxFun.screenCoordLong2Doc(t):t):this.cornerRadius=e?MxFun.screenCoordLong2Doc(t):t}getTypeName(){return"MxDbShape"}getShapePoints(t){const{curveSegments:e}=this;return this.points=t.getPoints(e).map(t=>t instanceof THREE.Vector2?new THREE.Vector3(t.x,t.y,0):t),this.points}createPaths(t){return this._paths=new THREE.CurvePath,Array.isArray(t)?t.forEach(t=>this._paths.add(t)):this._paths.add(t),this._paths}_draw(t,e){let{isFill:i,closed:s}=this;const r=t.getColor();t.setColor(this.filter?this.filter._getFilterColor(this.color,this.opacity):this.color);const o=this.getCornerRadiusPoints(s||i?this.getClosedPoints(e):e);i?!this.fillImageSrc&&t.drawSolid(o):t.drawLines(o),this._fillImg(t,o),t.setColor(r)}getCornerRadiusPoints(t){const{cornerRadius:e}=this;if(!e)return t;const i="number"==typeof e?t.map(()=>e):e;return i.length>0?getToGenerateRoundedCorners(t,i):t}_drawStoreLine(t,e,i){const{isFill:s,stroke:r,strokeLineWidth:o}=this,a=t.getLineWidth(),n=t.getColor(),l=t.isDashLineDisplay();r&&s&&(t.setDashLineDisplay(this.isStrokeDashLine),t.setColor(r),t.setLineWidth(o),i?i(t):t.drawLines(this.getCornerRadiusPoints(this.getClosedPoints(e))),t.setColor(n),t.setLineWidth(a),t.setDashLineDisplay(l))}getClosedPoints(t){return[...t,t[0]]}getTotalLength(){return this._paths?this._paths.getLength()+(this.closedLine?this.closedLine.getLength():0):0}getArea(){return this.points?McGeTool.calcArea(this.closed?this.getClosedPoints(this.points):this.points):0}worldDraw(t){const e=this.createPaths(new THREE.Curve),i=this.getShapePoints(e);this._draw(t,i),this._drawStoreLine(t,i)}_fillImg(t,e){const i={transparent:!0,depthTest:!1,opacity:this.opacity,visible:this.visible};if(!this.isFill||!this.fillImageSrc)return;if(!this.material){let t=this;return void MxFun.loadImageMaterial(this.fillImageSrc,e=>{t.isLoadMaterialFromPath=!1,e&&(t.material=e,t.setNeedUpdateDisplay(),MxFun.updateDisplay())})}const s=e.map(({x:t,y:e})=>new THREE.Vector2(t,e));let r=this.material,o=new THREE.ShapeGeometry(new THREE.Shape(s));if(o=repairGeometryFaceVertexUvs(o),this.filter){const t=r.map,e=this.filter._getFilterShaderData(t);r=new THREE.ShaderMaterial(Object.assign(Object.assign({},e),i))}if(r.depthTest=!1,r.transparent=!0,r.opacity=this.opacity,r.visible=this.visible,this.fillImageParam){const t=this.fillImageParam;for(let e in this.fillImageParam){this.material.map[e]=t[e]}}let a=new THREE.Mesh(o,r);t.drawEntity(a)}getGripPoints(){return[]}moveGripPointsAt(t,e){return!0}dwgIn(t){return this.dwgInHelp(t,this._propertyDbKeys),this.isLoadMaterialFromPath=!0,this.material=null,t.type===MxType.MxCloneType.kMxFileClone?this.filter=MxFilters.fromJSON(t.filter):t.filter&&(this.filter=t.filter),!0}dwgOut(t){var e;return this.dwgOutHelp(t,this._propertyDbKeys),t.type===MxType.MxCloneType.kMxFileClone?this.filter&&(t.filter=null===(e=this.filter)||void 0===e?void 0:e.toJSON()):t.filter=this.filter,t}};

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

@@ -1,12 +1,15 @@
 import McGiWorldDraw from "../McGiWorldDraw";
 import MxDbShape from "../MxDbShape";
+/** 星形 */
 export default class MxDbStarShape extends MxDbShape {
     getTypeName(): string;
-    /** 星形 */
     constructor();
     center: import("three").Vector3;
+    /** 顶点数量 */
     numPoints: number;
+    /** 内部半径 */
     innerRadius: number;
+    /** 外部半径 */
     outerRadius: number;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): THREE.Vector3[];