gs-bim-air 0.0.3-0.22 → 0.0.3-0.25

package/READMEBETA.md

@@ -222,6 +222,22 @@ viewer.camera.projection = BimAir.Longan.ProjectionType.Perspective; //透视投
 
 -   修改设置颜色以及锁定颜色的逻辑
 
+### 0.0.30.23
+
+-   修复钻孔和平硐 z 轴朝向问题
+-   修复标签无法清空面板数据问题
+
+### 0.0.30.24
+
+-   修改钻孔模型生成逻辑
+-   钻孔、平硐模型添加修改颜色参数
+-   添加多构件聚焦定位功能
+
+### 0.0.30.25
+
+-   更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+-   修复模型不显示的问题
+
 ## BETA2 日志
 
 ### 0.1.30.1
@@ -263,6 +279,8 @@ viewer.camera.projection = BimAir.Longan.ProjectionType.Perspective; //透视投
 -   更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
 -   修复无法查找围栏 Selector 问题
 
-```
+### 0.1.30.11
 
-```
+-   更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+-   修复路径问题
+-   修改视点接口

package/demo//346/250/241/345/236/213/346/225/210/346/236/234//345/212/250/346/200/201/345/210/233/345/273/272/347/224/265/345/255/220/345/233/264/346/240/217/346/223/215/344/275/234.html

@@ -20,6 +20,12 @@
             height: 100vh;
             position: relative;
         }
+
+        .button-group{
+            position: absolute;
+            top: 0;
+            z-index: 100;
+        }
     </style>
     <div id="app">
         <!-- <div id="viewer">

package/demo//346/250/241/345/236/213/346/225/210/346/236/234//346/267/273/345/212/240/344/270/211/347/273/264/346/226/207/345/255/227.html

@@ -46,17 +46,15 @@
 				},
 			}).then(() => {
 				let viewer = new BimAir.Viewer(options);
+
 				viewer.loadModels(["629577fbbc7dff4fe318bc17"]).then(() => {
-					// 	viewer.updateDisplay();
+					console.log("文字测试Abc123");
 
-					setTimeout(() => {
-						console.log("文字测试Abc123");
-						let seg = viewer.utilitySegment.subsegment("text");
-						seg.insertVectorText("文字测试Abc123", [5, 5, 5], [1, 0, 0], [0, 1, 0], 16);
-						seg.renderingOptions.cullBackFace = false; //双面绘制
+					let seg = viewer.utilitySegment.subsegment("text");
+					seg.insertVectorText("文字测试Abc123", [5, 5, 5], [1, 0, 0], [0, 1, 0], 160);
+					seg.renderingOptions.cullBackFace = false; //双面绘制
 
-						viewer.updateDisplay();
-					}, 300);
+					viewer.updateDisplay();
 				});
 			});
 		</script>

package/demo//347/273/223/346/236/204/346/240/221/344/270/216/346/236/204/344/273/266//346/236/204/344/273/266/347/242/260/346/222/236/346/243/200/346/265/213.html

@@ -67,11 +67,17 @@
                     let material = new Material(viewer, "1");
                     material.setColor(255, 0, 0, 1);
 
+                    //需要检测的碰撞类型
+                    let type = BimAir.Longan.CollisionType.Touch | BimAir.Longan.CollisionType.Contain | BimAir.Longan.CollisionType.Soft | BimAir.Longan.CollisionType.Intersect;
+					//软碰撞距离
+                    this.viewer.softCollisionDistance = 0.1;
+
                     setTimeout(() => {
                         viewer
                             .computeObjectCollisions(
                                 [sphere],
                                 components,
+                                type,
                                 (viewer, total, current) => {
                                     console.log(total, current);
                                 }

package/docs/README.md

@@ -67,6 +67,8 @@ gs-bim-air
 
 ▸ **Loader**(`config?`): `Promise`<`void`\>
 
+加载BimAir所需静态依赖文件
+
 #### Parameters
 
 | Name | Type | Default value |

package/docs/classes/AditObjects.md

@@ -17,6 +17,7 @@
 ### Properties
 
 - [\_name](AditObjects.md#_name)
+- [color](AditObjects.md#color)
 - [data](AditObjects.md#data)
 - [instanceTypes](AditObjects.md#instancetypes)
 - [typeName](AditObjects.md#typename)
@@ -50,7 +51,7 @@
 - [deserialize](AditObjects.md#deserialize)
 - [dispose](AditObjects.md#dispose)
 - [forEach](AditObjects.md#foreach)
-- [onModelLoaded](AditObjects.md#onmodelloaded)
+- [loadModel](AditObjects.md#loadmodel)
 - [remove](AditObjects.md#remove)
 - [removeChildObject](AditObjects.md#removechildobject)
 - [render](AditObjects.md#render)
@@ -79,6 +80,16 @@ ParamModelObject.\_name
 
 ___
 
+### color
+
+• **color**: `number`[]
+
+#### Inherited from
+
+ParamModelObject.color
+
+___
+
 ### data
 
 • **data**: `Adit`[]
@@ -456,9 +467,9 @@ ParamModelObject.visible
 | `segment` | `Segment` |  |
 | `name` | `string` |  |
 | `componentId` | `string` |  |
-| `calibrer` | `number` |  |
-| `calibrerType` | `string` |  |
-| `controlPoints` | `ControlPoint`[] |  |
+| `calibrer` | `number` | 保留口径 |
+| `calibrerType` | `string` | 口径类型，1拱洞型 |
+| `controlPoints` | `ControlPoint`[] | 平硐轴线数据 |
 
 #### Returns
 
@@ -631,9 +642,9 @@ ParamModelObject.forEach
 
 ___
 
-### onModelLoaded
+### loadModel
 
-▸ **onModelLoaded**(`data`, `process?`): `Promise`<`void`\>
+▸ **loadModel**(`data`, `process?`): `Promise`<`void`\>
 
 #### Parameters
 
@@ -648,7 +659,7 @@ ___
 
 #### Inherited from
 
-ParamModelObject.onModelLoaded
+ParamModelObject.loadModel
 
 ___
 

package/docs/classes/AnimationManager.md

@@ -81,7 +81,7 @@ ___
 
 ### renderList
 
-• **renderList**: `StringKeyList`<{ `isStop`: `boolean` ; `playTime?`: `number` ; `roamTime?`: `number` ; `func`: (`deltaTime`: `number`) => `void`  }\>
+• **renderList**: `StringKeyList`<{ `func`: (`deltaTime`: `number`) => `void` ; `isStop`: `boolean` ; `playTime?`: `number` ; `roamTime?`: `number`  }\>
 
 #### Inherited from
 
@@ -155,7 +155,7 @@ ___
 | Name | Type | Description |
 | :------ | :------ | :------ |
 | `viewer` | [`Viewer`](Viewer.md) | - |
-| `points` | `Point`[] |  |
+| `points` | `Point`[] | 路径点列表. |
 
 #### Returns
 
@@ -172,7 +172,7 @@ ___
 | Name | Type | Description |
 | :------ | :------ | :------ |
 | `viewer` | [`Viewer`](Viewer.md) | - |
-| `points` | `Point`[] |  |
+| `points` | `Point`[] | 路径点列表. |
 
 #### Returns
 
@@ -184,21 +184,25 @@ ___
 
 ▸ **objectRoamWithoutRotate**(`viewer`, `segmentObject`, `points`, `roamTime`, `pathType`, `finishEvent?`): `string`
 
+只平移的路径动画.
+
 #### Parameters
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `viewer` | [`Viewer`](Viewer.md) |  |
-| `segmentObject` | [`SegmentObject`](SegmentObject.md) |  |
-| `points` | `Point`[] |  |
-| `roamTime` | `number` |  |
-| `pathType` | `PathType` |  |
-| `finishEvent?` | () => `void` |  |
+| `viewer` | [`Viewer`](Viewer.md) | BimAir的viewer |
+| `segmentObject` | [`SegmentObject`](SegmentObject.md) | 动画移动的对象 |
+| `points` | `Point`[] | 路径点列表 |
+| `roamTime` | `number` | 动画时间 |
+| `pathType` | `PathType` | 路径类型(直线/曲线) |
+| `finishEvent?` | () => `void` | 结束事件 |
 
 #### Returns
 
 `string`
 
+动画的Id
+
 ___
 
 ### pauseAnime
@@ -245,6 +249,8 @@ ___
 
 ▸ **resetAnimationItems**(`viewer`): `void`
 
+恢复所有因动画移动了位置的物体.
+
 #### Parameters
 
 | Name | Type |
@@ -306,17 +312,19 @@ ___
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `degreed` | `number` |  |
-| `segmentObject` | [`SegmentObject`](SegmentObject.md) |  |
-| `points` | `Point`[] |  |
-| `roamTime` | `number` |  |
-| `datumPoint` | `Float64Array` |  |
-| `finishEvent?` | () => `void` |  |
+| `degreed` | `number` | 旋转角 |
+| `segmentObject` | [`SegmentObject`](SegmentObject.md) | 移动的segmentObject |
+| `points` | `Point`[] | 路径点列表 |
+| `roamTime` | `number` | 漫游时长 |
+| `datumPoint` | `Float64Array` | 基准点---模型旋转中心(因为模型朝向需要与路径起点的切线方向一致,因此需要调整模型的旋转.) |
+| `finishEvent?` | () => `void` | 结束事件 |
 
 #### Returns
 
 `string`
 
+动画的Id
+
 ___
 
 ### stop

package/docs/classes/BoreholeObjects.md

@@ -17,6 +17,7 @@
 ### Properties
 
 - [\_name](BoreholeObjects.md#_name)
+- [color](BoreholeObjects.md#color)
 - [data](BoreholeObjects.md#data)
 - [instanceTypes](BoreholeObjects.md#instancetypes)
 - [typeName](BoreholeObjects.md#typename)
@@ -50,7 +51,7 @@
 - [deserialize](BoreholeObjects.md#deserialize)
 - [dispose](BoreholeObjects.md#dispose)
 - [forEach](BoreholeObjects.md#foreach)
-- [onModelLoaded](BoreholeObjects.md#onmodelloaded)
+- [loadModel](BoreholeObjects.md#loadmodel)
 - [remove](BoreholeObjects.md#remove)
 - [removeChildObject](BoreholeObjects.md#removechildobject)
 - [render](BoreholeObjects.md#render)
@@ -78,6 +79,16 @@ ParamModelObject.\_name
 
 ___
 
+### color
+
+• **color**: `number`[]
+
+#### Inherited from
+
+ParamModelObject.color
+
+___
+
 ### data
 
 • **data**: `Borehole`[]
@@ -448,6 +459,8 @@ ParamModelObject.visible
 
 ▸ **addBorehole**(`segment`, `name`, `componentId`, `point`, `holdDepth`, `az`, `an`, `startCalibrer`, `endCalibrer`): `Cylinder`
 
+添加钻孔
+
 #### Parameters
 
 | Name | Type | Description |
@@ -455,12 +468,12 @@ ParamModelObject.visible
 | `segment` | `Segment` |  |
 | `name` | `string` |  |
 | `componentId` | `string` |  |
-| `point` | `Float32Array` |  |
-| `holdDepth` | `number` |  |
-| `az` | `number` |  |
-| `an` | `number` |  |
-| `startCalibrer` | `number` |  |
-| `endCalibrer` | `number` |  |
+| `point` | `Float32Array` | 起始点 |
+| `holdDepth` | `number` | 孔深 |
+| `az` | `number` | 钻孔方位，钻孔投影相对俯视地面正北方夹角 |
+| `an` | `number` | 钻孔角度，钻孔相对地面的最小夹角 |
+| `startCalibrer` | `number` | 开孔口径 |
+| `endCalibrer` | `number` | 终孔口径 |
 
 #### Returns
 
@@ -633,9 +646,9 @@ ParamModelObject.forEach
 
 ___
 
-### onModelLoaded
+### loadModel
 
-▸ **onModelLoaded**(`data`, `process?`): `Promise`<`void`\>
+▸ **loadModel**(`data`, `process?`): `Promise`<`void`\>
 
 #### Parameters
 
@@ -650,7 +663,7 @@ ___
 
 #### Inherited from
 
-ParamModelObject.onModelLoaded
+ParamModelObject.loadModel
 
 ___
 

package/docs/classes/CircleScanEffect.md

@@ -22,11 +22,13 @@
 
 • **new CircleScanEffect**(`circleScanEffectConfig`)
 
+根据配置信息创建
+
 #### Parameters
 
-| Name | Type | Description |
-| :------ | :------ | :------ |
-| `circleScanEffectConfig` | [`CircleScanEffectConfig`](CircleScanEffectConfig.md) |  |
+| Name | Type |
+| :------ | :------ |
+| `circleScanEffectConfig` | [`CircleScanEffectConfig`](CircleScanEffectConfig.md) |
 
 ## Properties
 

package/docs/classes/CircleScanEffectConfig.md

@@ -27,12 +27,12 @@
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `viewer` | [`Viewer`](Viewer.md) |  |
-| `lightModel` | [`LightModel`](LightModel.md) |  |
-| `color` | `Float32Array` |  |
-| `origin` | `Float32Array` |  |
-| `radius` | `number` |  |
-| `duration` | `number` |  |
+| `viewer` | [`Viewer`](Viewer.md) | 视图 |
+| `lightModel` | [`LightModel`](LightModel.md) | 模型 |
+| `color` | `Float32Array` | 颜色 |
+| `origin` | `Float32Array` | 圆点 |
+| `radius` | `number` | 半径 |
+| `duration` | `number` | 时间 |
 
 ## Properties
 

package/docs/classes/ComponentManager.md

@@ -77,6 +77,8 @@ ___
 
 ▸ **getComponentKey**(`key`): `number`
 
+向上查找构件，找不到返回-1
+
 #### Parameters
 
 | Name | Type |

package/docs/classes/ComponentSelector.md

@@ -362,6 +362,8 @@ ___
 
 • `get` **edgeSelection**(): `boolean`
 
+获取顶点可选性
+
 #### Returns
 
 `boolean`
@@ -372,6 +374,8 @@ Longan.ObjectSelector.edgeSelection
 
 • `set` **edgeSelection**(`onoff`): `void`
 
+设置边可选性
+
 #### Parameters
 
 | Name | Type |
@@ -422,6 +426,8 @@ ___
 
 • `get` **faceSelection**(): `boolean`
 
+获取面可选性
+
 #### Returns
 
 `boolean`
@@ -432,6 +438,8 @@ Longan.ObjectSelector.faceSelection
 
 • `set` **faceSelection**(`onoff`): `void`
 
+设置面可选性
+
 #### Parameters
 
 | Name | Type |
@@ -522,6 +530,8 @@ ___
 
 • `get` **vertexSelection**(): `boolean`
 
+获取顶点可选性
+
 #### Returns
 
 `boolean`
@@ -532,6 +542,8 @@ Longan.ObjectSelector.vertexSelection
 
 • `set` **vertexSelection**(`onoff`): `void`
 
+设置顶点可选性
+
 #### Parameters
 
 | Name | Type |
@@ -960,7 +972,7 @@ ___
 
 `void`
 
-#### Inherited from
+#### Overrides
 
 Longan.ObjectSelector.onTouchStart
 

package/docs/classes/CuttingOptions.md

@@ -2,6 +2,8 @@
 
 # Class: CuttingOptions
 
+剖切选项，提供进行剖切时所需的信息
+
 ## Table of contents
 
 ### Constructors
@@ -90,6 +92,8 @@ ___
 
 • `get` **bb**(): `Float32Array`
 
+获取包围盒
+
 #### Returns
 
 `Float32Array`
@@ -100,12 +104,16 @@ ___
 
 • `get` **color**(): `ArrayLike`<`number`\>
 
+获取剖切面的颜色
+
 #### Returns
 
 `ArrayLike`<`number`\>
 
 • `set` **color**(`value`): `void`
 
+设置剖切面的颜色
+
 #### Parameters
 
 | Name | Type |
@@ -132,12 +140,16 @@ ___
 
 • `get` **direct**(): `ArrayLike`<`number`\>
 
+获取剖切的方向
+
 #### Returns
 
 `ArrayLike`<`number`\>
 
 • `set` **direct**(`value`): `void`
 
+设置剖切的方向
+
 #### Parameters
 
 | Name | Type |
@@ -154,12 +166,16 @@ ___
 
 • `get` **length**(): `number`
 
+获取剖切的长度
+
 #### Returns
 
 `number`
 
 • `set` **length**(`value`): `void`
 
+设置剖切的长度
+
 #### Parameters
 
 | Name | Type |
@@ -176,12 +192,16 @@ ___
 
 • `get` **origin**(): `ArrayLike`<`number`\>
 
+获取剖切的起点
+
 #### Returns
 
 `ArrayLike`<`number`\>
 
 • `set` **origin**(`value`): `void`
 
+设置剖切的起点
+
 #### Parameters
 
 | Name | Type |
@@ -198,12 +218,16 @@ ___
 
 • `get` **ratio**(): `number`
 
+获取剖切位置的比例
+
 #### Returns
 
 `number`
 
 • `set` **ratio**(`value`): `void`
 
+设置剖切位置的比例，取值为: 0~1
+
 #### Parameters
 
 | Name | Type |
@@ -220,12 +244,16 @@ ___
 
 • `get` **type**(): [`CuttingCreateType`](../enums/CuttingCreateType.md)
 
+获取剖切的类型
+
 #### Returns
 
 [`CuttingCreateType`](../enums/CuttingCreateType.md)
 
 • `set` **type**(`value`): `void`
 
+设置剖切的类型
+
 #### Parameters
 
 | Name | Type |

package/docs/classes/FanScanEffect.md

@@ -22,11 +22,13 @@
 
 • **new FanScanEffect**(`fanScanEffectConfig`)
 
+根据配置信息创建
+
 #### Parameters
 
-| Name | Type | Description |
-| :------ | :------ | :------ |
-| `fanScanEffectConfig` | [`FanScanEffectConfig`](FanScanEffectConfig.md) |  |
+| Name | Type |
+| :------ | :------ |
+| `fanScanEffectConfig` | [`FanScanEffectConfig`](FanScanEffectConfig.md) |
 
 ## Properties
 

package/docs/classes/FanScanEffectConfig.md

@@ -29,14 +29,14 @@
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `viewer` | [`Viewer`](Viewer.md) |  |
-| `fanAngle` | `number` |  |
-| `color` | `Float32Array` |  |
-| `backgroundColor` | `Float32Array` |  |
-| `backgroundAlpha` | `number` |  |
-| `origin` | `Float32Array` |  |
-| `radius` | `number` |  |
-| `duration` | `number` |  |
+| `viewer` | [`Viewer`](Viewer.md) | 视图 |
+| `fanAngle` | `number` | 角度 |
+| `color` | `Float32Array` | 颜色 |
+| `backgroundColor` | `Float32Array` | 背景色 |
+| `backgroundAlpha` | `number` | 背景透明度 |
+| `origin` | `Float32Array` | 圆点 |
+| `radius` | `number` | 半径 |
+| `duration` | `number` | 时间 |
 
 ## Properties
 

package/docs/classes/HeightLimitEffect.md

@@ -22,11 +22,13 @@
 
 • **new HeightLimitEffect**(`heightLimitEffectConfig`)
 
+根据配置信息创建
+
 #### Parameters
 
-| Name | Type | Description |
-| :------ | :------ | :------ |
-| `heightLimitEffectConfig` | [`HeightLimitEffectConfig`](HeightLimitEffectConfig.md) |  |
+| Name | Type |
+| :------ | :------ |
+| `heightLimitEffectConfig` | [`HeightLimitEffectConfig`](HeightLimitEffectConfig.md) |
 
 ## Properties
 

package/docs/classes/HeightLimitEffectConfig.md

@@ -25,10 +25,10 @@
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `viewer` | [`Viewer`](Viewer.md) |  |
+| `viewer` | [`Viewer`](Viewer.md) | 需要创建哪个视图下 |
 | `lightModel` | [`LightModel`](LightModel.md) | - |
-| `height` | `number` |  |
-| `color` | `Float32Array` |  |
+| `height` | `number` | 限制高度 |
+| `color` | `Float32Array` | 限制高度的颜色 |
 
 ## Properties
 

package/docs/classes/HighlightManager.md

@@ -115,6 +115,8 @@ Longan.HighlightManager.viewer
 
 ▸ **clearAllHighlight**(): `void`
 
+取消所有隐藏
+
 #### Returns
 
 `void`
@@ -129,11 +131,13 @@ ___
 
 ▸ **clearHighlight**(`objs`): `void`
 
+清除多个节点高亮
+
 #### Parameters
 
-| Name | Type | Description |
-| :------ | :------ | :------ |
-| `objs` | [`SegmentObject`](SegmentObject.md)[] \| [`TreeNodeObject`](TreeNodeObject.md)[] |  |
+| Name | Type |
+| :------ | :------ |
+| `objs` | [`SegmentObject`](SegmentObject.md)[] \| [`TreeNodeObject`](TreeNodeObject.md)[] |
 
 #### Returns
 
@@ -166,11 +170,13 @@ ___
 
 ▸ **highlight**(`objs`): `void`
 
+高亮多个节点
+
 #### Parameters
 
-| Name | Type | Description |
-| :------ | :------ | :------ |
-| `objs` | [`SegmentObject`](SegmentObject.md)[] \| [`TreeNodeObject`](TreeNodeObject.md)[] |  |
+| Name | Type |
+| :------ | :------ |
+| `objs` | [`SegmentObject`](SegmentObject.md)[] \| [`TreeNodeObject`](TreeNodeObject.md)[] |
 
 #### Returns
 
@@ -182,6 +188,8 @@ ___
 
 ▸ **highlightKeys**(`keys`, `paths`): `void`
 
+隐藏多个
+
 #### Parameters
 
 | Name | Type |