mxdraw 0.1.2 → 0.1.3

package/dist/types/MxModule/McGeVector3d/McGeVector3d.d.ts

@@ -0,0 +1,17 @@
+/**
+ * McGeVector3d
+ * @example ```typescript
+ * ```
+ */
+export default interface McGeVector3d {
+    /**
+     *
+     * @returns
+     */
+    getVal(t: number): number;
+    /**
+     *
+     * @returns
+     */
+    setVal(v: number): void;
+}

package/dist/types/MxModule/McGeVector3d/index.d.ts

@@ -0,0 +1,3 @@
+/** @module MrxDbgUiPrPointClass */
+import McGeVector3d from './McGeVector3d';
+export default McGeVector3d;

package/dist/types/MxModule/McGiWorldDraw/McGiWorldDraw.d.ts

@@ -1,6 +1,6 @@
 /** @module McGiWorldDraw*/
-import McGiWorldDrawType from "../McGiWorldDrawType";
-import MxDrawObject from "../MxDrawObject";
+import McGiWorldDrawType from '../McGiWorldDrawType';
+import MxDrawObject from '../MxDrawObject';
 /**
  * McGiWorldDraw 用于构建一个动态绘制回调对象的规范接口
  * @abstract 是  {@link MxDbEntity.worldDraw }必须实现的抽象回调方法中的回调对象 通过回调对象完成一些动态绘制任务
@@ -92,7 +92,7 @@ export default interface McGiWorldDraw {
      * ```
      *
      */
-    drawLine(pt1: THREE.Vector3, pt2: THREE.Vector3): void;
+    drawLine(pt1: THREE.Vector3 | number, pt2: THREE.Vector3 | number, x2?: number, y2?: number): void;
     /**
      * 绘制连续的直线
      * @param points 点数组
@@ -104,20 +104,6 @@ export default interface McGiWorldDraw {
      *
      */
     drawLines(points: THREE.Vector3[]): void;
-    /**
-     * 绘制直线
-     * @param x1 第一个点的X坐标
-     * @param y1 第一个点的Y坐标
-     * @param x2 第二个点的X坐标
-     * @param y2 第二个点的Y坐标
-     * @returns
-     * @example
-     * ``` typescript
-     *
-     * ```
-     *
-     */
-    drawLine2(x1: number, y1: number, x2: number, y2: number): void;
     /**
      * 绘制圆
      * @param cen 圆的中心点 THREE.Vector3
@@ -165,63 +151,73 @@ export default interface McGiWorldDraw {
      */
     getRenderOrder(): number;
     /**
-    * 设置宽度单位是屏幕像素，默认是屏幕像素，设置false,单位是Threejs坐标。
-    * @returns
-    * @example
-    * ``` typescript
-    *
-    * ```
-    *
-    */
+     * 设置宽度单位是屏幕像素，默认是屏幕像素，设置false,单位是Threejs坐标。
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
     setLineWidthIsPixels(isPixels: boolean): void;
     /**
-   * 得到宽度单位
-   * @returns
-   * @example
-   * ``` typescript
-   *
-   * ```
-   *
-   */
+     * 得到宽度单位
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
     getLineWidthIsPixels(): boolean;
     /**
-   * 设置虚线显示数据。
-   * @returns
-   * @example
-   * ``` typescript
-   *
-   * ```
-   *
-   */
+     * 设置虚线显示数据。
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
     setDash(dDashArray: number, dDashRatio: number): void;
     /**
-   * 得到虚线显示数据。
-   * @returns
-   * @example
-   * ``` typescript
-   *
-   * ```
-   *
-   */
+     * 得到虚线显示数据。
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
     getDash(): any;
     /**
-    * 设置虚线显示
-    * @returns
-    * @example
-    * ``` typescript
-    *
-    * ```
-    *
-    */
+     * 设置虚线显示
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
     setDashLineDisplay(isDashLine: boolean): void;
     /**
-   *是否虚线显示
-   * @returns
-   * @example
-   * ``` typescript
-   *
-   * ```
-   *
-   */
+     *是否虚线显示
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
     isDashLineDisplay(): boolean;
+    /**
+     *绘制选择线。
+     * @returns
+     * @example
+     * ``` typescript
+     *
+     * ```
+     *
+     */
+    drawSelectLine(pt1: THREE.Vector3 | number, pt2: THREE.Vector3 | number, x2?: number, y2?: number): void;
 }

package/dist/types/MxModule/MxDbAlignedDimension/MxDbAlignedDimension.d.ts

@@ -0,0 +1,21 @@
+/** @module MxDbAlignedDimension*/
+import * as THREE from 'three';
+import McGiWorldDraw from '../McGiWorldDraw';
+import MxDbEntity from '../MxDbEntity';
+/**
+ * MxDbAlignedDimension 尺寸对象.
+ */
+export default class MxDbAlignedDimension extends MxDbEntity {
+    private pt1;
+    private pt2;
+    getTypeName(): string;
+    private getDirection;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    setPoint1(pt1: THREE.Vector3): void;
+    setPoint2(pt2: THREE.Vector3): void;
+    getGripPoints(): Array<THREE.Vector3>;
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    dwgIn(obj: any): boolean;
+    dwgOut(obj: any): object;
+    create(): MxDbEntity;
+}

package/dist/types/MxModule/MxDbAlignedDimension/index.d.ts

@@ -0,0 +1,3 @@
+/** @module McEdGetPointWorldDrawObject*/
+import MxDbAlignedDimension from './MxDbAlignedDimension';
+export default MxDbAlignedDimension;

package/dist/types/MxModule/MxDbEntity/MxDbEntity.d.ts

@@ -22,6 +22,7 @@ import McGiWorldDraw from '../McGiWorldDraw';
  */
 export default abstract class MxDbEntity {
     private iColor;
+    private iRenderOrder;
     /**
      * 自定义对象的绘制函数。在方法中定义如何绘制图形
      * @param  pWorldDraw 绘制对象{@link McGiWorldDraw }
@@ -96,23 +97,23 @@ export default abstract class MxDbEntity {
      */
     abstract dwgOut(obj: any): object;
     /**
-  * 得到对象类型名
-  * @param
-  * @returns string
-  * @example
-  * ``` typescript
-  *
-  * ```
-  */
+     * 得到对象类型名
+     * @param
+     * @returns string
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
     abstract getTypeName(): string;
     /**
-   * 自定义实体的坐标变换.
-   * @param
-   * @returns void
-   * @example
-   *  }
-   * ```
-   */
+     * 自定义实体的坐标变换.
+     * @param
+     * @returns void
+     * @example
+     *  }
+     * ```
+     */
     transformBy(mat: THREE.Matrix4): void;
     private getImp;
     /**
@@ -126,14 +127,14 @@ export default abstract class MxDbEntity {
      */
     setNeedUpdateDisplay(isImmediate?: boolean): boolean;
     /**
-   * 得到对象的id.
-   * @param
-   * @returns number
-   * @example
-   * ``` typescript
-   *
-   * ```
-   */
+     * 得到对象的id.
+     * @param
+     * @returns number
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
     objectId(): number;
     /**
      * 删除对象
@@ -173,7 +174,7 @@ export default abstract class MxDbEntity {
      * ``` typescript
      *
      * ```
-    */
+     */
     clone(type?: number): any;
     /**
      * 自定义对象内部数据输入同步（实现dwgIn抽象方法 必须在实现中调用 this.onDwgIn()）
@@ -193,6 +194,26 @@ export default abstract class MxDbEntity {
      * ``` typescript
      *
      * ```
-    */
+     */
     rxInit(): void;
+    /**
+     * 设置显示顺序
+     * @param
+     * @returns boolean
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
+    setRenderOrder(iRenderOrder: number): void;
+    /**
+     * 得到显示顺序
+     * @param
+     * @returns boolean
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
+    getRenderOrder(): number;
 }

package/dist/types/MxModule/MxDbImage/MxDbImage.d.ts

@@ -0,0 +1,28 @@
+/** @module MxDbImage*/
+import * as THREE from 'three';
+import McGiWorldDraw from '../McGiWorldDraw';
+import MxDbEntity from '../MxDbEntity';
+/**
+ * MxDbImage 图片对象.
+ */
+export default class MxDbImage extends MxDbEntity {
+    private pt1;
+    private pt2;
+    private imagePath;
+    private isLoadMaterialFromPath;
+    private material;
+    getTypeName(): string;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    setImagePath(sPath: string): void;
+    getImagePath(): string;
+    setMaterial(material: THREE.MeshLambertMaterial): void;
+    setPoint1(pt1: THREE.Vector3): void;
+    getPoint1(): THREE.Vector3;
+    setPoint2(pt2: THREE.Vector3): void;
+    getPoint2(): THREE.Vector3;
+    getGripPoints(): Array<THREE.Vector3>;
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    dwgIn(obj: any): boolean;
+    dwgOut(obj: any): object;
+    create(): MxDbEntity;
+}

package/dist/types/MxModule/MxDbImage/index.d.ts

@@ -0,0 +1,3 @@
+/** @module McEdGetPointWorldDrawObject*/
+import MxDbImage from './MxDbImage';
+export default MxDbImage;

package/dist/types/MxModule/MxDbSVG/MxDbSVG.d.ts

@@ -0,0 +1,42 @@
+/** @module MxDbSVG*/
+import * as THREE from 'three';
+import McGiWorldDraw from '../McGiWorldDraw';
+import MxDbEntity from '../MxDbEntity';
+/**
+ * MxDbSVG SVG对象.
+ */
+export default class MxDbSVG extends MxDbEntity {
+    private svgPos;
+    private svg;
+    private svgPath;
+    private svgSize;
+    private svgAlignmentRatio;
+    private isSvgDirtyLocation;
+    private isLoadFromPath;
+    private txtPos;
+    private txt;
+    private txtHeight;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    setSvgPath(path: string): void;
+    getSvgPath(): string;
+    setSvgPostion(pos: THREE.Vector3): void;
+    getSvgPostion(): THREE.Vector3;
+    setSvgSize(size: THREE.Vector2): void;
+    getSvgSize(): THREE.Vector2;
+    setSvgAlignmentRatio(alignmentRatio: THREE.Vector2): void;
+    getSvgAlignmentRatio(): THREE.Vector2;
+    setTextHeight(height: number): void;
+    getTextHeight(): number;
+    setText(txt: string): void;
+    getText(): string;
+    setTextPostion(pos: THREE.Vector3): void;
+    getTextPostion(): THREE.Vector3;
+    getGripPoints(): Array<THREE.Vector3>;
+    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    private calcSvgPosition;
+    dwgIn(obj: any): boolean;
+    dwgOut(obj: any): object;
+    create(): MxDbEntity;
+    transformBy(mat: THREE.Matrix4): void;
+    getTypeName(): string;
+}

package/dist/types/MxModule/MxDbSVG/index.d.ts

@@ -0,0 +1,3 @@
+/** @module McEdGetPointWorldDrawObject*/
+import MxDbSVG from './MxDbSVG';
+export default MxDbSVG;

package/dist/types/MxModule/MxDrawObject/MxDrawObject.d.ts

@@ -278,7 +278,7 @@ export default class MxDrawObject {
      *
      * ```
      */
-    screenCoord2Doc(x: number, y: number, z: number): THREE.Vector3;
+    screenCoord2Doc(x: number, y: number): THREE.Vector3;
     /**
      * ThreeJS坐标长度到DWG文档坐标长度
      * @returns number
@@ -348,7 +348,7 @@ export default class MxDrawObject {
      *
      * ```
      */
-    docCoord2Screen(x: number, y: number, z: number): THREE.Vector3;
+    docCoord2Screen(x: number, y: number): THREE.Vector3;
     /**
      * 屏幕坐标长度到DWG文档坐标长度
      * @returns number
@@ -422,24 +422,24 @@ export default class MxDrawObject {
      */
     getMxCurrentSelect(): Array<number>;
     /**
-    * 把对象添加到当前选择中.
-    * @returns void
-    * @example
-    * ```typescript
-    *
-    *
-    * ```
-    */
+     * 把对象添加到当前选择中.
+     * @returns void
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
     addMxCurrentSelect(id: number): void;
     /**
-  * 清除当前所有选择
-  * @returns void
-  * @example
-  * ```typescript
-  *
-  *
-  * ```
-  */
+     * 清除当前所有选择
+     * @returns void
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
     clearMxCurrentSelect(): boolean;
     /**
      *通过id获取绘制的对象.
@@ -454,8 +454,7 @@ export default class MxDrawObject {
     getMxEntity(id: number): MxDbEntity;
     /**
      * 查找某点位置处的用户自绘对象.
-     * @param ptMouse 查找的点位 THREE.Vector3
-     * @param isWorldCoord 点是否是默认坐标 默认为 true
+     * @param ptMouse 查找的点位 THREE.Vector3,默认是文档坐标
      * @returns MxDbEntity[] 返回用户自绘对象数组
      * @example
      * ```typescript
@@ -463,7 +462,7 @@ export default class MxDrawObject {
      *
      * ```
      */
-    findMxEntityAtPoint(ptMouse: THREE.Vector3, isWorldCoord?: boolean): Array<MxDbEntity>;
+    findMxEntityAtPoint(ptMouse: THREE.Vector3): Array<MxDbEntity>;
     /**
      *得到所有用户自绘对象.
      * @returns MxDbEntity[] 返回用户自绘对象数组
@@ -551,25 +550,25 @@ export default class MxDrawObject {
      */
     saveMxEntityToJson(): string;
     /**
-    * 从json字符串恢复MxEntity
-    * @param dataString json字符串.
-    * @returns
-    * @example
-    * ```typescript
-    *
-    *
-    * ```
-    */
+     * 从json字符串恢复MxEntity
+     * @param dataString json字符串.
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
     loadMxEntityFromJson(dataString: string): boolean;
     /**
-  * 删除所有对MxEntity
-  * @param
-  * @returns
-  * @example
-  * ```typescript
-  *
-  *
-  * ```
-  */
+     * 删除所有对MxEntity
+     * @param
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
     eraseAllMxEntity(): void;
 }

package/dist/types/MxModule/MxFun/MxFun.d.ts

@@ -136,6 +136,28 @@ export default class MxFun {
      * ```
      */
     screenCoordLong2World(len: number): number;
+    /**
+     * 屏幕坐标长度转文档坐标长度
+     * @param len 屏幕坐标长度
+     * @return number 文档坐标长度
+     * @example
+     * ``` typescript
+     * const len = Mx.MxFun.screenCoordLong2Doc(36)
+     * console.log(len)
+     * ```
+     */
+    screenCoordLong2Doc(len: number): number;
+    /**
+     * 文档坐标长度转屏幕坐标长度
+     * @param len 文档坐标长度
+     * @return number 屏幕坐标长度
+     * @example
+     * ``` typescript
+     * const len = Mx.MxFun.docCoordLong2Screen(36)
+     * console.log(len)
+     * ```
+     */
+    docCoordLong2Screen(len: number): number;
     /**
      * THREE.JS坐标长度转屏幕坐标长度
      * @param len THREE.JS坐标长度
@@ -148,14 +170,14 @@ export default class MxFun {
      */
     worldCoordLong2Doc(len: number): number;
     /**
-   * DWG文档坐标长度到ThreeJS坐标长度
-   * @returns number
-   * @example
-   * ```typescript
-   *
-   *
-   * ```
-   */
+     * DWG文档坐标长度到ThreeJS坐标长度
+     * @returns number
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
     docCoordLong2World(l: number): number;
     /**
      * 屏幕坐标转THREE.JS坐标.
@@ -222,7 +244,7 @@ export default class MxFun {
      * console.log(vector3)
      * ```
      */
-    screenCoord2Doc(x: number, y: number, z: number): THREE.Vector3;
+    screenCoord2Doc(x: number | THREE.Vector3, y?: number): THREE.Vector3;
     /**
      * 文档转屏幕坐标.
      * @param  x 坐标x
@@ -235,7 +257,7 @@ export default class MxFun {
      * console.log(vector3)
      * ```
      */
-    docCoord2Screen(x: number, y: number, z: number): THREE.Vector3;
+    docCoord2Screen(x: number | THREE.Vector3, y?: number): THREE.Vector3;
     /**
      * 更新显示，使用Three.js绘制了对象，调用该函数更新显示。
      * @return void
@@ -391,22 +413,22 @@ export default class MxFun {
      */
     loadImageMaterial(imageUrlPath: string, callResult: (material: MeshLambertMaterial) => void): void;
     /**
-    * 判断点是否在一个闭合的多边形区域。
-    * @param p
-    * @return any
-    * @example
-    * ``` typescript
-    *      let aryPoint:Array<THREE.Vector3> = [];
-    *      aryPoint.push(new THREE.Vector3(0,0,0));
-    *      aryPoint.push(new THREE.Vector3(0,100,0));
-    *      aryPoint.push(new THREE.Vector3(100,100,0));
-    *      aryPoint.push(new THREE.Vector3(100,0,0));
-    *      let pt:THREE.Vector3 = new THREE.Vector3(150,150);
-    *      if(MxFun.pointInPolyline(pt,aryPoint) ){
-    *        console.log("in");
-    *      }
-    * ```
-    */
+     * 判断点是否在一个闭合的多边形区域。
+     * @param p
+     * @return any
+     * @example
+     * ``` typescript
+     *      let aryPoint:Array<THREE.Vector3> = [];
+     *      aryPoint.push(new THREE.Vector3(0,0,0));
+     *      aryPoint.push(new THREE.Vector3(0,100,0));
+     *      aryPoint.push(new THREE.Vector3(100,100,0));
+     *      aryPoint.push(new THREE.Vector3(100,0,0));
+     *      let pt:THREE.Vector3 = new THREE.Vector3(150,150);
+     *      if(MxFun.pointInPolyline(pt,aryPoint) ){
+     *        console.log("in");
+     *      }
+     * ```
+     */
     pointInPolyline(pt: THREE.Vector3, vecPolyline: Array<THREE.Vector3>): boolean;
     /**
      * 计算多边形区域的面积
@@ -417,5 +439,14 @@ export default class MxFun {
      * ```
      */
     calcArea(aryPoint: Array<THREE.Vector3>): number;
+    /**
+     * 重新打开cad文件，该函数在控件创建完后，需要再次重新打开文件，调用。
+     * @param sFile 打的cad文件路径
+     * @return any
+     * @example
+     * ``` typescript
+     * ```
+     */
+    openFile(sFile: string): boolean;
 }
 export {};

package/dist/types/MxModule/MxThreeJS/MxThreeJS.d.ts

@@ -1,4 +1,4 @@
-import { Vector3, Line, Object3D, LineLoop, Points, Sprite, Mesh, MeshBasicMaterial } from 'three';
+import { Vector3, Line, Object3D, Points, Sprite, Mesh, MeshBasicMaterial } from 'three';
 /**
  * MxThreeJS 模块
  * ##### 使用说明:
@@ -68,7 +68,7 @@ export default class MxThreeJS {
      * Mx.MxThreeJS.createCircle(new Three.Vector3(1,10,0), 10, 0)
      * ```
      */
-    createCircle(mCenterPt: Vector3, dRadius: number, iColor: ColorType): LineLoop;
+    createCircle(mCenterPt: Vector3, dRadius: number, iColor: ColorType): Object3D;
     /**
      * 创建Three.js点对象。
      * @param mPt 点位置

package/dist/types/MxModule/MxType/index.d.ts

@@ -1,2 +1,2 @@
-import MxType from "./MxType";
+import MxType from './MxType';
 export default MxType;

package/dist/types/MxModule/Mxassembly/Mxassembly.d.ts

@@ -0,0 +1,11 @@
+import McGeVector3d from '../McGeVector3d';
+/**
+ * Mxassembly 模块
+ * 导出库时已实例化，只需要调用实例方法 例如：
+ * ```typescript
+ * ```
+ */
+export default class Mxassembly {
+    constructor();
+    NewMcGeVector3d(): McGeVector3d;
+}

package/dist/types/MxModule/Mxassembly/index.d.ts

@@ -0,0 +1,3 @@
+import MxassemblyModule from './Mxassembly';
+declare const _default: MxassemblyModule;
+export default _default;

package/dist/types/MxModule/loadCoreCode/mxcadassembly_es5.d.ts

@@ -0,0 +1 @@
+export default function mxcadassemblyinit(): any;