mxdraw 0.1.8 → 0.1.9

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

@@ -21,8 +21,16 @@ import McGiWorldDraw from '../McGiWorldDraw';
  * ```
  */
 export default abstract class MxDbEntity {
-    private iColor;
-    private iRenderOrder;
+    color: ColorType;
+    renderOrder: number;
+    /**
+     * opacity 设置透明度 0 ~ 1,1表示完全不透明，0表示全透明.
+     * */
+    opacity: number;
+    /**
+     * visible 该矩形对象是否可见
+     * */
+    visible: boolean;
     /**
      * 自定义对象的绘制函数。在方法中定义如何绘制图形
      * @param  pWorldDraw 绘制对象{@link McGiWorldDraw }
@@ -155,7 +163,7 @@ export default abstract class MxDbEntity {
      *
      * ```
      */
-    setColor(iColor: ColorType): void;
+    setColor(color: ColorType): void;
     /**
      * 得到颜色
      * @param
@@ -205,7 +213,7 @@ export default abstract class MxDbEntity {
      *
      * ```
      */
-    setRenderOrder(iRenderOrder: number): void;
+    setRenderOrder(renderOrder: number): void;
     /**
      * 得到显示顺序
      * @param

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

@@ -1,11 +1,12 @@
 import MxDbEntity from '../MxDbEntity';
-import { Color, Matrix4, Vector2, Vector3 } from 'three';
+import { Matrix4, Vector3 } from 'three';
 import MxFilters from '../MxFilters';
 import McGiWorldDraw from '../McGiWorldDraw';
 /**
  * MxRectEntity 矩形对象.
  */
 export default class MxDbRect extends MxDbEntity {
+    private cornerRadius;
     /**
      * pt1: 构成矩形的第一个点
      * */
@@ -15,60 +16,38 @@ export default class MxDbRect extends MxDbEntity {
      * */
     pt2: Vector3;
     /**
-     * width: 在绘制时自动计算矩形像素宽度 单位px
+     * 是否需要颜色填充.
      * */
-    width: number;
+    isSolidColorFill: boolean;
     /**
-     * height: 在绘制时自动计算矩形像素高度 单位px
-     * */
-    height: number;
-    /**
-     * cornerRadius(优先级大于radius属性): 圆角的半径  如[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4
-     * */
-    cornerRadius: number[];
-    /**
-     * radius(优先级低于cornerRadius属性): 所有圆角统一半径  (radius = 4) 通过MxFun.screenCoordLong2Doc方法转换为 (cornerRadius = [MxFun.screenCoordLong2Doc(4)...])
-     * */
-    radius: number | undefined;
-    /**
-     * fillColor(优先级低于fillImageSrc属性): 设置颜色后 矩形线框会填充为带颜色的矩形
-     * */
-    fillColor: Color | string | number | undefined;
-    /**
-     * transparent 开启透明度
-     * */
-    transparent: boolean;
-    /**
-     * opacity 设置透明度 0 ~ 1
+     * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)
      * */
-    opacity: number;
+    private fillImageParam;
     /**
-     * visible 该矩形对象是否可见
+     * 设置滤镜对象{@link MxFilters} 默认为undefined | null 则不使用该滤镜效果
      * */
-    visible: boolean;
+    private filter;
     /**
      * fillImageSrc(优先级低于fillColor属性) 填充背景图片的地址
      * */
-    fillImageSrc: string | undefined;
-    /**
-     * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)
-     * */
-    fillImageParam: {
-        offset?: Vector2;
-        repeat?: Vector2;
-        rotation?: number;
-        center?: Vector2;
-    } | undefined;
-    /**
-     * 设置滤镜对象{@link MxFilters} 默认为undefined | null 则不使用该滤镜效果
-     * */
-    filter: MxFilters | undefined | null;
+    private fillImageSrc;
+    private isLoadMaterialFromPath;
+    private material;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     getGripPoints(): Array<Vector3>;
     moveGripPointsAt(index: number, offset: Vector3): boolean;
     dwgIn(obj: any): boolean;
     dwgOut(obj: any): object;
-    create(): MxDbEntity;
+    create(): MxDbRect;
     transformBy(mat: Matrix4): void;
+    /**
+     * setRadius 设置圆角 圆角的半径  如[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4
+     * @param { number | number[] } radius 圆角半径 为数组时[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4； 或者直接设置半径值 则四个角统一半径
+     * */
+    setRadius(radius: number | number[], isScreenCoord?: boolean): void;
     getTypeName(): string;
+    getFilter(): MxFilters | undefined | null;
+    setFilter(filter: MxFilters | undefined | null): void;
+    setFillImagePath(sPath: string | undefined): void;
+    getFillImagePath(): string | undefined;
 }

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

@@ -2,6 +2,7 @@
 import * as THREE from 'three';
 import McGiWorldDraw from '../McGiWorldDraw';
 import MxDbEntity from '../MxDbEntity';
+import MxDbSVGText from '../MxDbSVGText';
 /**
  * MxDbSVG SVG对象.
  */
@@ -13,9 +14,7 @@ export default class MxDbSVG extends MxDbEntity {
     private svgAlignmentRatio;
     private isSvgDirtyLocation;
     private isLoadFromPath;
-    private txtPos;
-    private txt;
-    private txtHeight;
+    private aryText;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
     setSvgPath(path: string): void;
     getSvgPath(): string;
@@ -25,12 +24,8 @@ export default class MxDbSVG extends MxDbEntity {
     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;
+    getText(index: number): MxDbSVGText | null;
+    addText(txt: MxDbSVGText): void;
     getGripPoints(): Array<THREE.Vector3>;
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
     private calcSvgPosition;
@@ -39,4 +34,5 @@ export default class MxDbSVG extends MxDbEntity {
     create(): MxDbEntity;
     transformBy(mat: THREE.Matrix4): void;
     getTypeName(): string;
+    setColor(color: ColorType): void;
 }

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

@@ -0,0 +1,7 @@
+/** @module MxDbSVG*/
+import * as THREE from 'three';
+export default class MxDbSVGText {
+    txtPos: THREE.Vector3;
+    txt: string;
+    txtHeight: number;
+}

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

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

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

@@ -1,5 +1,6 @@
 import MxDrawObject from '../MxDrawObject';
 import { MeshLambertMaterial } from 'three';
+import MxDbEntity from '../MxDbEntity';
 interface CanvasParent extends HTMLElement {
     tabindex?: number;
 }
@@ -450,5 +451,16 @@ export default class MxFun {
      * ```
      */
     openFile(sFile: string): boolean;
+    /**
+     * 添加一个MxDbEntity实体到当前绘图对象上。
+     * @param ent  实体对象
+     * @returns number 返回对象的id.
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    addToCurrentSpace(ent: MxDbEntity): number;
 }
 export {};

package/dist/types/mxdraw.d.ts

@@ -9,6 +9,7 @@ import MrxDbgUiPrBaseReturn from './MxModule/MrxDbgUiPrBaseReturn';
 import MxDbEntity from './MxModule/MxDbEntity';
 import MxDbImage from './MxModule/MxDbImage';
 import MxDbSVG from './MxModule/MxDbSVG';
+import MxDbSVGText from './MxModule/MxDbSVGText';
 import MxDbLine from './MxModule/MxDbLine';
 import MxDbRect from './MxModule/MxDbRect';
 import MxDbAlignedDimension from './MxModule/MxDbAlignedDimension';
@@ -18,7 +19,7 @@ import McGiWorldDrawType from './MxModule/McGiWorldDrawType';
 import MxType from './MxModule/MxType';
 import Mxassembly from './MxModule/Mxassembly';
 import McGeVector3d from './MxModule/McGeVector3d';
-export { MxFun, Mxassembly, MxThreeJS, McEdGetPointWorldDrawObject, MrxDbgUiPrPoint, McGeVector3d, MxDbEntity, MxFilters, MxDbImage, MxDbLine, MxDbSVG, MxDbRect, MxDbAlignedDimension, useCanvasResizeListener, loadCoreCode, store, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MxType };
+export { MxFun, Mxassembly, MxThreeJS, McEdGetPointWorldDrawObject, MrxDbgUiPrPoint, McGeVector3d, MxDbEntity, MxFilters, MxDbImage, MxDbLine, MxDbSVG, MxDbSVGText, MxDbRect, MxDbAlignedDimension, useCanvasResizeListener, loadCoreCode, store, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MxType };
 declare const _default: {
     MxFun: import("./doc").MxFun;
     Mxassembly: import("./MxModule/Mxassembly/Mxassembly").default;
@@ -30,6 +31,7 @@ declare const _default: {
     MxDbImage: typeof MxDbImage;
     MxDbLine: typeof MxDbLine;
     MxDbSVG: typeof MxDbSVG;
+    MxDbSVGText: typeof MxDbSVGText;
     MxDbRect: typeof MxDbRect;
     MxDbAlignedDimension: typeof MxDbAlignedDimension;
     useCanvasResizeListener: typeof useCanvasResizeListener;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mxdraw",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "",
   "keywords": [],
   "main": "dist/mxdraw.umd.js",