gs-bim-air 0.1.3-0.23 → 0.1.3-0.25

package/READMEBETA.md

@@ -254,3 +254,101 @@ viewer.camera.projection = BimAir.Longan.ProjectionType.Perspective; //透视投
 ```js
 viewer.getComponents(componentId);
 ```
+
+### 0.0.30.28
+
+- 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+- 增加添加视点的接口 [viewer.panelManager.viewPointPanel.addViewPoint](docs/classes/ViewPointPanel.md#addViewPoint)
+- 增加通过 Id 获取视点的接口 [viewer.panelManager.viewPointPanel.getViewPointById](docs/classes/ViewPointPanel.md#getViewPointById)
+- 增加通过 Id 删除视点的接口 [viewer.panelManager.viewPointPanel.deleteViewPointById](docs/classes/ViewPointPanel.md#deleteViewPointById)
+- 增加通过 Id 恢复视点的接口 [viewer.panelManager.viewPointPanel.restoreViewPointById](docs/classes/ViewPointPanel.md#restoreViewPointById)
+
+### 0.0.30.29
+
+- 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+- 修复 noShareArrayBuffer 版本的 wasm 无法显示模型
+- 修复接口恢复视点时事件被批注功能的事件覆盖的问题
+- 添加路径漫游相关接口 [viewer.animationManager.pathRoam](docs/classes/PathRoam.md)，基本用法如下：
+
+```js
+// 获取当前Camera信息
+let camera = viewer.animationManager.pathRoam.getRoamPoint();
+console.log("camera", camera);
+
+let points = [
+    [
+       380416.0671187355,
+       38786.28087566431,
+       4155.782292435952,
+    ]
+    [ 380730.74617450393,
+      38801.12997364584,
+       4404.750407980944,
+    ]
+  ];
+let targets = [
+    [
+      379975.34973484656,
+      39356.55973798728,
+      2473.4870208851316,
+    ],
+    [
+      380290.028790615,
+      39371.4088359688,
+      2722.455136430124,
+    ]
+  ];
+  // 创建动画
+  let animationId = viewer.animationManager.pathRoam.addRoamPathAnime(
+    10,
+    points,
+    targets
+  );
+  // 播放动画
+  viewer.animationManager.pathRoam.run([animationId]);
+
+  setTimeout(() => {
+    // 暂停播放
+    viewer.animationManager.pathRoam.pauseAnime(animationId);
+  }, 3000);
+
+  setTimeout(() => {
+    // 继续播放
+    viewer.animationManager.pathRoam.run([animationId]);
+  }, 6000);
+```
+
+### 0.0.30.30
+
+- 修复碰撞功能添加碰撞的弹框结构树消失问题
+
+### 0.0.30.31
+
+- 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+- 修复 noShareArrayBuffer 的内核模型无法显示的问题
+
+### 0.0.30.32
+
+- 添加漫游工具栏按钮相关配置，如下：
+
+```js
+let options = {
+  components: {
+    roamToolbar: {
+      pathRoam: {
+        // 隐藏路径漫游按钮
+        visible: false,
+      },
+      // 在漫游工具栏拓展按钮
+      buttons: [
+        {
+          title: "第一人称漫游",
+          clickFun: () => {},
+          active: false,
+          icon: "iconfont icon-shuxing",
+        },
+      ],
+    },
+  },
+};
+```

package/READMEBETA2.md

@@ -159,3 +159,27 @@ this.viewer.panelManager.collisionPanel
 - 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
 - 修复加载本地模型结构树上不会出现节点问题
 - 修复 viewer.dispose 后再次加载模型会出现贴图丢失问题
+
+### 0.1.30.24
+
+- 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+- 在写入缓存时与模型写入冲突导致模型丢失的问题
+- 添加面板和命令显示隐藏的回调函数，如结构树面板设置：
+
+```js
+viewer.panelManager.structureTree.toggleCallback = (visible) => {
+  console.log("visible", visible);
+};
+```
+
+### 0.1.30.25
+
+- 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹。
+- 修复碰撞功能添加碰撞的弹框结构树消失问题
+- 解决模型碰撞卡死问题
+- 解决加载模型时剖切出错的问题
+- 修复颜色设置报错问题
+- 新增固定帧绘制算法，提升模型浏览的流畅性。
+- 修改底层逻辑将线程等待改成线程杀死，加快模型加载速度。
+- 将法线计算移动到子线程中去。
+- 后台与前端同时适配模型的几何合并功能。

package/demo//344/272/213/344/273/266/346/223/215/344/275/234//350/247/206/347/202/271/347/256/241/347/220/206.html

@@ -50,8 +50,6 @@
             <button onclick="addView1()">添加视点1</button>
             <button onclick="addView2()">添加视点2</button>
             <button onclick="deleteView()">删除视点</button>
-            <!-- <button onclick="isExistWall()">判断是否存在围栏</button>
-            <button onclick="isInside()">判断点是否在围栏内</button> -->
         </div>
         <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
     </div>

package/demo//344/272/213/344/273/266/346/223/215/344/275/234//351/242/234/350/211/262/345/222/214/345/212/250/347/224/273/346/214/211/351/222/256.html

@@ -52,8 +52,6 @@
             <button onclick="stopAnimation()">结束动画</button>
             <button onclick="restartAnimation()">重启动画</button>
 
-            <!-- <button onclick="isExistWall()">判断是否存在围栏</button>
-            <button onclick="isInside()">判断点是否在围栏内</button> -->
         </div>
         <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
 

package/demo//346/250/241/345/236/213/346/223/215/344/275/234//350/256/276/347/275/256/347/233/270/346/234/272/347/212/266/346/200/201-/350/216/267/345/217/226/344/275/215/347/275/256/343/200/201/346/201/242/345/244/215/344/275/215/347/275/256.html

@@ -47,8 +47,6 @@
         <div class="button-group">
 		    <button onclick="funGetView()">获取相机位置</button>
 		    <button onclick="funRtnView()">恢复相机位置</button>
-           
-			
         </div>
         <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
 

package/demo//346/250/241/345/236/213/346/225/210/346/236/234//345/210/233/345/273/272/346/211/253/347/225/245.html

@@ -1,91 +1,121 @@
 <!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",
-			});
-			let options = {
-				// viewerType: "model",
-				elementId: "viewer",
+    <script type="text/javascript">
+      new Vue({
+        el: "#app",
+      });
+      let options = {
+        // viewerType: "model",
+        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(["626b4d1ebfe39e58ae7b66a2"]).then(lightModels => {
-					let points = [-2, 3, 0, -2, 0, 0, -2, 0, 0, 2, 0, 0, 2, 0, 0, 2, 3, 0];
-					let circle_points = BimAir.Longan.GeometryOperators.createRingPoints(
-						new Float32Array([0, 3, 0]),
-						new Float32Array([1, 0, 0]),
-						new Float32Array([0, 1, 0]),
-						new Float32Array([0, Math.PI / 4, Math.PI / 2, (Math.PI * 3) / 4, Math.PI]),
-						2
-					);
-					for (let i = 0; i < circle_points.length; i++) {
-						points.push(circle_points[i]);
-					}
+        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(["626b4d1ebfe39e58ae7b66a2"])
+            .then((lightModels) => {
+              let points = [
+                -2, 3, 0, -2, 0, 0, -2, 0, 0, 2, 0, 0, 2, 0, 0, 2, 3, 0,
+              ];
+              let circle_points =
+                BimAir.Longan.GeometryOperators.createRingPoints(
+                  new Float32Array([0, 3, 0]),
+                  new Float32Array([1, 0, 0]),
+                  new Float32Array([0, 1, 0]),
+                  new Float32Array([
+                    0,
+                    Math.PI / 4,
+                    Math.PI / 2,
+                    (Math.PI * 3) / 4,
+                    Math.PI,
+                  ]),
+                  2
+                );
+              for (let i = 0; i < circle_points.length; i++) {
+                points.push(circle_points[i]);
+              }
 
-					let indexes = [points.length / 3];
-					for (let i = 0; i < points.length / 3; i++) {
-						indexes.push(i);
-					}
-					// 重复点显示转折
-					let inner_points = [1.8, 3, 0, 1.8, 0.2, 0, 1.8, 0.2, 0, -1.8, 0.2, 0, -1.8, 0.2, 0, -1.8, 3, 0];
-					circle_points = BimAir.Longan.GeometryOperators.createRingPoints(
-						new Float32Array([0, 3, 0]),
-						new Float32Array([1, 0, 0]),
-						new Float32Array([0, 1, 0]),
-						new Float32Array([Math.PI, (Math.PI * 3) / 4, Math.PI / 2, Math.PI / 4, 0]),
-						1.8
-					);
-					for (let i = 0; i < circle_points.length; i++) {
-						inner_points.push(circle_points[i]);
-					}
+              let indexes = [points.length / 3];
+              for (let i = 0; i < points.length / 3; i++) {
+                indexes.push(i);
+              }
+              // 重复点显示转折
+              let inner_points = [
+                1.8, 3, 0, 1.8, 0.2, 0, 1.8, 0.2, 0, -1.8, 0.2, 0, -1.8, 0.2, 0,
+                -1.8, 3, 0,
+              ];
+              circle_points = BimAir.Longan.GeometryOperators.createRingPoints(
+                new Float32Array([0, 3, 0]),
+                new Float32Array([1, 0, 0]),
+                new Float32Array([0, 1, 0]),
+                new Float32Array([
+                  Math.PI,
+                  (Math.PI * 3) / 4,
+                  Math.PI / 2,
+                  Math.PI / 4,
+                  0,
+                ]),
+                1.8
+              );
+              for (let i = 0; i < circle_points.length; i++) {
+                inner_points.push(circle_points[i]);
+              }
 
-					indexes.push(-inner_points.length / 3);
-					for (let i = 0; i < inner_points.length / 3; i++) {
-						indexes.push(i + points.length / 3);
-					}
+              indexes.push(-inner_points.length / 3);
+              for (let i = 0; i < inner_points.length / 3; i++) {
+                indexes.push(i + points.length / 3);
+              }
 
-					console.log("indexes", indexes);
+              console.log("indexes", indexes);
 
-					points = points.concat(inner_points);
+              points = points.concat(inner_points);
 
-					console.log("points", points);
-					// 重复点显示转折
-					let path = [1, 1, 0, 1, 1, 10, 1, 1, 10, 2, 1, 20];
+              console.log("points", points);
+              // 重复点显示转折
+              let path = [1, 1, 0, 1, 1, 10, 1, 1, 10, 2, 1, 20];
 
-					viewer.utilitySegment.sweepByShell(points, indexes, path, "normal=(0,0,1)");
-					viewer.updateDisplay();
-				});
-			});
-		</script>
-	</body>
+              viewer.utilitySegment.sweepByShell(
+                points,
+                indexes,
+                path,
+                "normal=(0,0,1)"
+              );
+              viewer.updateDisplay();
+            });
+        }
+      );
+    </script>
+  </body>
 </html>

package/demo//346/250/241/345/236/213/346/225/210/346/236/234//345/260/204/347/272/277/346/243/200/346/265/213.html

@@ -0,0 +1,92 @@
+<!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>
+
+  <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>
+
+    <script type="text/javascript">
+      new Vue({
+        el: "#app",
+      });
+      let options = {
+        // viewerType: "model",
+        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("626b4d1ebfe39e58ae7b66a2").then((lightModels) => {
+            viewer.camera.position = [6.01, 23.81, 1.57];
+            viewer.camera.target = [14.54, 15.77, -0.7];
+            viewer.camera.up = [0.13, -0.13, 0.98];
+            viewer.camera.setField(217.112, 217.112);
+            viewer.updateDisplay();
+
+            setTimeout(() => {
+              let rays = [
+                {
+                  pos: new Float32Array([14.03, 16.93, 0.5]),
+                  dir: new Float32Array([0, 1, 0]),
+                },
+                {
+                  pos: new Float32Array([14.03, 16.93, 0.5]),
+                  dir: new Float32Array([1, 0, 0]),
+                },
+                {
+                  pos: new Float32Array([14.03, 16.93, 0.5]),
+                  dir: new Float32Array([0, -1, 0]),
+                },
+                {
+                  pos: new Float32Array([14.03, 16.93, 0.5]),
+                  dir: new Float32Array([-1, 0, 0]),
+                },
+              ];
+
+              for (let i = 0; i < rays.length; i++) {
+                let resultPos = viewer.computeRayTest(rays[i].pos, rays[i].dir);
+                if (resultPos) {
+                  viewer.temporaryObjectManager.addLine(
+                    "线" + i,
+                    "test" + i,
+                    rays[i].pos,
+                    resultPos
+                  );
+
+                  viewer.updateDisplay();
+                }
+              }
+            }, 2000);
+          });
+        }
+      );
+    </script>
+  </body>
+</html>

package/demo//346/250/241/345/236/213/346/225/210/346/236/234//347/253/213/344/275/223/351/224/232/347/202/271.html

@@ -0,0 +1,85 @@
+<!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>
+
+  <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>
+
+    <script type="text/javascript">
+      new Vue({
+        el: "#app",
+      });
+      let options = {
+        // viewerType: "model",
+        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("626b4d1ebfe39e58ae7b66a2").then((lightModels) => {
+            let pos = [
+              11.398058060132435, -1.746637999828935, 23.098180061450208,
+            ];
+            let target = [
+              -14.942065238952637, 19.718231201171875, 4.503608703613281,
+            ];
+            let up = [
+              -0.3721429580358232, 0.30326357350764344, 0.877234759780825,
+            ];
+            let width = 217.1120044528568;
+            viewer.setSceneCamera(pos, target, up, width, width);
+
+            let position = [-14.93, 19.539, 4.802];
+            let size = 1;
+            let speedOfTime = 3;
+            let anchorEffectConfig = new BimAir.Animation.AnchorEffectConfig(
+              viewer,
+              "anchorName1",
+              position,
+              size,
+              speedOfTime
+            );
+            let anchorEffect = new BimAir.Animation.AnchorEffect(
+              anchorEffectConfig
+            );
+            // 创建锚点.
+            anchorEffect.createAnchor().then(() => {
+              console.log("anchor created");
+              // setTimeout(() => {
+              //   // 10秒后删除锚点及其动画.
+              //   anchorEffect.clear(viewer);
+              // }, 10000);
+            });
+          });
+        }
+      );
+    </script>
+  </body>
+</html>

package/demo//346/250/241/345/236/213/346/225/210/346/236/234//351/200/232/350/247/206/345/210/206/346/236/220.html

@@ -0,0 +1,72 @@
+<!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>
+
+  <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>
+
+    <script type="text/javascript">
+      new Vue({
+        el: "#app",
+      });
+      let options = {
+        // viewerType: "model",
+        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("626b4d1ebfe39e58ae7b66a2").then((lightModels) => {
+            setTimeout(() => {
+            let viewPos = new Float32Array([24.65, -8.09, 15]);
+            let targetPos = new Float32Array([
+              -7.06, 18.7, 2.41, 17.03, 23.73, -0.72, -20.01, 9.76, 3.99,
+            ]);
+            let visibleColor = new Float32Array([50, 211, 166]);
+            let invisibleColor = new Float32Array([235, 0, 29]);
+
+            let sightlineAnalysisConfig = new SightlineAnalysisConfig(
+              viewer,
+              viewPos,
+              targetPos,
+              visibleColor,
+              invisibleColor
+            );
+            let sightlineAnalysisEffect = new SightlineAnalysisEffect(
+              sightlineAnalysisConfig
+            );
+          }, 2000);
+
+          });
+        }
+      );
+    </script>
+  </body>
+</html>

package/demo//347/273/223/346/236/204/346/240/221/344/270/216/346/236/204/344/273/266//350/256/276/347/275/256/351/232/224/347/246/273/346/240/267/345/274/217.html

@@ -73,7 +73,6 @@
             field: 554.132,
         };
 
-
         let id = "632273cbbc278049a0898a0e";
         let model1 = "632273cfbc278049a0898a12";   
 
@@ -92,10 +91,8 @@
                 this.viewer.camera.setField(aboutCamera.field, aboutCamera.field);
                 this.viewer.updateDisplay();
             });
-
         })
 
-
         function setIsolationStyle() {
             this.viewer.isolationManager.material.setColor(120, 250, 0, 0,5);
         }
@@ -107,8 +104,6 @@
             this.viewer.updateDisplay();
         }
 
-
-
     </script>
 
 </body>

package/demo//347/273/223/346/236/204/346/240/221/344/270/216/346/236/204/344/273/266//351/232/224/347/246/273/346/214/211/351/222/256.html

@@ -53,8 +53,6 @@
             <button onclick="cancelColor()">取消颜色</button>
             <button onclick="cancelIsolation()">取消隔离</button>
 
-            <!-- <button onclick="isExistWall()">判断是否存在围栏</button>
-            <button onclick="isInside()">判断点是否在围栏内</button> -->
         </div>
         <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
 

package/demo//347/273/223/346/236/204/346/240/221/344/270/216/346/236/204/344/273/266//351/242/234/350/211/262/346/214/211/351/222/256.html

@@ -51,10 +51,6 @@
             <button onclick="setAllColor()">设置模型颜色</button>
             <button onclick="setComponentsColor()">设置构件颜色</button>
             <button onclick="cancelAllColor()">取消颜色</button>
-
-
-            <!-- <button onclick="isExistWall()">判断是否存在围栏</button>
-            <button onclick="isInside()">判断点是否在围栏内</button> -->
         </div>
         <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />