mxdraw 0.0.13 → 0.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/README.md +28 -27
  2. package/dist/lib/MxModule/McEdGetPointWorldDrawObject/McEdGetPointWorldDrawObjectClass.js +117 -0
  3. package/dist/lib/MxModule/McEdGetPointWorldDrawObject/McEdGetPointWorldDrawObjectClass.js.map +1 -0
  4. package/dist/lib/MxModule/{McEdGetPointWorldDrawObjectClass → McEdGetPointWorldDrawObject}/index.js +1 -1
  5. package/dist/lib/MxModule/McEdGetPointWorldDrawObject/index.js.map +1 -0
  6. package/dist/lib/MxModule/MrxDbgUiPrBaseReturn/MrxDbgUiPrBaseReturn.js +2 -2
  7. package/dist/lib/MxModule/{MrxDbgUiPrPointClass → MrxDbgUiPrPoint}/MrxDbgUiPrPointClass.js +22 -22
  8. package/dist/lib/MxModule/MrxDbgUiPrPoint/MrxDbgUiPrPointClass.js.map +1 -0
  9. package/dist/lib/MxModule/{MrxDbgUiPrPointClass → MrxDbgUiPrPoint}/index.js +0 -0
  10. package/dist/lib/MxModule/MrxDbgUiPrPoint/index.js.map +1 -0
  11. package/dist/lib/MxModule/MxDrawObject/MxDrawObject.js +48 -1
  12. package/dist/lib/MxModule/MxDrawObject/MxDrawObject.js.map +1 -1
  13. package/dist/lib/MxModule/MxFun/MxFun.js +11 -0
  14. package/dist/lib/MxModule/MxFun/MxFun.js.map +1 -1
  15. package/dist/lib/MxModule/MxFun/index.js +2 -2
  16. package/dist/lib/MxModule/MxFun/index.js.map +1 -1
  17. package/dist/lib/MxModule/MxThreeJS/MxThreeJS.js +109 -133
  18. package/dist/lib/MxModule/MxThreeJS/MxThreeJS.js.map +1 -1
  19. package/dist/lib/MxModule/MxThreeJS/MxThreeJS.mixin.js +1 -1
  20. package/dist/lib/MxModule/loadCoreCode/index.js +6 -0
  21. package/dist/lib/MxModule/loadCoreCode/index.js.map +1 -0
  22. package/dist/lib/MxModule/{useCoreCode/useCoreCode.js → loadCoreCode/loadCoreCode.js} +8 -7
  23. package/dist/lib/MxModule/loadCoreCode/loadCoreCode.js.map +1 -0
  24. package/dist/lib/MxModule/loadCoreCode/mxfun.es5.js +6996 -0
  25. package/dist/lib/MxModule/loadCoreCode/mxfun.es5.js.map +1 -0
  26. package/dist/lib/MxModule/useCanvasResizeListener/useCanvasResizeListener.js +1 -1
  27. package/dist/lib/MxModule/useCanvasResizeListener/useCanvasResizeListener.js.map +1 -1
  28. package/dist/lib/doc.js +7 -7
  29. package/dist/lib/doc.js.map +1 -1
  30. package/dist/lib/mxdraw.js +10 -10
  31. package/dist/lib/mxdraw.js.map +1 -1
  32. package/dist/mxdraw.es5.js +3 -3
  33. package/dist/mxdraw.es5.js.map +1 -1
  34. package/dist/mxdraw.umd.js +3 -3
  35. package/dist/mxdraw.umd.js.map +1 -1
  36. package/dist/types/MxModule/{McEdGetPointWorldDrawObjectClass → McEdGetPointWorldDrawObject}/McEdGetPointWorldDrawObjectClass.d.ts +30 -11
  37. package/dist/types/MxModule/McEdGetPointWorldDrawObject/index.d.ts +3 -0
  38. package/dist/types/MxModule/MrxDbgUiPrBaseReturn/MrxDbgUiPrBaseReturn.d.ts +2 -2
  39. package/dist/types/MxModule/{MrxDbgUiPrPointClass → MrxDbgUiPrPoint}/MrxDbgUiPrPointClass.d.ts +5 -6
  40. package/dist/types/MxModule/MrxDbgUiPrPoint/index.d.ts +3 -0
  41. package/dist/types/MxModule/MxDrawObject/MxDrawObject.d.ts +41 -2
  42. package/dist/types/MxModule/MxFun/MxFun.d.ts +9 -0
  43. package/dist/types/MxModule/MxThreeJS/MxThreeJS.d.ts +52 -16
  44. package/dist/types/MxModule/loadCoreCode/index.d.ts +3 -0
  45. package/dist/types/MxModule/loadCoreCode/loadCoreCode.d.ts +9 -0
  46. package/dist/types/MxModule/{useCoreCode → loadCoreCode}/mxfun.es5.d.ts +0 -0
  47. package/dist/types/doc.d.ts +4 -4
  48. package/dist/types/mxdraw.d.ts +7 -7
  49. package/package.json +3 -3
  50. package/dist/lib/MxModule/McEdGetPointWorldDrawObjectClass/McEdGetPointWorldDrawObjectClass.js +0 -94
  51. package/dist/lib/MxModule/McEdGetPointWorldDrawObjectClass/McEdGetPointWorldDrawObjectClass.js.map +0 -1
  52. package/dist/lib/MxModule/McEdGetPointWorldDrawObjectClass/index.js.map +0 -1
  53. package/dist/lib/MxModule/MrxDbgUiPrPointClass/MrxDbgUiPrPointClass.js.map +0 -1
  54. package/dist/lib/MxModule/MrxDbgUiPrPointClass/index.js.map +0 -1
  55. package/dist/lib/MxModule/useCoreCode/index.js +0 -6
  56. package/dist/lib/MxModule/useCoreCode/index.js.map +0 -1
  57. package/dist/lib/MxModule/useCoreCode/mxfun.es5.js +0 -6981
  58. package/dist/lib/MxModule/useCoreCode/mxfun.es5.js.map +0 -1
  59. package/dist/lib/MxModule/useCoreCode/useCoreCode.js.map +0 -1
  60. package/dist/types/MxModule/McEdGetPointWorldDrawObjectClass/index.d.ts +0 -3
  61. package/dist/types/MxModule/MrxDbgUiPrPointClass/index.d.ts +0 -3
  62. package/dist/types/MxModule/useCoreCode/index.d.ts +0 -3
  63. package/dist/types/MxModule/useCoreCode/useCoreCode.d.ts +0 -9
@@ -1,11 +1,11 @@
1
- /** @module McEdGetPointWorldDrawObjectClass*/
1
+ /** @module McEdGetPointWorldDrawObject*/
2
2
  /**
3
- * McEdGetPointWorldDrawObjectClass 用于构建一个动态绘制回调对象
4
- * ```typescript
5
- * new Mx.McEdGetPointWorldDrawObjectClass()
3
+ * McEdGetPointWorldDrawObject 用于构建一个动态绘制回调对象
4
+ * @example ```typescript
5
+ * Mx.McEdGetPointWorldDrawObject()
6
6
  * ```
7
7
  */
8
- export default class McEdGetPointWorldDrawObjectClass {
8
+ export default class McEdGetPointWorldDrawObject {
9
9
  [x: string]: any;
10
10
  constructor();
11
11
  /**
@@ -15,7 +15,7 @@ export default class McEdGetPointWorldDrawObjectClass {
15
15
  * @returns void
16
16
  * @example
17
17
  * ``` typescript
18
- * new Mx.McEdGetPointWorldDrawObjectClass().drawCircle(new HTREE.Vector3(0,100,5), 6)
18
+ * pWorldDraw.drawCircle(new HTREE.Vector3(0,100,5), 6)
19
19
  * ```
20
20
  *
21
21
  */
@@ -27,7 +27,7 @@ export default class McEdGetPointWorldDrawObjectClass {
27
27
  * @returns void
28
28
  * @example
29
29
  * ``` typescript
30
- * new Mx.McEdGetPointWorldDrawObjectClass().drawLine(new HTREE.Vector3(0,100,5), new HTREE.Vector3(0,600,5))
30
+ * pWorldDraw.drawLine(new HTREE.Vector3(0,100,5), new HTREE.Vector3(0,600,5))
31
31
  * ```
32
32
  *
33
33
  */
@@ -38,7 +38,7 @@ export default class McEdGetPointWorldDrawObjectClass {
38
38
  * @returns void
39
39
  * @example
40
40
  * ``` typescript
41
- * new Mx.McEdGetPointWorldDrawObjectClass().drawEntity(new THREE.Object3D()))
41
+ * pWorldDraw.drawEntity(new THREE.Object3D()))
42
42
  * ```
43
43
  *
44
44
  */
@@ -52,7 +52,7 @@ export default class McEdGetPointWorldDrawObjectClass {
52
52
  * @returns void
53
53
  * @example
54
54
  * ``` typescript
55
- * new Mx.McEdGetPointWorldDrawObjectClass().drawText("字符串" ,36 ,90 ,new HTREE.Vector3(0,100,5))
55
+ * pWorldDraw.drawText("字符串" ,36 ,90 ,new HTREE.Vector3(0,100,5))
56
56
  * ```
57
57
  *
58
58
  */
@@ -63,10 +63,29 @@ export default class McEdGetPointWorldDrawObjectClass {
63
63
  * @returns void
64
64
  * @example
65
65
  * ``` typescript
66
- * new Mx.McEdGetPointWorldDrawObjectClass().setDraw((currentPoint, pWorldDraw)=> {
66
+ * pWorldDraw.setDraw((currentPoint, pWorldDraw)=> {
67
67
  *
68
68
  * })
69
69
  * ```
70
70
  */
71
- setDraw(call: (currentPoint: THREE.Vector3, pWorldDraw: McEdGetPointWorldDrawObjectClass) => void): void;
71
+ setDraw(call: (currentPoint: THREE.Vector3, pWorldDraw: any) => void): void;
72
+ /**
73
+ * 设置绘制对象颜色.
74
+ * @param iColor 颜色
75
+ * @returns void
76
+ * @example
77
+ * ``` typescript
78
+ * pWorldDraw.setColor(0xFFFFFF)
79
+ * ```
80
+ */
81
+ setColor(iColor: number): void;
82
+ /**
83
+ * 得到绘制对象颜色.
84
+ * @returns 颜色
85
+ * @example
86
+ * ``` typescript
87
+ * pWorldDraw.getColor()
88
+ * ```
89
+ */
90
+ getColor(): void;
72
91
  }
@@ -0,0 +1,3 @@
1
+ /** @module McEdGetPointWorldDrawObject*/
2
+ import McEdGetPointWorldDrawObject from './McEdGetPointWorldDrawObjectClass';
3
+ export default McEdGetPointWorldDrawObject;
@@ -2,10 +2,10 @@
2
2
  /**
3
3
  * MrxDbgUiPrBaseReturn枚举
4
4
  * @description
5
- * 用于适配{@link MrxDbgUiPrPointClass.go} 和 {@link MrxDbgUiPrPointClass.goWhile} 方法中的回调参数`status`
5
+ * 用于适配{@link MrxDbgUiPrPoint.go} 和 {@link MrxDbgUiPrPoint.goWhile} 方法中的回调参数`status`
6
6
  * @example
7
7
  * ```
8
- * const Point = new Mx.MrxDbgUiPrPointClass()
8
+ * const Point = new Mx.MrxDbgUiPrPoint()
9
9
  * Point.go((status)=> {
10
10
  * if(Mx.MrxDbgUiPrBaseReturn.kCancel === status) {
11
11
  * // 取消
@@ -1,13 +1,12 @@
1
1
  /** @module MrxDbgUiPrPointClass */
2
- import { McEdGetPointWorldDrawObject } from '@/types/McEdGetPointWorldDrawObject';
3
2
  import { MrxDbgUiPrBaseReturn } from '@/types/MrxDbgUiPrPoint';
4
3
  /**
5
- * MrxDbgUiPrPointClass 用于构建一个取点对象
6
- * ```typescript
7
- * new Mx.MrxDbgUiPrPointClass()
4
+ * MrxDbgUiPrPoint 用于构建一个取点对象
5
+ * @example ```typescript
6
+ * new Mx.MrxDbgUiPrPoint()
8
7
  * ```
9
8
  */
10
- export default class MrxDbgUiPrPointClass {
9
+ export default class MrxDbgUiPrPoint {
11
10
  constructor();
12
11
  /**
13
12
  * 返回关键字列表
@@ -47,7 +46,7 @@ export default class MrxDbgUiPrPointClass {
47
46
  * @param pDraw {@link McEdGetPointWorldDrawObject | 动态绘制调用对象}
48
47
  * @returns void
49
48
  */
50
- setUserDraw(pDraw: McEdGetPointWorldDrawObject): void;
49
+ setUserDraw(pDraw: any): void;
51
50
  /**
52
51
  * 得以获取的点对象,Three.js坐标
53
52
  * @returns 点对象 THREE.THREE.Vector3
@@ -0,0 +1,3 @@
1
+ /** @module MrxDbgUiPrPointClass */
2
+ import MrxDbgUiPrPoint from './MrxDbgUiPrPointClass';
3
+ export default MrxDbgUiPrPoint;
@@ -115,7 +115,35 @@ export default class MxDrawObject {
115
115
  * Mx.MxFun.getCurrentDraw().addObject(new THREE.Object3D(), false)
116
116
  * ```
117
117
  */
118
- addObject(obj: THREE.Object3D | null, isAddToSelect?: boolean): void;
118
+ addObject(obj: THREE.Object3D, isAddToSelect?: boolean): void;
119
+ /**
120
+ * 添加THREE.Object3D对象到视区场景,对象坐标系是窗口视区坐标系。0,0点在左下角.
121
+ * @param obj THREE.Object3D
122
+ * @returns void
123
+ * @example
124
+ * ```typescript
125
+ * Mx.MxFun.getCurrentDraw().addViewObject(new THREE.Object3D())
126
+ * ```
127
+ */
128
+ addViewObject(obj: THREE.Object3D): void;
129
+ /**
130
+ * 得到对象画布的宽度,单位屏幕像素
131
+ * @returns number
132
+ * @example
133
+ * ```typescript
134
+ * Mx.MxFun.getCurrentDraw().getViewWidth()
135
+ * ```
136
+ */
137
+ getViewWidth(): number;
138
+ /**
139
+ * 得到对象画布的高度,单位屏幕像素
140
+ * @returns number
141
+ * @example
142
+ * ```typescript
143
+ * Mx.MxFun.getCurrentDraw().getViewHeight()
144
+ * ```
145
+ */
146
+ getViewHeight(): number;
119
147
  /**
120
148
  * 删除addObject函数添加的THREE.Object3D对象
121
149
  * @param obj THREE.Object3D
@@ -198,7 +226,7 @@ export default class MxDrawObject {
198
226
  * Mx.MxFun.getCurrentDraw().addEvent("addResizeEvent", ()=> {})
199
227
  * Mx.MxFun.getCurrentDraw().addEvent("viewchange", ()=> {})
200
228
  * 视区重绘事件.
201
- * Mx.MxFun.getCurrentDraw().addEvent("render", ()=> {})
229
+ * Mx.MxFun.getCurrentDraw().addEvent("render", (renderer)=> {})
202
230
  * 视区大小被修改事件.,viewsize={viewWidth:viewWidth,viewHeight:viewHeight}
203
231
  * Mx.MxFun.getCurrentDraw().addEvent("viewsizechange", (viewsize)=> {})
204
232
  * ```
@@ -217,4 +245,15 @@ export default class MxDrawObject {
217
245
  setIniset(options: {
218
246
  EnableOsnapFunction: boolean;
219
247
  }): void;
248
+ /**
249
+ * 初始WebGL Renderer的创建参数,该函数在MxFun.createMxObject函数调用时,调用。
250
+ * @param param
251
+ * @returns void
252
+ * @example
253
+ * ```typescript
254
+ * mxObj.initRendererParam({preserveDrawingBuffer: true})
255
+ *
256
+ * ```
257
+ */
258
+ initRendererParam(param: object): void;
220
259
  }
@@ -353,6 +353,15 @@ export default class MxFun {
353
353
  * ```
354
354
  */
355
355
  upDisplayForLayerData(dataLayers: any): boolean;
356
+ /**
357
+ * 初始化插件的UI数据对象。
358
+ * @param uiDataObj
359
+ * @return
360
+ * @example
361
+ * ``` typescript
362
+ * ```
363
+ */
364
+ initUiDataObject(uiDataObj: any): void;
356
365
  /**
357
366
  * 梦想开发测试
358
367
  * @param p
@@ -1,26 +1,62 @@
1
- /** @module MxThreeJS */
2
1
  import { Vector3, Line, Object3D, Points, Sprite, Mesh, MeshBasicMaterial, Color } from 'three';
3
2
  /**
4
3
  * MxThreeJS 模块
4
+ * ##### 使用说明:
5
+ *
6
+ * > 基于three.js实现创建直线对象、加载图片、SVG等功能,以下是使用的流程:
7
+ * - 模块中大部分方法返回的{@link http://www.yanhuangxueyuan.com/threejs/docs/index.html#api/zh/core/Object3D | THREE.Object3D}类型继承创建的对象都可以通过取点对象{@link MrxDbgUiPrPointClass.value} 得到鼠标对应位置
8
+ * - {@link MrxDbgUiPrPointClass.go}和{@link MrxDbgUiPrPointClass.goWhile}方法监听鼠标点击事件回调中通过
9
+ * - {@link MxDrawObject.addObject} 方法添加到场景{@link MxDrawObject.getScene}中
10
+ * - 最后调用{@link MxFun.updateDisplay} 更新视图显示完成
11
+ *
12
+ * > 提示: 在实际开发中MxThreeJS是配合着{@link MxDrawObject} 和 {@link MrxDbgUiPrPointClass} 完成绘制线段、文字、图片等功能,当然你也可以使用{@link http://www.yanhuangxueyuan.com/threejs/docs/index.html | three.js}来完成MxThreeJS模块的这些工作
13
+ *
14
+ * > 该模块导出库时已实例化为对象,只需要调用实例方法 例如:
5
15
  *
6
- * 导出库时已实例化为对象,只需要调用实例方法 例如:
7
16
  * ```typescript
8
- * Mx.MxThreeJS.createLine
17
+ * // html
18
+ * <button id="line">line</button>
19
+ *
20
+ * // js
21
+ * import Mx from "mxdraw"
22
+ * import Three from "three"
23
+ * Mx.loadCoreCode().then(()=> {
24
+ * Mx.MxFun.setMxServer()
25
+ * Mx.MxFun.createMxObject({
26
+ * callback(mxDraw, dom) {
27
+ * document.getElementById("line").onclick = ()=> {
28
+ * const getPoint = new Mx.MrxDbgUiPrPointClass()
29
+ * let lastPt, isLine
30
+ * getPoint.goWhile(()=> {
31
+ * const pt1 = getPoint.value()
32
+ * if(isLine) {
33
+ * const line = Mx.MxThreeJS.createLine(pt1, lastPt, 0xffffff)
34
+ * const currentDraw = Mx.MxFun.getCurrentDraw()
35
+ * currentDraw.addObject(line)
36
+ * Mx.MxFun.updateDisplay()
37
+ * }
38
+ * lastPt = pt1.clone()
39
+ * isLine = !isLine
40
+ * })
41
+ * }
42
+ * }
43
+ * })
44
+ * })
9
45
  * ```
10
46
  */
11
47
  export default class MxThreeJS {
12
48
  /**
13
49
  * 创建Three.js直线对象。
14
- * @param vPt1 THREE.Vector3 点1
15
- * @param vPt1 THREE.Vector3 点2
16
- * @param iColor 颜色
17
- * @returns THREE.Line
50
+ * @param vPt1 {@link http://www.yanhuangxueyuan.com/threejs/docs/index.html#api/zh/math/Vector3 | THREE.Vector3} 点1
51
+ * @param vPt2 {@link http://www.yanhuangxueyuan.com/threejs/docs/index.html#api/zh/math/Vector3 | THREE.Vector3} 点2
52
+ * @param iColor 颜色Color
53
+ * @returns {@link http://www.yanhuangxueyuan.com/threejs/docs/index.html#api/zh/objects/Line |THREE.Line}
18
54
  * @example
19
55
  * ```typescript
20
56
  * Mx.MxThreeJS.createLine(new Three.Vector3(1,10,0), new Three.Vector3(1,300,0), 0)
21
57
  * ```
22
58
  */
23
- createLine(vPt1: Vector3, vPt2: Vector3, iColor: number): Line;
59
+ createLine(vPt1: Vector3, vPt2: Vector3, iColor: Color | number | string): Line;
24
60
  /**
25
61
  * 创建Three.js圆对象。
26
62
  * @param mCenterPt 圆中心点
@@ -32,7 +68,7 @@ export default class MxThreeJS {
32
68
  * Mx.MxThreeJS.createCircle(new Three.Vector3(1,10,0), 10, 0)
33
69
  * ```
34
70
  */
35
- createCircle(mCenterPt: Vector3, dRadius: number, iColor: number): Object3D;
71
+ createCircle(mCenterPt: Vector3, dRadius: number, iColor: Color | number | string): Object3D;
36
72
  /**
37
73
  * 创建Three.js点对象。
38
74
  * @param mPt 点位置
@@ -43,7 +79,7 @@ export default class MxThreeJS {
43
79
  * Mx.MxThreeJS.createPoint(new Three.Vector3(1,10,0), 0)
44
80
  * ```
45
81
  */
46
- createPoint(mPt: Vector3, iColor: number): Points;
82
+ createPoint(mPt: Vector3, iColor: Color | number | string): Points;
47
83
  /**
48
84
  * 创建Three.js 文字
49
85
  * @param message 文字信息
@@ -57,7 +93,7 @@ export default class MxThreeJS {
57
93
  * Mx.MxThreeJS.creatTextSprite("hello",new Three.Vector3(1,10,0), 90, 60, 0)
58
94
  * ```
59
95
  */
60
- creatTextSprite(message: string, pt: Vector3, iSize: number, fAngle: number, iColor: number): Sprite | null;
96
+ creatTextSprite(message: string, pt: Vector3, iSize: number, fAngle: number, iColor: Color | number | string): Sprite | null;
61
97
  /**
62
98
  * 根据三角形数组,创建Three.js Mesh
63
99
  * @param points 由三个点组成的数组
@@ -73,7 +109,7 @@ export default class MxThreeJS {
73
109
  * )
74
110
  * ```
75
111
  */
76
- createTriangle(points: Array<Vector3>, iColor: number, opacity?: number): Mesh | null;
112
+ createTriangle(points: Array<Vector3>, iColor: Color | number | string, opacity?: number): Mesh | null;
77
113
  /**
78
114
  * 创建连续直线
79
115
  * @param points 由多个点组成的数组
@@ -84,7 +120,7 @@ export default class MxThreeJS {
84
120
  * Mx.MxThreeJS.createLines([new THREE.Vector3(1,2,2),new THREE.Vector3(1,65,4),new THREE.Vector3(12,2,2)], 0)
85
121
  * ```
86
122
  */
87
- createLines(points: Array<Vector3>, iColor: number): Line;
123
+ createLines(points: Array<Vector3>, iColor: Color | number | string): Line;
88
124
  /**
89
125
  * 创建虚线
90
126
  * @param points 由多个点组成的数组
@@ -97,7 +133,7 @@ export default class MxThreeJS {
97
133
  * Mx.MxThreeJS.createDashedLines([new THREE.Vector3(1,2,2),new THREE.Vector3(1,65,4),new THREE.Vector3(12,2,2)], 10, 20, 2)
98
134
  * ```
99
135
  */
100
- createDashedLines(points: Array<Vector3>, iColor: number, dashSize: number, gapSize: number): Line;
136
+ createDashedLines(points: Array<Vector3>, iColor: Color | number | string, dashSize: number, gapSize: number): Line;
101
137
  /**
102
138
  * 创建Image
103
139
  * @param pos 图片位置
@@ -113,7 +149,7 @@ export default class MxThreeJS {
113
149
  * })
114
150
  * ```
115
151
  */
116
- createImage: (pos: Vector3, w: number, h: number, imageUrlPath: string, callResult: (mesh: Mesh | null) => void) => void;
152
+ createImage(pos: Vector3, w: number, h: number, imageUrlPath: string, callResult?: (mesh: Mesh | null) => void): void;
117
153
  /**
118
154
  * 加载SVG
119
155
  * @param url SVG路径地址
@@ -130,5 +166,5 @@ export default class MxThreeJS {
130
166
  * })
131
167
  * ```
132
168
  */
133
- loadSVG: (url: string, x: number, y: number, scale: number, color: Color | undefined | null, callResult: (threeobj: Object3D, aryMeterial: Array<MeshBasicMaterial>) => void) => void;
169
+ loadSVG(url: string, x: number, y: number, scale: number, color?: Color | number | string, callResult?: (threeobj: Object3D, aryMeterial: Array<MeshBasicMaterial>) => void): void;
134
170
  }
@@ -0,0 +1,3 @@
1
+ /** @module loadCoreCode */
2
+ import loadCoreCode from './loadCoreCode';
3
+ export default loadCoreCode;
@@ -0,0 +1,9 @@
1
+ /**
2
+ * 加载MxDraw库的核心代码 才能使用Mx的其他模块
3
+ * @returns Promise<{@link MxFun}>
4
+ * @example
5
+ * ```
6
+ * Mx.loadCoreCode().then(()=> console.log("加载完成", Mx.MxFun))
7
+ * ```
8
+ */
9
+ export default function loadCoreCode(): Promise<void>;
@@ -3,12 +3,12 @@
3
3
  *
4
4
  * @module 模块
5
5
  */
6
- import useCoreCode from './MxModule/useCoreCode/useCoreCode';
6
+ import loadCoreCode from './MxModule/loadCoreCode/loadCoreCode';
7
7
  import useCanvasResizeListener from './MxModule/useCanvasResizeListener/useCanvasResizeListener';
8
8
  import MxFun from './MxModule/MxFun/MxFun';
9
9
  import MxThreeJS from './MxModule/MxThreeJS/MxThreeJS';
10
10
  import MxDrawObject from './MxModule/MxDrawObject/MxDrawObject';
11
- import MrxDbgUiPrPointClass from './MxModule/MrxDbgUiPrPointClass/MrxDbgUiPrPointClass';
12
- import McEdGetPointWorldDrawObjectClass from './MxModule/McEdGetPointWorldDrawObjectClass/McEdGetPointWorldDrawObjectClass';
11
+ import MrxDbgUiPrPoint from './MxModule/MrxDbgUiPrPoint/MrxDbgUiPrPointClass';
12
+ import McEdGetPointWorldDrawObject from './MxModule/McEdGetPointWorldDrawObject/McEdGetPointWorldDrawObjectClass';
13
13
  import MrxDbgUiPrBaseReturn from './MxModule/MrxDbgUiPrBaseReturn/MrxDbgUiPrBaseReturn';
14
- export { MxFun, MxThreeJS, MxDrawObject, MrxDbgUiPrPointClass, McEdGetPointWorldDrawObjectClass, MrxDbgUiPrBaseReturn, useCoreCode, useCanvasResizeListener };
14
+ export { MxFun, MxThreeJS, MxDrawObject, MrxDbgUiPrPoint, McEdGetPointWorldDrawObject, MrxDbgUiPrBaseReturn, loadCoreCode, useCanvasResizeListener };
@@ -1,21 +1,21 @@
1
- import useCoreCode from './MxModule/useCoreCode';
1
+ import loadCoreCode from './MxModule/loadCoreCode';
2
2
  import store from './MxModule/store';
3
3
  import MxFunModule from './MxModule/MxFun/MxFun';
4
4
  import MxThreeJS from './MxModule/MxThreeJS';
5
- import MrxDbgUiPrPointClass from './MxModule/MrxDbgUiPrPointClass';
6
- import McEdGetPointWorldDrawObjectClass from './MxModule/McEdGetPointWorldDrawObjectClass';
5
+ import MrxDbgUiPrPoint from './MxModule/MrxDbgUiPrPoint';
6
+ import McEdGetPointWorldDrawObject from './MxModule/McEdGetPointWorldDrawObject';
7
7
  import useCanvasResizeListener from './MxModule/useCanvasResizeListener';
8
8
  import MrxDbgUiPrBaseReturn from './MxModule/MrxDbgUiPrBaseReturn';
9
9
  declare const MxFun: MxFunModule;
10
- export { MxFun, MxThreeJS, McEdGetPointWorldDrawObjectClass, MrxDbgUiPrPointClass, MrxDbgUiPrBaseReturn, useCanvasResizeListener, useCoreCode, store };
10
+ export { MxFun, MxThreeJS, McEdGetPointWorldDrawObject, MrxDbgUiPrPoint, MrxDbgUiPrBaseReturn, useCanvasResizeListener, loadCoreCode, store };
11
11
  declare const _default: {
12
12
  MxFun: MxFunModule;
13
13
  MxThreeJS: import("./doc").MxThreeJS;
14
- McEdGetPointWorldDrawObjectClass: typeof McEdGetPointWorldDrawObjectClass;
15
- MrxDbgUiPrPointClass: typeof MrxDbgUiPrPointClass;
14
+ McEdGetPointWorldDrawObject: typeof McEdGetPointWorldDrawObject;
15
+ MrxDbgUiPrPoint: typeof MrxDbgUiPrPoint;
16
16
  MrxDbgUiPrBaseReturn: typeof MrxDbgUiPrBaseReturn;
17
17
  useCanvasResizeListener: typeof useCanvasResizeListener;
18
- useCoreCode: typeof useCoreCode;
18
+ loadCoreCode: typeof loadCoreCode;
19
19
  store: {
20
20
  state: import("./MxModule/store/store").stateType;
21
21
  events: import("./MxModule/store/PubsubClass").default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mxdraw",
3
- "version": "0.0.13",
3
+ "version": "0.0.17",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "main": "dist/mxdraw.umd.js",
@@ -26,7 +26,7 @@
26
26
  "prebuild": "rimraf dist",
27
27
  "build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs",
28
28
  "oldDocs": "typedoc --out docs --target es6 --theme minimal --mode file src",
29
- "docs": "npm run doctoc && typedoc --out docs",
29
+ "docs": "npm run patch && npm run doctoc && typedoc --out docs",
30
30
  "start": "rollup -c rollup.config.ts -w",
31
31
  "test": "jest --coverage",
32
32
  "test:watch": "jest --coverage --watch",
@@ -68,7 +68,7 @@
68
68
  },
69
69
  "devDependencies": {
70
70
  "@babel/core": "^7.16.0",
71
- "@babel/preset-env": "^7.16.4",
71
+ "@babel/preset-react": "^7.16.5",
72
72
  "@commitlint/cli": "^7.1.2",
73
73
  "@commitlint/config-conventional": "^7.1.2",
74
74
  "@rollup/plugin-alias": "^3.1.8",
@@ -1,94 +0,0 @@
1
- "use strict";
2
- /** @module McEdGetPointWorldDrawObjectClass*/
3
- Object.defineProperty(exports, "__esModule", { value: true });
4
- var store_1 = require("../store/store");
5
- var _McEdGetPointWorldDraw;
6
- /**
7
- * McEdGetPointWorldDrawObjectClass 用于构建一个动态绘制回调对象
8
- * ```typescript
9
- * new Mx.McEdGetPointWorldDrawObjectClass()
10
- * ```
11
- */
12
- var McEdGetPointWorldDrawObjectClass = /** @class */ (function () {
13
- function McEdGetPointWorldDrawObjectClass() {
14
- _McEdGetPointWorldDraw = new (store_1.default.state.MxFun.getMxJigCmdManager().McEdGetPointWorldDrawObjectClass())();
15
- /** @internal */
16
- this._get = function () {
17
- return _McEdGetPointWorldDraw;
18
- };
19
- }
20
- /**
21
- * 绘制圆
22
- * @param cen 圆心位置
23
- * @param dRadius 圆半径
24
- * @returns void
25
- * @example
26
- * ``` typescript
27
- * new Mx.McEdGetPointWorldDrawObjectClass().drawCircle(new HTREE.Vector3(0,100,5), 6)
28
- * ```
29
- *
30
- */
31
- McEdGetPointWorldDrawObjectClass.prototype.drawCircle = function (cen, dRadius) {
32
- return _McEdGetPointWorldDraw.drawCircle(cen, dRadius);
33
- };
34
- /**
35
- * 绘制直线
36
- * @param pt1 开始点
37
- * @param pt2 结束点
38
- * @returns void
39
- * @example
40
- * ``` typescript
41
- * new Mx.McEdGetPointWorldDrawObjectClass().drawLine(new HTREE.Vector3(0,100,5), new HTREE.Vector3(0,600,5))
42
- * ```
43
- *
44
- */
45
- McEdGetPointWorldDrawObjectClass.prototype.drawLine = function (pt1, pt2) {
46
- return _McEdGetPointWorldDraw.drawLine(pt1, pt2);
47
- };
48
- /**
49
- * 绘制一个Three.js对象.
50
- * @param ent THREE.Object3D对象
51
- * @returns void
52
- * @example
53
- * ``` typescript
54
- * new Mx.McEdGetPointWorldDrawObjectClass().drawEntity(new THREE.Object3D()))
55
- * ```
56
- *
57
- */
58
- McEdGetPointWorldDrawObjectClass.prototype.drawEntity = function (ent) {
59
- return _McEdGetPointWorldDraw.drawEntity(ent);
60
- };
61
- /**
62
- * 绘制一个文档对象
63
- * @param sText 文本
64
- * @param iSize 大小
65
- * @param dAngle 角度
66
- * @param pt 位置
67
- * @returns void
68
- * @example
69
- * ``` typescript
70
- * new Mx.McEdGetPointWorldDrawObjectClass().drawText("字符串" ,36 ,90 ,new HTREE.Vector3(0,100,5))
71
- * ```
72
- *
73
- */
74
- McEdGetPointWorldDrawObjectClass.prototype.drawText = function (sText, iSize, dAngle, pt) {
75
- return _McEdGetPointWorldDraw.drawText(sText, iSize, dAngle, pt);
76
- };
77
- /**
78
- * 设置动态绘制回调函数。
79
- * @param call 回调函数 currentPoint 回调参数 当前位置 pWorldDraw 回调参数文档绘制对象
80
- * @returns void
81
- * @example
82
- * ``` typescript
83
- * new Mx.McEdGetPointWorldDrawObjectClass().setDraw((currentPoint, pWorldDraw)=> {
84
- *
85
- * })
86
- * ```
87
- */
88
- McEdGetPointWorldDrawObjectClass.prototype.setDraw = function (call) {
89
- return _McEdGetPointWorldDraw.setDraw(call);
90
- };
91
- return McEdGetPointWorldDrawObjectClass;
92
- }());
93
- exports.default = McEdGetPointWorldDrawObjectClass;
94
- //# sourceMappingURL=McEdGetPointWorldDrawObjectClass.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"McEdGetPointWorldDrawObjectClass.js","sourceRoot":"","sources":["../../../../src/MxModule/McEdGetPointWorldDrawObjectClass/McEdGetPointWorldDrawObjectClass.ts"],"names":[],"mappings":";AAAA,8CAA8C;;AAG9C,wCAAkC;AAElC,IAAI,sBAAmD,CAAA;AAEvD;;;;;GAKG;AACH;IAEE;QACE,sBAAsB,GAAG,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,gCAAgC,EAAE,CAAC,EAAE,CAAA;QAE1G,gBAAgB;QAChB,IAAI,CAAC,IAAI,GAAG;YACV,OAAO,sBAAsB,CAAA;QAC/B,CAAC,CAAA;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACH,qDAAU,GAAV,UAAW,GAAkB,EAAE,OAAe;QAC5C,OAAO,sBAAsB,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC;IACD;;;;;;;;;;OAUG;IACH,mDAAQ,GAAR,UAAS,GAAkB,EAAE,GAAkB;QAC7C,OAAO,sBAAsB,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAClD,CAAC;IAED;;;;;;;;;OASG;IACH,qDAAU,GAAV,UAAW,GAA0B;QACnC,OAAO,sBAAsB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC/C,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,mDAAQ,GAAR,UAAS,KAAa,EAAE,KAAa,EAAE,MAAc,EAAE,EAAiB;QACtE,OAAO,sBAAsB,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAClE,CAAC;IAED;;;;;;;;;;OAUG;IACH,kDAAO,GAAP,UACE,IAAyF;QAEzF,OAAO,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7C,CAAC;IACH,uCAAC;AAAD,CAAC,AAvFD,IAuFC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MxModule/McEdGetPointWorldDrawObjectClass/index.ts"],"names":[],"mappings":";AAAA,8CAA8C;;AAE9C,uFAAiF;AACjF,kBAAe,0CAAgC,CAAA"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"MrxDbgUiPrPointClass.js","sourceRoot":"","sources":["../../../../src/MxModule/MrxDbgUiPrPointClass/MrxDbgUiPrPointClass.ts"],"names":[],"mappings":";AAAA,mCAAmC;;AAInC,wCAAkC;AAClC,IAAI,gBAAiC,CAAA;AAErC;;;;;GAKG;AACH;IACE;QACE,gBAAgB,GAAG,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,uBAAuB,EAAE,CAAC,EAAE,CAAA;IAC7F,CAAC;IACD;;;OAGG;IACH,uCAAQ,GAAR;QACE,OAAO,gBAAgB,CAAC,QAAQ,EAAE,CAAA;IACpC,CAAC;IAED;;;;OAIG;IACH,0CAAW,GAAX,UAAY,WAAmB;QAC7B,OAAO,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;IAClD,CAAC;IAED;;;OAGG;IACH,sCAAO,GAAP;QACE,OAAO,gBAAgB,CAAC,OAAO,EAAE,CAAA;IACnC,CAAC;IAED;;;;OAIG;IACH,yCAAU,GAAV,UAAW,OAAe;QACxB,OAAO,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAED;;;OAGG;IACH,4CAAa,GAAb;QACE,OAAO,gBAAgB,CAAC,aAAa,EAAE,CAAA;IACzC,CAAC;IAED;;;;OAIG;IACH,8CAAe,GAAf,UAAgB,YAAoB;QAClC,OAAO,gBAAgB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;IACvD,CAAC;IAED;;;;OAIG;IACH,0CAAW,GAAX,UAAY,KAAkC;QAC5C,OAAO,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACxE,CAAC;IAED;;;OAGG;IACH,oCAAK,GAAL;QACE,OAAO,gBAAgB,CAAC,KAAK,EAAE,CAAA;IACjC,CAAC;IAED;;;OAGG;IACH,4CAAa,GAAb;QACE,OAAO,gBAAgB,CAAC,aAAa,EAAE,CAAA;IACzC,CAAC;IAED;;;OAGG;IACH,qCAAM,GAAN;QACE,OAAO,gBAAgB,CAAC,MAAM,EAAE,CAAA;IAClC,CAAC;IAED;;;;OAIG;IACH,wCAAS,GAAT,UAAU,MAAqB;QAC7B,OAAO,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAED;;;;OAIG;IACH,2CAAY,GAAZ,UAAa,KAAc;QACzB,OAAO,gBAAgB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAC7C,CAAC;IAED;;;;OAIG;IACH,iCAAE,GAAF,UAAG,OAA+C;QAChD,OAAO,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;IACrC,CAAC;IAED;;;;;OAKG;IACH,sCAAO,GAAP,UACE,OAA8C,EAC9C,QAAgD;QAEhD,OAAO,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACpD,CAAC;IAED;;;;OAIG;IACH,0CAAW,GAAX,UAAY,aAA6C;QACvD,OAAO,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;IACpD,CAAC;IACH,2BAAC;AAAD,CAAC,AAxID,IAwIC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MxModule/MrxDbgUiPrPointClass/index.ts"],"names":[],"mappings":";AAAA,mCAAmC;;AAEnC,+DAAyD;AACzD,kBAAe,8BAAoB,CAAA"}
@@ -1,6 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- /** @module useCoreCode */
4
- var useCoreCode_1 = require("./useCoreCode");
5
- exports.default = useCoreCode_1.default;
6
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/MxModule/useCoreCode/index.ts"],"names":[],"mappings":";;AAAA,0BAA0B;AAC1B,6CAAuC;AACvC,kBAAe,qBAAW,CAAA"}