mxcad 1.0.99 → 1.0.101

package/dist/mxcad.d.ts

@@ -55,10 +55,12 @@ export declare class McGePoint3d {
 	* 计算点加上向量后的新位置
 	*/
 	addvec(vec: McGeVector3d): this;
+	av(vec: McGeVector3d): this;
 	/**
 	 * 计算点减去向量后的新位置
 	 */
 	subvec(vec: McGeVector3d): this;
+	sv(vec: McGeVector3d): this;
 	/**
 	 * 返回两点相减后得到的一个新的向量
 	 */
@@ -75,6 +77,7 @@ export declare class McGePoint3d {
 	 * 刻隆一个对对象
 	 */
 	clone(): McGePoint3d;
+	c(): McGePoint3d;
 	/**
 	 * X 坐标。
 	 */
@@ -115,6 +118,7 @@ export declare class McGeVector3d {
 	 * 刻隆一个对对象
 	 */
 	clone(): McGeVector3d;
+	c(): McGeVector3d;
 	rotateBy(ang: number, axis?: McGeVector3d): this;
 	negate(): this;
 	perpVector(): this;
@@ -770,7 +774,12 @@ export declare class MxCADSelectionSet extends McRxObject {
 }
 export declare class MxCADUiPrBase {
 	protected imp: any;
+	protected mxobj: MxDrawObject;
 	constructor(imp: any);
+	protected doc2cad1(pt: THREE.Vector3): McGePoint3d;
+	protected doc2cad2(x: number, y: number, z: number): McGePoint3d;
+	protected cad2doc1(pt: McGePoint3d): THREE.Vector3;
+	protected cad2doc2(x: number, y: number, z: number): THREE.Vector3;
 	/**
    * 返回关键字列表
    * @returns 关键词列表
@@ -893,10 +902,10 @@ export declare class MxCADUiPrPoint extends MxCADUiPrBase {
 	 */
 	value(): McGePoint3d;
 	/**
-	 * 得到 MxCAD下CAD图纸坐标.
+	 * 得到 Three.js 坐标.
 	 * @returns 点对象 MdGePoint3d
 	 */
-	getCADValue(): McGePoint3d;
+	getDocValue(): McGePoint3d;
 	/**
 	 * 得到动态拖动的基点
 	 * @returns 基点 THREE.THREE.Vector3
@@ -1029,7 +1038,7 @@ export declare class MxCADUiPrEntity extends MxCADUiPrBase {
 	 * 得以获取对象时的输入点的CAD图纸坐标.
 	 * @returns 点对象 MdGePoint3d
 	 */
-	getCADPickPoint(): McGePoint3d;
+	getDocPickPoint(): McGePoint3d;
 }
 /**
  * 表示数据库实体。
@@ -2545,6 +2554,10 @@ export declare class McObject {
 	 * @returns 对象实现
 	 */
 	getImp(): any;
+	/**
+	 * 重绘图上所有对象.
+	 */
+	regen(): void;
 	/**
 	 * 显示全部
 	 */
@@ -2694,6 +2707,16 @@ export declare class McObject {
 	 */
 	set drawColor(val: McCmColor);
 	/**
+   * 设置绘制颜色索引
+   * @param val 绘制颜色,ColorIndexType
+   */
+	get drawColorIndex(): number;
+	/**
+	 * 设置绘制颜色索引
+	 * @param val 绘制颜色,ColorIndexType
+	 */
+	set drawColorIndex(val: number);
+	/**
 	 * 获取绘制线宽
 	 * @returns 返回绘制线宽
 	 */
@@ -2747,7 +2770,7 @@ export declare class McObject {
 	 * 添加图层
 	 * @param pszName 图层名称
 	 */
-	addLayer(pszName: string): void;
+	addLayer(string: string): void;
 	/**
 	 * 添加文字样式
 	 * @param pszName 样式名称
@@ -2755,20 +2778,20 @@ export declare class McObject {
 	 * @param pszBigFontFileName 大字体文件名
 	 * @param dXScale X 方向缩放比例
 	 */
-	addTextStyle(pszName: string, pszFileName: string, pszBigFontFileName: string, dXScale: number): void;
+	addTextStyle(sName: string, sFileName: string, sBigFontFileName: string, dXScale: number): void;
 	/**
 	 * 添加线型
 	 * @param pszName 线型名称
 	 * @param pszLineDefine 线型定义
 	 */
-	addLinetype(pszName: string, pszLineDefine: string): void;
+	addLinetype(sName: string, sLineDefine: string): void;
 	/**
 	 * 添加线型
 	 * @param pszName 线型名称
 	 * @param pszLineDefine 线型定义
 	 * @param pszTextStyle 文字样式
 	 */
-	addLinetypeEx(pszName: string, pszLineDefine: string, pszTextStyle: string): void;
+	addLinetypeEx(sName: string, sLineDefine: string, sTextStyle: string): void;
 	/**
 	 * 绘制直线
 	 * @param dX1 起点 X 坐标
@@ -2779,7 +2802,8 @@ export declare class McObject {
 	 * @param dZ2 终点 Z 坐标
 	 * @returns 绘制的直线 ID
 	 */
-	drawLine(dX1: number, dY1: number, dZ1: number, dX2: number, dY2: number, dZ2: number): number;
+	drawLine(dX1: number, dY1: number, dX2: number, dY2: number): McObjectId;
+	drawLine3d(dX1: number, dY1: number, dZ1: number, dX2: number, dY2: number, dZ2: number): McObjectId;
 	/**
 	 * 添加标注样式
 	 * @param pszName 样式名称
@@ -2798,6 +2822,14 @@ export declare class McObject {
 	 * @param val 样式名称
 	 */
 	set drawDimStyle(val: string);
+	/**
+	 * 把当前路径做上排除标记，主要用于填充的绘制，把这个路径组成的闭合区域在填充中挖去
+	 */
+	pathMakeExclude(isExclude: boolean): void;
+	/**
+	 * 增加一个图案定义
+	 */
+	addPatternDefinition(sName: string, sDefinitionData: string): void;
 	/**
 	 * 获取当前绘制的线型定义
 	 */
@@ -2810,12 +2842,12 @@ export declare class McObject {
 	/**
 	 * 获取当前绘制的线宽
 	 */
-	get drawLineWidth(): string;
+	get drawLineWidth(): number;
 	/**
 	 * 设置当前绘制的线宽
 	 * @param val 线宽
 	 */
-	set drawLineWidth(val: string);
+	set drawLineWidth(val: number);
 	/**
 	 * 绘制圆弧
 	 * @param dCenterX 圆心 X 坐标
@@ -2825,7 +2857,7 @@ export declare class McObject {
 	 * @param dEndAng 结束角度，单位为弧度
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawArc(dCenterX: number, dCenterY: number, dRadius: number, dStartAng: number, dEndAng: number): number;
+	drawArc(dCenterX: number, dCenterY: number, dRadius: number, dStartAng: number, dEndAng: number): McObjectId;
 	/**
 	 * 绘制圆弧
 	 * @param dStartPointX 起始点 X 坐标
@@ -2835,14 +2867,23 @@ export declare class McObject {
 	 * @param dEndPointX 结束点 X 坐标
 	 * @param dEndPointY 结束点 Y 坐标
 	 */
-	drawArc2(dStartPointX: number, dStartPointY: number, dMidPointX: number, dMidPointY: number, dEndPointX: number, dEndPointY: number): any;
+	drawArc2(dStartPointX: number, dStartPointY: number, dMidPointX: number, dMidPointY: number, dEndPointX: number, dEndPointY: number): McObjectId;
+	/**
+	* 绘制圆弧
+	* @param dStartPointX 起始点 X 坐标
+	* @param dStartPointY 起始点 Y 坐标
+	* @param dEndPointX 结束点 X 坐标
+	* @param dEndPointY 结束点 Y 坐标
+	* @param dBulge 凸度
+	*/
+	drawArc3(dStartPointX: number, dStartPointY: number, dEndPointX: number, dEndPointY: number, dBulge: number): McObjectId;
 	/**
 	 * 绘制圆
 	 * @param dCenterX 圆心 X 坐标
 	 * @param dCenterY 圆心 Y 坐标
 	 * @param dRadius 半径
 	 */
-	drawCircle(dCenterX: number, dCenterY: number, dRadius: number): any;
+	drawCircle(dCenterX: number, dCenterY: number, dRadius: number): McObjectId;
 	/**
 	 * 绘制椭圆
 	 * @param dCenterX 椭圆中心 X 坐标
@@ -2852,7 +2893,7 @@ export declare class McObject {
 	 * @param dRadiusRatio 短轴与长轴的比例
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawEllipse(dCenterX: number, dCenterY: number, dMajorAxisX: number, dMajorAxisY: number, dRadiusRatio: number): number;
+	drawEllipse(dCenterX: number, dCenterY: number, dMajorAxisX: number, dMajorAxisY: number, dRadiusRatio: number): McObjectId;
 	/**
 	 * 绘制椭圆弧
 	 * @param dCenterX 椭圆中心 X 坐标
@@ -2863,13 +2904,13 @@ export declare class McObject {
 	 * @param dStartAng 起始角度，单位为弧度
 	 * @param dEndAng 结束角度，单位为弧度
 	 */
-	drawEllipseArc(dCenterX: number, dCenterY: number, dMajorAxisX: number, dMajorAxisY: number, dRadiusRatio: number, dStartAng: number, dEndAng: number): any;
+	drawEllipseArc(dCenterX: number, dCenterY: number, dMajorAxisX: number, dMajorAxisY: number, dRadiusRatio: number, dStartAng: number, dEndAng: number): McObjectId;
 	/**
 	 * 绘制点
 	 * @param dX X 坐标
 	 * @param dY Y 坐标
 	 */
-	drawPoint(dX: number, dY: number): any;
+	drawPoint(dX: number, dY: number): McObjectId;
 	/**
 	 * 绘制实体
 	 * @param dX1 第一个点 X 坐标
@@ -2882,7 +2923,7 @@ export declare class McObject {
 	 * @param dY4 第四个点 Y 坐标
 	 * @returns 成功返回实体号，失败返回 0
 	 */
-	drawSolid(dX1: number, dY1: number, dX2: number, dY2: number, dX3: number, dY3: number, dX4: number, dY4: number): number;
+	drawSolid(dX1: number, dY1: number, dX2: number, dY2: number, dX3: number, dY3: number, dX4: number, dY4: number): McObjectId;
 	/**
 	 * 绘制多行文本
 	 * @param dPosX 文本位置 X 坐标
@@ -2894,7 +2935,7 @@ export declare class McObject {
 	 * @param iAttachment 对齐方式
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawMText(dPosX: number, dPosY: number, pszContents: string, dHeight: number, dWidth: number, dRotation: number, iAttachment: number): number;
+	drawMText(dPosX: number, dPosY: number, sContents: string, dHeight: number, dWidth: number, dRotation: number, iAttachment: number): McObjectId;
 	/**
 	 * 绘制单行文本
 	 * @param dPosX 文本位置 X 坐标
@@ -2906,7 +2947,7 @@ export declare class McObject {
 	 * @param verticalMode 纵向对齐方式
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawText(dPosX: number, dPosY: number, pszText: string, dHeight: number, dRotation: number, horizontalMode: number, verticalMode: number): number;
+	drawText(dPosX: number, dPosY: number, pszText: string, dHeight: number, dRotation: number, horizontalMode: number, verticalMode: number): McObjectId;
 	/**
 	 * 绘制块参照
 	 * @param dPosX 参照位置 X 坐标
@@ -2916,7 +2957,7 @@ export declare class McObject {
 	 * @param dAng 旋转角度，单位为弧度
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawBlockReference(dPosX: number, dPosY: number, pszBlkName: number, dScale: number, dAng: number): number;
+	drawBlockReference(dPosX: number, dPosY: number, sBlkName: string, dScale: number, dAng: number): McObjectId;
 	/**
 	 * 绘制对齐标注
 	 * @param dExtLine1PointX 第一条尺线起点 X 坐标
@@ -2927,7 +2968,7 @@ export declare class McObject {
 	 * @param dTextPositionY 文本位置 Y 坐标
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawDimAligned(dExtLine1PointX: number, dExtLine1PointY: number, dExtLine2PointX: number, dExtLine2PointY: number, dTextPositionX: number, dTextPositionY: number): number;
+	drawDimAligned(dExtLine1PointX: number, dExtLine1PointY: number, dExtLine2PointX: number, dExtLine2PointY: number, dTextPositionX: number, dTextPositionY: number): McObjectId;
 	/**
 	 * 绘制角度标注
 	 * @param dAngleVertexX 角度顶点 X 坐标
@@ -2940,7 +2981,7 @@ export declare class McObject {
 	 * @param dTextPointY 文本位置 Y 坐标
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawDimAngular(dAngleVertexX: number, dAngleVertexY: number, dFirstEndPointX: number, dFirstEndPointY: number, dSecondEndPointX: number, dSecondEndPointY: number, dTextPointX: number, dTextPointY: number): number;
+	drawDimAngular(dAngleVertexX: number, dAngleVertexY: number, dFirstEndPointX: number, dFirstEndPointY: number, dSecondEndPointX: number, dSecondEndPointY: number, dTextPointX: number, dTextPointY: number): McObjectId;
 	/**
 	 * 绘制直径标注
 	 * @param dChordPointX 弦线端点 X 坐标
@@ -2950,7 +2991,7 @@ export declare class McObject {
 	 * @param dLeaderLength 引线长度
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawDimDiametric(dChordPointX: number, dChordPointY: number, dFarChordPointX: number, dFarChordPointY: number, dLeaderLength: number): number;
+	drawDimDiametric(dChordPointX: number, dChordPointY: number, dFarChordPointX: number, dFarChordPointY: number, dLeaderLength: number): McObjectId;
 	/**
 	 * 绘制旋转标注
 	 * @param dExtLine1PointX 第一条尺线起点 X 坐标
@@ -2962,7 +3003,7 @@ export declare class McObject {
 	 * @param dRotationAngle 旋转角度，单位为弧度
 	 * @returns 成功返回 1，失败返回 0
 	 */
-	drawDimRotated(dExtLine1PointX: number, dExtLine1PointY: number, dExtLine2PointX: number, dExtLine2PointY: number, dDimLineLocationX: number, dDimLineLocationY: number, dRotationAngle: number): number;
+	drawDimRotated(dExtLine1PointX: number, dExtLine1PointY: number, dExtLine2PointX: number, dExtLine2PointY: number, dDimLineLocationX: number, dDimLineLocationY: number, dRotationAngle: number): McObjectId;
 	/**
 	 * 绘制标注线性尺寸
 	 * @param dDefinitionPointX - 定义点 X 坐标
@@ -2972,7 +3013,7 @@ export declare class McObject {
 	 * @param isUseXAxis - 是否沿 X 轴方向标注
 	 * @returns 绘制结果
 	 */
-	drawDimOrdinate(dDefinitionPointX: number, dDefinitionPointY: number, dDeaderEndPointX: number, dDeaderEndPointY: number, isUseXAxis: boolean): number;
+	drawDimOrdinate(dDefinitionPointX: number, dDefinitionPointY: number, dDeaderEndPointX: number, dDeaderEndPointY: number, isUseXAxis: boolean): McObjectId;
 	/**
 	 * 绘制标注径向尺寸
 	 * @param dCenterX - 中心点 X 坐标
@@ -2982,7 +3023,7 @@ export declare class McObject {
 	 * @param dLeaderLength - 标注线长度
 	 * @returns 绘制结果
 	 */
-	drawDimRadial(dCenterX: number, dCenterY: number, dChordPointX: number, dChordPointY: number, dLeaderLength: number): number;
+	drawDimRadial(dCenterX: number, dCenterY: number, dChordPointX: number, dChordPointY: number, dLeaderLength: number): McObjectId;
 	/**
 	 * 将路径移动到指定位置
 	 * @param dX - X 坐标
@@ -3017,12 +3058,12 @@ export declare class McObject {
 	 * 将路径转换为折线
 	 * @returns 转换结果
 	 */
-	drawPathToPolyline(): number;
+	drawPathToPolyline(): McObjectId;
 	/**
 	 * 将路径转换为样条曲线
 	 * @returns 转换结果
 	 */
-	drawPathToSpline(): number;
+	drawPathToSpline(): McObjectId;
 	/**
 	 * 闭合路径
 	 */
@@ -3032,13 +3073,13 @@ export declare class McObject {
 	 * @param dPatternScale - 图案缩放比例
 	 * @returns 转换结果
 	 */
-	drawPathToHatch(dPatternScale: number): number;
+	drawPathToHatch(dPatternScale: number): McObjectId;
 	/**
 	 * 绘制实体
 	 * @param entity - 实体对象
 	 * @returns 绘制结果
 	 */
-	drawEntity(entity: McDbEntity): number;
+	drawEntity(entity: McDbEntity): McObjectId;
 	/**
   * 将 lIdIndex 转换成 McDbObject 对象
   * @param lIdIndex - 对象 ID
@@ -3065,11 +3106,15 @@ export declare class McObject {
 	/**
 	* 当前绘图坐标到CAD图纸坐标.
    */
-	docCoord2Cad(pt: McGePoint3d): McGePoint3d;
+	doc2cad(pt: McGePoint3d): McGePoint3d;
 	/**
    * CAD图纸坐标到当前绘图坐标
   */
-	cadCoord2Doc(pt: McGePoint3d): McGePoint3d;
+	cad2doc(pt: McGePoint3d): McGePoint3d;
+	doc2cad1(pt: THREE.Vector3): McGePoint3d;
+	doc2cad2(x: number, y: number, z: number): McGePoint3d;
+	cad2doc1(pt: McGePoint3d): THREE.Vector3;
+	cad2doc2(x: number, y: number, z: number): THREE.Vector3;
 	/**
 	 * 更新显示
 	*/
@@ -3192,6 +3237,11 @@ export declare class MxCppType {
 }
 export declare let MxCpp: MxCppType;
 export declare function loadMxCADassembly(call?: (MxCpp: MxCppType) => void, locateFile?: (fileName: string, base?: string | URL) => string, wasmBinary?: ArrayBuffer, fontspath?: string, networkFonts?: string[]): Promise<MxCppType>;
+export declare function MxCheckTheBrowser(): {
+	ok: boolean;
+	error: string;
+	var: any;
+};
 /** createMxCad 的参数配置 */
 export interface MxCadConfig {
 	/** 获取加载wasm相关文件(wasm/js/worker.js)路径位置
@@ -3378,8 +3428,6 @@ export interface Color extends McCmColor {
 export declare function drawText(): Promise<void>;
 /** 绘制圆*/
 export declare function drawCircle(): void;
-/** 绘制线段
- * */
 export declare function drawLine(): Promise<void>;
 export declare function drawMText(): Promise<void>;
 /**绘制多义线段*/
@@ -3458,6 +3506,8 @@ export interface MxDraw3d extends WasmConfig {
 	openFromUrl: (name: string, fileUrl: string) => void;
 	/** 加载贴图图片 */
 	loadTextureImg: (fileUrl: string, fileName: string) => void;
+	/** 适应选中的对象 */
+	fitSelectedObjects: () => void;
 	/** 设置多维数据集贴图背景 */
 	setCubemapBackground(url: string): void;
 	/** 完成初始化 */
@@ -3629,6 +3679,7 @@ export interface MxDraw3d extends WasmConfig {
 	mdGeBRep: MdGeBRep;
 	/** 表示几何平面句柄 */
 	MdGeHGeomPlane: typeof MdGeHGeomPlane;
+	mdGeHGeomPlane: MdGeHGeomPlane;
 	/** 表示几何曲面句柄 */
 	MdGeHGeomSurface: typeof MdGeHGeomSurface;
 	/** 所有类的父类，除MdGeTopo，MdGeBRep */
@@ -6079,6 +6130,17 @@ export declare class MdGeBRep {
 	openBrepFromUrl(theModelPath: string): MdGeShape;
 	RemoveAllLights(): void;
 	AddLight(theLight: MdGeLight): void;
+	EnableAllLights(): void;
+	DisableAllLights(): void;
+	EnableLight(theName: string): boolean;
+	DisableLight(theName: string): boolean;
+	DeleteAllLights(): void;
+	OutputDefinedLights(): void;
+	OutputActiveLights(): void;
+	SetAllLightsOn(): void;
+	SetAllLightsOff(): void;
+	SetLightOn(theName: string): boolean;
+	SetLightOff(theName: string): boolean;
 }
 /**
  * 表示颜色