gs-bim-air 2.0.0-beta.12 → 2.0.0-beta.14

package/README.md

@@ -1,5 +1,41 @@
 ## 更新日志
 
+### 2.0.0-beta.14
+
+> 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+>
+> Longan 更新为 v2.0.0-beta.9
+
+fix: 模型截取功能支持多构件截取，具体示例请看[模型截取示例](./readme/%E6%A8%A1%E5%9E%8B%E6%88%AA%E5%8F%96%E7%A4%BA%E4%BE%8B.md)
+fix: 截取结果的构件加上颜色
+fix: 截取结果添加构件属性
+fix: 修复 ensure 与 updateDisplay 对同一个 segment 同时起效时，可能往一个 segment 中插入两次几何的问题.
+fix: gs.viewer.ts 添加 isGeometryLoading 标志位
+fix: ensureSegmentAsynGeometry 等待当前视图几何加载完后再执行
+
+feat: 添加模型截取功能，具体示例请看模型截取示例
+feat: lightModel 添加 streamToSegmentRunningCount 计数器.
+feat: 结构树界面显示时不隐藏按钮
+feat: 添加几何加载完毕后回调列表 geometryDrawFinish，使用方式如下：
+
+```js
+viewer.geometryDrawFinish.add(() => {
+  console.log("几何完成绘制");
+});
+```
+
+fix: 修复在打开批注面板然后关闭批注面板，恢复一个保存了批注的视点，无法恢复批注且控制台报错
+fix: 修复 ensureSegmentAsynGeometry 的异步逻辑
+fix: 修复 isBusyLocked 状态，在同时使用右键、中键时，重复按下、松开右键，会导致 viewer.isBusy 状态异常的问题；现在只有在 3 个按键都松开的情况下，解除 isBusyLock.
+fix: 修复 onTaskProcessingFinished 修改 runningCount 计数使用的 viewer 对象错误的问题.
+fix: 增加字体包重复加载判断
+
+### 2.0.0-beta.13
+
+> Longan 更新为 v2.0.0-beta.8
+
+- fix: 修复 onTaskProcessingFinished 修改 runningCount 计数使用的 viewer 对象错误的问题.
+
 ### 2.0.0-beta.12
 
 > 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹

package/docs/classes/Longan.CameraMouse.md

@@ -73,6 +73,7 @@
 ### Accessors
 
 - [enable](Longan.CameraMouse.md#enable)
+- [isBusyLocked](Longan.CameraMouse.md#isbusylocked)
 - [lButtonSate](Longan.CameraMouse.md#lbuttonsate)
 - [viewer](Longan.CameraMouse.md#viewer)
 
@@ -503,6 +504,18 @@ ViewerOperator.enable
 
 ___
 
+### isBusyLocked
+
+• `get` **isBusyLocked**(): `boolean`
+
+左、中、右键任一按键Down后，lock住_recordIsBusy.
+
+#### Returns
+
+`boolean`
+
+___
+
 ### lButtonSate
 
 • `get` **lButtonSate**(): `LButtonState`

package/docs/classes/Longan.CameraPlanMouse.md

@@ -65,6 +65,7 @@
 ### Accessors
 
 - [enable](Longan.CameraPlanMouse.md#enable)
+- [isBusyLocked](Longan.CameraPlanMouse.md#isbusylocked)
 - [lButtonSate](Longan.CameraPlanMouse.md#lbuttonsate)
 - [viewer](Longan.CameraPlanMouse.md#viewer)
 
@@ -579,6 +580,22 @@ CameraMouse.enable
 
 ___
 
+### isBusyLocked
+
+• `get` **isBusyLocked**(): `boolean`
+
+左、中、右键任一按键Down后，lock住_recordIsBusy.
+
+#### Returns
+
+`boolean`
+
+#### Inherited from
+
+CameraMouse.isBusyLocked
+
+___
+
 ### lButtonSate
 
 • `get` **lButtonSate**(): `LButtonState`

package/docs/classes/Longan.DGeometryOperators.md

@@ -24,6 +24,7 @@
 - [intersectionLineLine](Longan.DGeometryOperators.md#intersectionlineline)
 - [intersectionLinePlane](Longan.DGeometryOperators.md#intersectionlineplane)
 - [intersectionLineSegmentLineSegment](Longan.DGeometryOperators.md#intersectionlinesegmentlinesegment)
+- [intersectionLineSegmentPlane](Longan.DGeometryOperators.md#intersectionlinesegmentplane)
 - [inversePolygon](Longan.DGeometryOperators.md#inversepolygon)
 - [isParallel](Longan.DGeometryOperators.md#isparallel)
 - [isPerpendicular](Longan.DGeometryOperators.md#isperpendicular)
@@ -37,6 +38,7 @@
 - [projectPointToLine1](Longan.DGeometryOperators.md#projectpointtoline1)
 - [projectPointToLineWithParam](Longan.DGeometryOperators.md#projectpointtolinewithparam)
 - [projectPointToPlane](Longan.DGeometryOperators.md#projectpointtoplane)
+- [reversePoints](Longan.DGeometryOperators.md#reversepoints)
 - [samePoint](Longan.DGeometryOperators.md#samepoint)
 - [samePointWithTolerance](Longan.DGeometryOperators.md#samepointwithtolerance)
 - [sameVector](Longan.DGeometryOperators.md#samevector)
@@ -231,7 +233,7 @@ ___
 
 ### intersectionLinePlane
 
-▸ `Static` **intersectionLinePlane**(`line_point`, `line_dir`, `plane_point`, `plane_dir`): { `param`: `undefined` = line\_param; `pos`: `undefined` = result; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float64Array` = result; `res`: `boolean` = true }
+▸ `Static` **intersectionLinePlane**(`line_point`, `line_dir`, `plane_point`, `plane_dir`): { `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float64Array` = result; `res`: `boolean` = true }
 
 #### Parameters
 
@@ -244,7 +246,7 @@ ___
 
 #### Returns
 
-{ `param`: `undefined` = line\_param; `pos`: `undefined` = result; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float64Array` = result; `res`: `boolean` = true }
+{ `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float64Array` = result; `res`: `boolean` = true }
 
 ___
 
@@ -267,6 +269,25 @@ ___
 
 ___
 
+### intersectionLineSegmentPlane
+
+▸ `Static` **intersectionLineSegmentPlane**(`line_start`, `line_end`, `plane_root`, `plane_normal`): { `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `any` = inter\_param; `pos`: `any` = inter\_point; `res`: `boolean` = true }
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `line_start` | `Float64Array` |
+| `line_end` | `Float64Array` |
+| `plane_root` | `Float64Array` |
+| `plane_normal` | `Float64Array` |
+
+#### Returns
+
+{ `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `any` = inter\_param; `pos`: `any` = inter\_point; `res`: `boolean` = true }
+
+___
+
 ### inversePolygon
 
 ▸ `Static` **inversePolygon**(`polygon`): `void`
@@ -499,6 +520,22 @@ ___
 
 ___
 
+### reversePoints
+
+▸ `Static` **reversePoints**(`points`): `number`[]
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `points` | `ArrayLike`<`number`\> |
+
+#### Returns
+
+`number`[]
+
+___
+
 ### samePoint
 
 ▸ `Static` **samePoint**(`p0`, `p1`): `boolean`

package/docs/classes/Longan.EarthCameraMouse.md

@@ -76,6 +76,7 @@
 ### Accessors
 
 - [enable](Longan.EarthCameraMouse.md#enable)
+- [isBusyLocked](Longan.EarthCameraMouse.md#isbusylocked)
 - [lButtonSate](Longan.EarthCameraMouse.md#lbuttonsate)
 - [viewer](Longan.EarthCameraMouse.md#viewer)
 
@@ -660,6 +661,22 @@ CameraMouse.enable
 
 ___
 
+### isBusyLocked
+
+• `get` **isBusyLocked**(): `boolean`
+
+左、中、右键任一按键Down后，lock住_recordIsBusy.
+
+#### Returns
+
+`boolean`
+
+#### Inherited from
+
+CameraMouse.isBusyLocked
+
+___
+
 ### lButtonSate
 
 • `get` **lButtonSate**(): `LButtonState`

package/docs/classes/Longan.GeometryOperators.md

@@ -24,6 +24,7 @@
 - [intersectionLineLine1](Longan.GeometryOperators.md#intersectionlineline1)
 - [intersectionLinePlane](Longan.GeometryOperators.md#intersectionlineplane)
 - [intersectionLineSegmentLineSegment](Longan.GeometryOperators.md#intersectionlinesegmentlinesegment)
+- [intersectionLineSegmentPlane](Longan.GeometryOperators.md#intersectionlinesegmentplane)
 - [inversePolygon](Longan.GeometryOperators.md#inversepolygon)
 - [isParallel](Longan.GeometryOperators.md#isparallel-1)
 - [isPerpendicular](Longan.GeometryOperators.md#isperpendicular)
@@ -37,6 +38,7 @@
 - [projectPointToLine1](Longan.GeometryOperators.md#projectpointtoline1)
 - [projectPointToLineWithParam](Longan.GeometryOperators.md#projectpointtolinewithparam)
 - [projectPointToPlane](Longan.GeometryOperators.md#projectpointtoplane)
+- [reversePoints](Longan.GeometryOperators.md#reversepoints)
 - [samePoint](Longan.GeometryOperators.md#samepoint)
 - [sameVector](Longan.GeometryOperators.md#samevector)
 
@@ -231,7 +233,7 @@ ___
 
 ### intersectionLinePlane
 
-▸ `Static` **intersectionLinePlane**(`line_point`, `line_dir`, `plane_point`, `plane_dir`): { `param`: `undefined` = line\_param; `pos`: `undefined` = result; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float32Array` = result; `res`: `boolean` = true }
+▸ `Static` **intersectionLinePlane**(`line_point`, `line_dir`, `plane_point`, `plane_dir`): { `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float32Array` = result; `res`: `boolean` = true }
 
 #### Parameters
 
@@ -244,7 +246,7 @@ ___
 
 #### Returns
 
-{ `param`: `undefined` = line\_param; `pos`: `undefined` = result; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float32Array` = result; `res`: `boolean` = true }
+{ `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `number` = line\_param; `pos`: `Float32Array` = result; `res`: `boolean` = true }
 
 ___
 
@@ -267,6 +269,25 @@ ___
 
 ___
 
+### intersectionLineSegmentPlane
+
+▸ `Static` **intersectionLineSegmentPlane**(`line_start`, `line_end`, `plane_root`, `plane_normal`): { `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `any` = inter\_param; `pos`: `any` = inter\_point; `res`: `boolean` = true }
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `line_start` | `Float32Array` |
+| `line_end` | `Float32Array` |
+| `plane_root` | `Float32Array` |
+| `plane_normal` | `Float32Array` |
+
+#### Returns
+
+{ `param`: `undefined` = inter\_param; `pos`: `undefined` = inter\_point; `res`: `boolean` = false } \| { `param`: `any` = inter\_param; `pos`: `any` = inter\_point; `res`: `boolean` = true }
+
+___
+
 ### inversePolygon
 
 ▸ `Static` **inversePolygon**(`polygon`): `void`
@@ -499,6 +520,22 @@ ___
 
 ___
 
+### reversePoints
+
+▸ `Static` **reversePoints**(`points`): `number`[]
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `points` | `ArrayLike`<`number`\> |
+
+#### Returns
+
+`number`[]
+
+___
+
 ### samePoint
 
 ▸ `Static` **samePoint**(`p0`, `p1`): `boolean`

package/docs/classes/Longan.Line.md

@@ -168,7 +168,7 @@ Curve.volume
 
 ### ComputeTessellateData
 
-▸ **ComputeTessellateData**(`precision?`): `any`
+▸ **ComputeTessellateData**(`precision?`): `Object`
 
 #### Parameters
 
@@ -178,7 +178,14 @@ Curve.volume
 
 #### Returns
 
-`any`
+`Object`
+
+| Name | Type |
+| :------ | :------ |
+| `indexes` | `Int32Array` |
+| `normals` | `Float32Array` |
+| `positions` | `Float32Array` |
+| `texcoords` | `Float32Array` |
 
 #### Inherited from
 

package/docs/classes/Longan.LonganCore.Viewer.md

@@ -23,6 +23,7 @@
 - [collisionComputing](Longan.LonganCore.Viewer.md#collisioncomputing)
 - [container](Longan.LonganCore.Viewer.md#container)
 - [documentChanged](Longan.LonganCore.Viewer.md#documentchanged)
+- [geometryDrawFinish](Longan.LonganCore.Viewer.md#geometrydrawfinish)
 - [geometryItem](Longan.LonganCore.Viewer.md#geometryitem)
 - [geometryItems](Longan.LonganCore.Viewer.md#geometryitems)
 - [getAsynGroupGeoDataAction](Longan.LonganCore.Viewer.md#getasyngroupgeodataaction)
@@ -30,6 +31,7 @@
 - [gl](Longan.LonganCore.Viewer.md#gl)
 - [imageUrls](Longan.LonganCore.Viewer.md#imageurls)
 - [isFixFrameRender](Longan.LonganCore.Viewer.md#isfixframerender)
+- [isGeometryLoading](Longan.LonganCore.Viewer.md#isgeometryloading)
 - [maxMemoryFactor](Longan.LonganCore.Viewer.md#maxmemoryfactor)
 - [modelDebug](Longan.LonganCore.Viewer.md#modeldebug)
 - [onComputeCollisionFinished](Longan.LonganCore.Viewer.md#oncomputecollisionfinished)
@@ -76,7 +78,7 @@
 - [asynRemoveGeometry](Longan.LonganCore.Viewer.md#asynremovegeometry)
 - [asynUPGDTaskRun](Longan.LonganCore.Viewer.md#asynupgdtaskrun)
 - [asynUpdateView](Longan.LonganCore.Viewer.md#asynupdateview)
-- [checkStreamToGeometryEnable](Longan.LonganCore.Viewer.md#checkstreamtogeometryenable)
+- [checkStreamToGeometryDisable](Longan.LonganCore.Viewer.md#checkstreamtogeometrydisable)
 - [computeNearPlaneWorldPos](Longan.LonganCore.Viewer.md#computenearplaneworldpos)
 - [computePerspectiveNearWorldPos](Longan.LonganCore.Viewer.md#computeperspectivenearworldpos)
 - [convertCoordinate](Longan.LonganCore.Viewer.md#convertcoordinate)
@@ -154,6 +156,12 @@ ___
 
 ___
 
+### geometryDrawFinish
+
+• **geometryDrawFinish**: [`List`](Longan.List.md)<`Function`\>
+
+___
+
 ### geometryItem
 
 • **geometryItem**: [`List`](Longan.List.md)<`Function`\>
@@ -223,6 +231,14 @@ ___
 
 ___
 
+### isGeometryLoading
+
+• **isGeometryLoading**: `boolean` = `false`
+
+是否有几何数据正在通过updateDisplay进行加载.
+
+___
+
 ### maxMemoryFactor
 
 • **maxMemoryFactor**: `number` = `0.8`
@@ -869,9 +885,9 @@ ___
 
 ___
 
-### checkStreamToGeometryEnable
+### checkStreamToGeometryDisable
 
-▸ **checkStreamToGeometryEnable**(): `boolean`
+▸ **checkStreamToGeometryDisable**(): `boolean`
 
 #### Returns
 

package/docs/classes/Longan.Matrix4.md

@@ -226,6 +226,8 @@ ___
 
 ▸ `Static` **multiply**(`m1`, `m2`): `Float32Array`
 
+矩阵相乘
+
 #### Parameters
 
 | Name | Type |
@@ -281,17 +283,21 @@ ___
 
 ▸ `Static` **multiplyPoints**(`m`, `ps`): `Float32Array`
 
+点数组矩阵变换
+
 #### Parameters
 
-| Name | Type |
-| :------ | :------ |
-| `m` | `Float32Array` |
-| `ps` | `Float32Array` |
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `m` | `Float32Array` | 矩阵 |
+| `ps` | `Float32Array` | - |
 
 #### Returns
 
 `Float32Array`
 
+变换后的点数组
+
 ___
 
 ### multiplyVector

package/docs/classes/Longan.Mesh.md

@@ -114,6 +114,16 @@ ___
 
 ### normals
 
+• `get` **normals**(): `Float32Array`
+
+#### Returns
+
+`Float32Array`
+
+#### Inherited from
+
+Surface.normals
+
 • `set` **normals**(`value`): `void`
 
 #### Parameters
@@ -210,7 +220,7 @@ Surface.volume
 
 ### ComputeTessellateData
 
-▸ **ComputeTessellateData**(`image`, `precision?`): `any`
+▸ **ComputeTessellateData**(`image`, `precision?`): `Object`
 
 #### Parameters
 
@@ -221,7 +231,14 @@ Surface.volume
 
 #### Returns
 
-`any`
+`Object`
+
+| Name | Type |
+| :------ | :------ |
+| `indexes` | `Int32Array` |
+| `normals` | `Float32Array` |
+| `positions` | `Float32Array` |
+| `texcoords` | `Float32Array` |
 
 #### Inherited from
 

package/docs/classes/Longan.PanoramaCameraMouse.md

@@ -66,6 +66,7 @@
 ### Accessors
 
 - [enable](Longan.PanoramaCameraMouse.md#enable)
+- [isBusyLocked](Longan.PanoramaCameraMouse.md#isbusylocked)
 - [lButtonSate](Longan.PanoramaCameraMouse.md#lbuttonsate)
 - [viewer](Longan.PanoramaCameraMouse.md#viewer)
 
@@ -587,6 +588,22 @@ CameraMouse.enable
 
 ___
 
+### isBusyLocked
+
+• `get` **isBusyLocked**(): `boolean`
+
+左、中、右键任一按键Down后，lock住_recordIsBusy.
+
+#### Returns
+
+`boolean`
+
+#### Inherited from
+
+CameraMouse.isBusyLocked
+
+___
+
 ### lButtonSate
 
 • `get` **lButtonSate**(): `LButtonState`

package/docs/classes/Longan.ParametricGeometry.md

@@ -116,6 +116,16 @@ ___
 
 ### normals
 
+• `get` **normals**(): `Float32Array`
+
+#### Returns
+
+`Float32Array`
+
+#### Inherited from
+
+Surface.normals
+
 • `set` **normals**(`value`): `void`
 
 #### Parameters
@@ -244,7 +254,7 @@ Surface.volume
 
 ### ComputeTessellateData
 
-▸ **ComputeTessellateData**(`image`, `precision?`): `any`
+▸ **ComputeTessellateData**(`image`, `precision?`): `Object`
 
 #### Parameters
 
@@ -255,7 +265,14 @@ Surface.volume
 
 #### Returns
 
-`any`
+`Object`
+
+| Name | Type |
+| :------ | :------ |
+| `indexes` | `Int32Array` |
+| `normals` | `Float32Array` |
+| `positions` | `Float32Array` |
+| `texcoords` | `Float32Array` |
 
 #### Inherited from
 

package/docs/classes/Longan.PerspectiveCameraMouse.md

@@ -65,6 +65,7 @@
 ### Accessors
 
 - [enable](Longan.PerspectiveCameraMouse.md#enable)
+- [isBusyLocked](Longan.PerspectiveCameraMouse.md#isbusylocked)
 - [lButtonSate](Longan.PerspectiveCameraMouse.md#lbuttonsate)
 - [viewer](Longan.PerspectiveCameraMouse.md#viewer)
 
@@ -579,6 +580,22 @@ CameraMouse.enable
 
 ___
 
+### isBusyLocked
+
+• `get` **isBusyLocked**(): `boolean`
+
+左、中、右键任一按键Down后，lock住_recordIsBusy.
+
+#### Returns
+
+`boolean`
+
+#### Inherited from
+
+CameraMouse.isBusyLocked
+
+___
+
 ### lButtonSate
 
 • `get` **lButtonSate**(): `LButtonState`

package/docs/classes/Longan.Polyline.md

@@ -179,7 +179,7 @@ Curve.volume
 
 ### ComputeTessellateData
 
-▸ **ComputeTessellateData**(`precision?`): `any`
+▸ **ComputeTessellateData**(`precision?`): `Object`
 
 #### Parameters
 
@@ -189,7 +189,14 @@ Curve.volume
 
 #### Returns
 
-`any`
+`Object`
+
+| Name | Type |
+| :------ | :------ |
+| `indexes` | `Int32Array` |
+| `normals` | `Float32Array` |
+| `positions` | `Float32Array` |
+| `texcoords` | `Float32Array` |
 
 #### Inherited from
 

package/docs/classes/Longan.Shell.md

@@ -132,6 +132,16 @@ ___
 
 ### normals
 
+• `get` **normals**(): `Float32Array`
+
+#### Returns
+
+`Float32Array`
+
+#### Inherited from
+
+Surface.normals
+
 • `set` **normals**(`value`): `void`
 
 #### Parameters
@@ -238,7 +248,7 @@ Surface.volume
 
 ### ComputeTessellateData
 
-▸ **ComputeTessellateData**(`image`, `precision?`): `any`
+▸ **ComputeTessellateData**(`image`, `precision?`): `Object`
 
 #### Parameters
 
@@ -249,7 +259,14 @@ Surface.volume
 
 #### Returns
 
-`any`
+`Object`
+
+| Name | Type |
+| :------ | :------ |
+| `indexes` | `Int32Array` |
+| `normals` | `Float32Array` |
+| `positions` | `Float32Array` |
+| `texcoords` | `Float32Array` |
 
 #### Inherited from
 

package/docs/classes/Longan.Tolerance.md

@@ -17,6 +17,7 @@
 
 ### Methods
 
+- [isValueInInterval](Longan.Tolerance.md#isvalueininterval)
 - [sameValue](Longan.Tolerance.md#samevalue)
 - [sameValueFloatArray](Longan.Tolerance.md#samevaluefloatarray)
 
@@ -40,6 +41,24 @@ ___
 
 ## Methods
 
+### isValueInInterval
+
+▸ `Static` **isValueInInterval**(`v`, `a`, `b`): `boolean`
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `v` | `number` |
+| `a` | `number` |
+| `b` | `number` |
+
+#### Returns
+
+`boolean`
+
+___
+
 ### sameValue
 
 ▸ `Static` **sameValue**(`a`, `b`): `boolean`