npm - gs-bim-air - Versions diffs - 0.0.3-0.23 → 0.0.3-0.26 - Mend

gs-bim-air 0.0.3-0.23 → 0.0.3-0.26

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 (27) hide show

package/READMEBETA.md CHANGED Viewed

@@ -227,6 +227,24 @@ viewer.camera.projection = BimAir.Longan.ProjectionType.Perspective; //透视投
 -   修复钻孔和平硐 z 轴朝向问题
 -   修复标签无法清空面板数据问题
+### 0.0.30.24
+-   修改钻孔模型生成逻辑
+-   钻孔、平硐模型添加修改颜色参数
+-   添加多构件聚焦定位功能
+### 0.0.30.25
+-   更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+-   修复模型不显示的问题
+### 0.0.30.26
+-   修复投影设置有问题
+-   修复颜色设置报错问题
+-   修复投影设置问题
+-   修改钻孔生成逻辑
 ## BETA2 日志
 ### 0.1.30.1

package/demo//346/250/241/345/236/213/346/223/215/344/275/234//345/212/240/350/275/275/344/270/216/345/210/240/351/231/244/346/234/215/345/212/241/345/231/250/346/250/241/345/236/213.html CHANGED Viewed

@@ -1,52 +1,49 @@
 <!DOCTYPE html>
 <html>
+	<head>
+		<meta charset="UTF-8" />
+		<title>加载服务器模型</title>
+		<link rel="stylesheet" href="https://static.graphicstone.com/bimAir/BimAir.css" />
+		<script src="https://static.graphicstone.com/vue.min.js"></script>
+		<script src="https://static.graphicstone.com/bimAir/BimAir.umd.min.js"></script>
+	</head>
-<head>
-    <meta charset="UTF-8">
-    <title>加载服务器模型</title>
-    <link rel="stylesheet" href="https://static.graphicstone.com/bimAir/BimAir.css">
-    <script src="https://static.graphicstone.com/vue.min.js"></script>
-    <script src="https://static.graphicstone.com/bimAir/BimAir.umd.min.js"></script>
-</head>
+	<body>
+		<style>
+			body {
+				margin: 0;
+				padding: 0;
+				height: 100vh;
+			}
-<body>
-    <style>
-        body {
-            margin: 0;
-            padding: 0;
-            height: 100vh;
-        }
+			#app {
+				height: 100vh;
+				position: relative;
+			}
+		</style>
+		<div id="app">
+			<viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
+		</div>
-        #app {
-            height: 100vh;
-            position: relative;
-        }
-    </style>
-    <div id="app">
-        <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
-    </div>
+		<script type="text/javascript">
+			new Vue({
+				el: "#app",
+			});
-    <script type="text/javascript">
-        new Vue({
-            el: '#app',
-        });
-        let options = {
-            elementId: "viewer",
-            modelService: "https://8.134.85.254:9037/api",
-            fileService: "https://static.graphicstone.com/fileApi",
-            background: "linear-gradient(#e3fcfc, #f6ffff)",
-        }
-        BimAir.Loader({
-            url: "https://static.graphicstone.com/bimAir",
-        }).then(() => {
-            let viewer = new BimAir.Viewer(options)
-            viewer.loadModels([{ id: "62abe955ab11b5128dac946b", version: 1 }]).then((lightModel) => {
-                viewer.fitWorld()
-            });
-        })
-    </script>
-</body>
-</html>
+			let options = {
+				elementId: "viewer",
+				modelService: "https://static.graphicstone.com/modelApi",
+				fileService: "https://static.graphicstone.com/fileApi",
+				background: "linear-gradient(#e3fcfc, #f6ffff)",
+			};
+			BimAir.Loader({
+				url: "https://static.graphicstone.com/bimAir",
+			}).then(() => {
+				let viewer = new BimAir.Viewer(options);
+				viewer.loadModels([{ id: "626b4d1ebfe39e58ae7b66a2", version: 1 }]).then(lightModel => {
+					viewer.fitWorld();
+				});
+			});
+		</script>
+	</body>
+</html>

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 CHANGED Viewed

@@ -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//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 CHANGED Viewed

@@ -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/classes/AditObjects.md CHANGED Viewed

@@ -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`[]
@@ -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/BoreholeObjects.md CHANGED Viewed

@@ -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`[]
@@ -635,9 +646,9 @@ ParamModelObject.forEach
 ___
-### onModelLoaded
+### loadModel
-▸ **onModelLoaded**(`data`, `process?`): `Promise`<`void`\>
+▸ **loadModel**(`data`, `process?`): `Promise`<`void`\>
 #### Parameters
@@ -652,7 +663,7 @@ ___
 #### Inherited from
-ParamModelObject.onModelLoaded
+ParamModelObject.loadModel
 ___

package/docs/classes/LightModel.md CHANGED Viewed

@@ -61,8 +61,8 @@
 - [dispose](LightModel.md#dispose)
 - [forEach](LightModel.md#foreach)
 - [getComponent](LightModel.md#getcomponent)
+- [loadModel](LightModel.md#loadmodel)
 - [onModelLoaded](LightModel.md#onmodelloaded)
-- [onModelLoadedFinish](LightModel.md#onmodelloadedfinish)
 - [remove](LightModel.md#remove)
 - [removeChildObject](LightModel.md#removechildobject)
 - [render](LightModel.md#render)
@@ -960,9 +960,9 @@ ___
 ___
-### onModelLoaded
+### loadModel
-▸ **onModelLoaded**(`data`, `process`): `Promise`<`void`\>
+▸ **loadModel**(`data`, `process`): `Promise`<`void`\>
 #### Parameters
@@ -977,13 +977,13 @@ ___
 #### Inherited from
-Longan.LightModel.onModelLoaded
+Longan.LightModel.loadModel
 ___
-### onModelLoadedFinish
+### onModelLoaded
-▸ **onModelLoadedFinish**(`process`): `void`
+▸ **onModelLoaded**(`process`): `void`
 #### Parameters
@@ -997,7 +997,7 @@ ___
 #### Inherited from
-Longan.LightModel.onModelLoadedFinish
+Longan.LightModel.onModelLoaded
 ___

package/docs/classes/Material.md CHANGED Viewed

@@ -126,12 +126,12 @@ ___
 #### Parameters
-| Name | Type | Default value |
-| :------ | :------ | :------ |
-| `r` | `number` | `undefined` |
-| `g` | `number` | `undefined` |
-| `b` | `number` | `undefined` |
-| `a` | `number` | `1` |
+| Name | Type |
+| :------ | :------ |
+| `r` | `number` |
+| `g` | `number` |
+| `b` | `number` |
+| `a?` | `number` |
 #### Returns

package/docs/classes/Viewer.md CHANGED Viewed

@@ -57,6 +57,7 @@
 - [onRButtonDown](Viewer.md#onrbuttondown)
 - [onRButtonDownAndMove](Viewer.md#onrbuttondownandmove)
 - [onRButtonUp](Viewer.md#onrbuttonup)
+- [onStreamToSegmentFinished](Viewer.md#onstreamtosegmentfinished)
 - [onTouchCancel](Viewer.md#ontouchcancel)
 - [onTouchEnd](Viewer.md#ontouchend)
 - [onTouchMove](Viewer.md#ontouchmove)
@@ -69,7 +70,6 @@
 - [process](Viewer.md#process)
 - [propertyManager](Viewer.md#propertymanager)
 - [rButtonDown](Viewer.md#rbuttondown)
-- [rootRenderObject](Viewer.md#rootrenderobject)
 - [sceneCameraChanged](Viewer.md#scenecamerachanged)
 - [sceneCameraChanging](Viewer.md#scenecamerachanging)
 - [structureTreeManager](Viewer.md#structuretreemanager)
@@ -136,6 +136,7 @@
 - [computeObjectCollisions](Viewer.md#computeobjectcollisions)
 - [computeObjectViewBoundingBox](Viewer.md#computeobjectviewboundingbox)
 - [computePerspectiveNearWorldPos](Viewer.md#computeperspectivenearworldpos)
+- [computeRayTest](Viewer.md#computeraytest)
 - [computeViewBoundingBox](Viewer.md#computeviewboundingbox)
 - [convertCoordinate](Viewer.md#convertcoordinate)
 - [convertDCoordinate](Viewer.md#convertdcoordinate)
@@ -614,6 +615,16 @@ LonganViewer.onRButtonUp
 ___
+### onStreamToSegmentFinished
+• **onStreamToSegmentFinished**: `NumberKeyList`<(`key`: `number`) => `void`\>
+#### Inherited from
+LonganViewer.onStreamToSegmentFinished
+___
 ### onTouchCancel
 • **onTouchCancel**: `List`<(`sender`: `Viewer`, `event`: `ViewerEvent`) => `void`\>
@@ -730,16 +741,6 @@ LonganViewer.rButtonDown
 ___
-### rootRenderObject
-• **rootRenderObject**: `RenderObject` = `null`
-#### Inherited from
-LonganViewer.rootRenderObject
-___
 ### sceneCameraChanged
 • **sceneCameraChanged**: `List`<`Function`\>
@@ -1736,7 +1737,7 @@ ___
 ### addAdits
-▸ **addAdits**(`name`, `aditDatas`): `Promise`<[`AditObjects`](AditObjects.md)\>
+▸ **addAdits**(`name`, `aditDatas`, `color?`): `Promise`<[`AditObjects`](AditObjects.md)\>
 添加平硐组模型
@@ -1746,6 +1747,7 @@ ___
 | :------ | :------ |
 | `name` | `any` |
 | `aditDatas` | `Adit`[] |
+| `color?` | `number`[] |
 #### Returns
@@ -1755,7 +1757,7 @@ ___
 ### addBoreholes
-▸ **addBoreholes**(`name`, `holeDatas`): `Promise`<[`BoreholeObjects`](BoreholeObjects.md)\>
+▸ **addBoreholes**(`name`, `holeDatas`, `color?`): `Promise`<[`BoreholeObjects`](BoreholeObjects.md)\>
 添加钻孔组模型
@@ -1765,6 +1767,7 @@ ___
 | :------ | :------ |
 | `name` | `any` |
 | `holeDatas` | `Borehole`[] |
+| `color?` | `number`[] |
 #### Returns
@@ -1933,6 +1936,27 @@ LonganViewer.computePerspectiveNearWorldPos
 ___
+### computeRayTest
+▸ **computeRayTest**(`origin`, `direct`): `any`
+#### Parameters
+| Name | Type |
+| :------ | :------ |
+| `origin` | `ArrayLike`<`number`\> |
+| `direct` | `number`[] |
+#### Returns
+`any`
+#### Inherited from
+LonganViewer.computeRayTest
+___
 ### computeViewBoundingBox
 ▸ **computeViewBoundingBox**(`segment`): `any`
@@ -2405,7 +2429,7 @@ ___
 | Name | Type |
 | :------ | :------ |
-| `obj` | [`TreeNodeObject`](TreeNodeObject.md) \| [`SegmentObject`](SegmentObject.md) |
+| `obj` | [`TreeNodeObject`](TreeNodeObject.md) \| [`SegmentObject`](SegmentObject.md) \| [`SegmentObject`](SegmentObject.md)[] \| [`TreeNodeObject`](TreeNodeObject.md)[] |
 #### Returns