mxdraw 0.1.3 → 0.1.4

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

@@ -175,7 +175,7 @@ export default abstract class MxDbEntity {
      *
      * ```
      */
-    clone(type?: number): any;
+    clone(type?: number): MxDbEntity;
     /**
      * 自定义对象内部数据输入同步（实现dwgIn抽象方法 必须在实现中调用 this.onDwgIn()）
      * @param obj dwgIn抽象方法的回调数据

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

@@ -0,0 +1,22 @@
+/** @module MxDbLine*/
+import * as THREE from 'three';
+import McGiWorldDraw from '../McGiWorldDraw';
+import MxDbEntity from '../MxDbEntity';
+/**
+ * MxDbLine 直线对象.
+ */
+export default class MxDbLine extends MxDbEntity {
+    private pt1;
+    private pt2;
+    getTypeName(): string;
+    worldDraw(pWorldDraw: McGiWorldDraw): 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/MxDbLine/index.d.ts

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

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

@@ -0,0 +1,74 @@
+import MxDbEntity from '../MxDbEntity';
+import { Color, Matrix4, Vector2, Vector3 } from 'three';
+import MxFilters from '../MxFilters';
+import McGiWorldDraw from '../McGiWorldDraw';
+/**
+ * MxRectEntity 矩形对象.
+ */
+export default class MxDbRect extends MxDbEntity {
+    /**
+     * pt1: 构成矩形的第一个点
+     * */
+    pt1: Vector3;
+    /**
+     * pt1: 构成矩形的第二个点(对角点)
+     * */
+    pt2: Vector3;
+    /**
+     * width: 在绘制时自动计算矩形像素宽度 单位px
+     * */
+    width: number;
+    /**
+     * 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
+     * */
+    opacity: number;
+    /**
+     * visible 该矩形对象是否可见
+     * */
+    visible: boolean;
+    /**
+     * fillImageSrc(优先级低于fillColor属性) 填充背景图片的地址
+     * */
+    fillImageSrc: string | undefined;
+    /**
+     * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)
+     * */
+    fillImageParam: {
+        offset?: Vector2;
+        repeat?: Vector2;
+        rotation?: number;
+        center?: Vector2;
+    } | undefined;
+    /**
+     * 设置滤镜对象{@link MxFilters} 默认为undefined | null 则不使用该滤镜效果
+     * */
+    filter: MxFilters | undefined | null;
+    worldDraw(pWorldDraw: McGiWorldDraw): void;
+    getGripPoints(): Array<Vector3>;
+    moveGripPointsAt(index: number, offset: Vector3): boolean;
+    dwgIn(obj: any): boolean;
+    dwgOut(obj: any): object;
+    create(): MxDbEntity;
+    transformBy(mat: Matrix4): void;
+    getTypeName(): string;
+}

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

@@ -0,0 +1,2 @@
+import MxDbRect from './MxDbRect';
+export default MxDbRect;

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

@@ -0,0 +1,94 @@
+/** 简单颜色滤镜矩阵 */
+import { Matrix4, Matrix3, Color } from 'three';
+interface ChannelParamTypes {
+    r?: number;
+    g?: number;
+    b?: number;
+}
+export default 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: Matrix3, stStep?: number, scaleFactor?: number): this;
+    /**
+     * 重置所有滤镜效果
+     * */
+    reset(): this;
+    _getFilterShaderData(texture: THREE.Texture): {
+        uniforms: {
+            e_Texture: {
+                value: import("three").Texture;
+            };
+            colorMatrix: {
+                value: Matrix4;
+            };
+        };
+        vertexShader: string;
+        fragmentShader: string;
+    };
+    _getFilterColor(color?: string | number | Color, opacity?: number): Color;
+}
+export {};

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

@@ -0,0 +1,2 @@
+import MxFilters from './MxFilters';
+export default MxFilters;

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

@@ -35,7 +35,7 @@ export default class MxFun {
      * })
      * ```
      */
-    createMxObject({ canvasId, cadFile, callback, isNewFile }: {
+    createMxObject({ canvasId, cadFile, callback, isNewFile, useWebsocket }: {
         canvasId?: string;
         cadFile?: string;
         callback?: (mxDraw: MxDrawObject, dom: {
@@ -43,6 +43,7 @@ export default class MxFun {
             canvasParent: CanvasParent;
         }) => void;
         isNewFile?: boolean;
+        useWebsocket?: boolean;
     }): void;
     /**
      * 为程序设置服务器地址

package/dist/types/doc.d.ts

@@ -14,4 +14,8 @@ import MrxDbgUiPrBaseReturn from './MxModule/MrxDbgUiPrBaseReturn/MrxDbgUiPrBase
 import McGiWorldDraw from './MxModule/McGiWorldDraw/McGiWorldDraw';
 import McGiWorldDrawType from './MxModule/McGiWorldDrawType/McGiWorldDrawType';
 import MxDbEntity from './MxModule/MxDbEntity/MxDbEntity';
-export { MxFun, MxThreeJS, MxDrawObject, MrxDbgUiPrPoint, McEdGetPointWorldDrawObject, MrxDbgUiPrBaseReturn, loadCoreCode, useCanvasResizeListener, McGiWorldDraw, McGiWorldDrawType, MxDbEntity };
+import MxDbImage from './MxModule/MxDbImage/MxDbImage';
+import MxDbSVG from './MxModule/MxDbSVG/MxDbSVG';
+import MxDbLine from './MxModule/MxDbLine/MxDbLine';
+import MxDbRect from './MxModule/MxDbRect/MxDbRect';
+export { MxFun, MxThreeJS, MxDrawObject, MrxDbgUiPrPoint, McEdGetPointWorldDrawObject, MrxDbgUiPrBaseReturn, loadCoreCode, useCanvasResizeListener, McGiWorldDraw, McGiWorldDrawType, MxDbEntity, MxDbImage, MxDbSVG, MxDbLine, MxDbRect };

package/dist/types/mxdraw.d.ts

@@ -1,6 +1,6 @@
 import loadCoreCode from './MxModule/loadCoreCode';
 import store from './MxModule/store';
-import MxFunModule from './MxModule/MxFun/MxFun';
+import MxFun from './MxModule/MxFun';
 import MxThreeJS from './MxModule/MxThreeJS';
 import MrxDbgUiPrPoint from './MxModule/MrxDbgUiPrPoint';
 import McEdGetPointWorldDrawObject from './MxModule/McEdGetPointWorldDrawObject';
@@ -9,24 +9,26 @@ import MrxDbgUiPrBaseReturn from './MxModule/MrxDbgUiPrBaseReturn';
 import MxDbEntity from './MxModule/MxDbEntity';
 import MxDbImage from './MxModule/MxDbImage';
 import MxDbSVG from './MxModule/MxDbSVG';
+import MxDbLine from './MxModule/MxDbLine';
+import MxDbRect from './MxModule/MxDbRect';
 import MxDbAlignedDimension from './MxModule/MxDbAlignedDimension';
 import McGiWorldDraw from './MxModule/McGiWorldDraw';
 import McGiWorldDrawType from './MxModule/McGiWorldDrawType';
 import MxType from './MxModule/MxType';
-import MxassemblyModule from './MxModule/Mxassembly/Mxassembly';
+import Mxassembly from './MxModule/Mxassembly';
 import McGeVector3d from './MxModule/McGeVector3d';
-declare const MxFun: MxFunModule;
-declare const Mxassembly: MxassemblyModule;
-export { MxFun, Mxassembly, MxThreeJS, McEdGetPointWorldDrawObject, MrxDbgUiPrPoint, McGeVector3d, MxDbEntity, MxDbImage, MxDbSVG, MxDbAlignedDimension, useCanvasResizeListener, loadCoreCode, store, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MxType };
+export { MxFun, Mxassembly, MxThreeJS, McEdGetPointWorldDrawObject, MrxDbgUiPrPoint, McGeVector3d, MxDbEntity, MxDbImage, MxDbLine, MxDbSVG, MxDbRect, MxDbAlignedDimension, useCanvasResizeListener, loadCoreCode, store, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MxType };
 declare const _default: {
-    MxFun: MxFunModule;
-    Mxassembly: MxassemblyModule;
+    MxFun: import("./doc").MxFun;
+    Mxassembly: import("./MxModule/Mxassembly/Mxassembly").default;
     MxThreeJS: import("./doc").MxThreeJS;
     McEdGetPointWorldDrawObject: typeof McEdGetPointWorldDrawObject;
     MrxDbgUiPrPoint: typeof MrxDbgUiPrPoint;
     MxDbEntity: typeof MxDbEntity;
     MxDbImage: typeof MxDbImage;
+    MxDbLine: typeof MxDbLine;
     MxDbSVG: typeof MxDbSVG;
+    MxDbRect: typeof MxDbRect;
     MxDbAlignedDimension: typeof MxDbAlignedDimension;
     useCanvasResizeListener: typeof useCanvasResizeListener;
     loadCoreCode: typeof loadCoreCode;

package/dist/types/tools/three/index.d.ts

@@ -1,3 +1,4 @@
+import { Vector3 } from 'three';
 /**
  * 移动geometry坐标。
  * @param geometry Three的Geometry对象
@@ -8,4 +9,22 @@
  * ```
  *
  */
-export declare function setGeometryPostion(geometry: THREE.Geometry, pos: THREE.Vector3): void;
+export declare function setGeometrPostion(geometry: THREE.Geometry, pos: THREE.Vector3): void;
+/**
+ * 生成圆角时修复纹理对应的 uvs
+ * @param geometry 几何体
+ * */
+export declare function repairGeometryFaceVertexUvs(geometry: THREE.Geometry): import("three").Geometry;
+/**
+ * 获取生成圆角的points定点位置
+ * @param points 生成圆角前
+ * @param cornerRadius 圆角值
+ * @param isClose 生成圆角的图形是否是闭合的
+ * */
+export declare function getToGenerateRoundedCorners(points: THREE.Vector3[], cornerRadius: number[], isClose?: boolean): THREE.Vector3[];
+/**
+ * 计算矩形点位
+ * @param pt1 点1
+ * @param pt3 点3
+ * */
+export declare function computeRectPoints(pt1: Vector3, pt3: Vector3): Vector3[];

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

@@ -2,7 +2,7 @@ import { MxDrawObjectType } from './MxDrawObject';
 import { MeshLambertMaterial } from 'three';
 import { MxCADObject } from './MxCADObject';
 export interface MxFunType {
-    createMxObject(canvasId: string, arg1: string, arg2: (mxDraw: MxDrawObjectType) => void, arg3: boolean): void;
+    createMxObject(canvasId: string, arg1: string, arg2: (mxDraw: MxDrawObjectType) => void, is2d: boolean | undefined, isNewCreate?: boolean, isStaticLoad?: boolean): void;
     setMxServer(MXSERVER: string): void;
     addCommand(cmdName: string, fun: Function): void;
     sendStringToExecute(sCmd: string, ...params: any[]): boolean;

package/package.json

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