npm - gs-bim-air - Versions diffs - 1.6.1-beta.56 → 1.6.1-beta.57 - Mend

gs-bim-air 1.6.1-beta.56 → 1.6.1-beta.57

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

package/README.md CHANGED Viewed

@@ -1,5 +1,20 @@
 ## 更新日志
+### 1.6.1-beta.57
+> Longan 更新为 v1.6.1-beta.25
+- fix: 修复剖切后模型没更新
+- fix: 隐藏结构树上的天空盒节点
+- fix: 修复元素剖切删除 viewPointStateObject 出错问题
+- fix: 取消面积测量的几何不封闭判断
+---
+- feat: 添加 esc 取消选中状态
+- feat: setImageByFile 添加回调
+- feat: 添加绘制信息功能，可显示页面帧率
 ### 1.6.1-beta.56
 - fix: segmentObject 的 size 只计算 TriangularShell
@@ -15,7 +30,7 @@
 - fix: 修复基本信息错乱问题
-### 1.6.1-beta.53p
+### 1.6.1-beta.53
 - fix: 修改体积测量逻辑
 - fix: 修复切换模型后无法加载模型问题

package/demo//344/272/213/344/273/266/346/223/215/344/275/234//344/277/256/346/224/271/351/242/234/350/211/262.html CHANGED Viewed

@@ -1,95 +1,100 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>修改颜色</title>
-    <!-- demo的样式 -->
-    <link rel="stylesheet" href="https://static.belife-bim.com/demo.css" />
-    <link
-      rel="stylesheet"
-      href="https://static.belife-bim.com/bimAir/BimAir.css"
-    />
-    <script src="https://static.belife-bim.com/vue.min.js"></script>
-    <script src="https://static.belife-bim.com/bimAir/BimAir.umd.min.js"></script>
-  </head>
+<head>
+  <meta charset="UTF-8" />
+  <title>修改颜色</title>
+  <!-- demo的样式 -->
+  <link rel="stylesheet" href="https://static.belife-bim.com/demo.css" />
+  <link
+          rel="stylesheet"
+          href="https://static.belife-bim.com/bimAir/BimAir.css"
+  />
+  <script src="https://static.belife-bim.com/vue.min.js"></script>
+  <script src="https://static.belife-bim.com/bimAir/BimAir.umd.min.js"></script>
+</head>
-  <body>
-    <div id="app">
-      <!-- <div id="viewer">
-        </div> -->
-      <div class="button-group">
-        <button onclick="setScene()">设置视角</button>
-        <button onclick="setColor()">设置颜色</button>
-        <button onclick="cancelColor()">取消颜色</button>
-      </div>
-      <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
-    </div>
+<body>
+<div id="app">
+  <!-- <div id="viewer">
+    </div> -->
+  <div class="button-group">
+    <button onclick="setScene()">设置视角</button>
+    <button onclick="setColor()" id="btn">设置颜色</button>
+  </div>
+  <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 colorTag=false;
+  let options = {
+    // viewerType: "model",
+    elementId: "viewer",
-      let options = {
-        // viewerType: "model",
-        elementId: "viewer",
+    modelService: "https://static.belife-bim.com/modelApi",
+    fileService: "https://static.belife-bim.com/fileApi",
+  };
+  //设置相机参数
+  let aboutCamera = {
+    position: [380038.099, 39326.678, 3079.396],
+    "target": [379881.182, 39790.017, 2818.129],
+    up: [-0.141, 0.450, 0.882],
+    field: 554.132,
+  };
+  let viewer;
+  let lightModels;
+  let model1 = "632273cfbc278049a0898a12";
+  let objectID1 = "QMD+M+4G+HYD+XDRA01+EL002";
-        modelService: "https://static.belife-bim.com/modelApi",
-        fileService: "https://static.belife-bim.com/fileApi",
-      };
-      let aboutCamera = {
-        position: [379720.251, 39004.605, 3324.137],
-        target: [379993.054, 39422.028, 3082.479],
-        up: [-0.453, -0.206, -0.867],
-        field: 554.132,
-      };
-      let viewer;
-      let lightModels;
-      let roamTime = 8;
-      let animation;
-      let id = "632273cbbc278049a0898a0e";
-      let model1 = "632273cfbc278049a0898a12";
+  BimAir.Loader({ url: "https://static.belife-bim.com/bimAir" }).then(
+          () => {
+            viewer = new BimAir.Viewer(options);
+            this.viewer = viewer;
+            this.viewer.loadModels( [model1]).then((lightModels) => {
+              this.lightModels = lightModels;
+              this.viewer.fitWorld();
+            });
+          }
+  );
-      let objectID1 = "QMD+M+4G+HYD+XDRA01+EL002";
+  function setScene() {
+    this.viewer.camera.position = aboutCamera.position;
+    this.viewer.camera.target = aboutCamera.target;
+    this.viewer.camera.up = aboutCamera.up;
+    this.viewer.camera.setField(aboutCamera.field, aboutCamera.field);
+    this.viewer.updateDisplay();
+  }
-      BimAir.Loader({ url: "https://static.belife-bim.com/bimAir" }).then(
-        () => {
-          viewer = new BimAir.Viewer(options);
-          this.viewer = viewer;
-          this.viewer.loadModels([id, model1]).then((lightModels) => {
-            this.lightModels = lightModels;
-            this.viewer.fitWorld();
-          });
-        }
-      );
+  let tag=false;
+  function setColor() {
+    if(tag==false){
+      let material1 = new BimAir.Material(this.viewer, "test");
+      material1.setColor(127, 250, 0, 1);
+      let material2 = new BimAir.Material(this.viewer, "test2");
+      material2.setColor(127, 0, 0, 1);
+      //this.lightModels[0].setAllComponentsVisible(false);
+      let objcet1 = this.lightModels[0].segmentObject;
+      objcet1.setMaterial(material1);
+      this.lightModels[0].setComponentsColor([objectID1], material2);
+      this.viewer.updateDisplay();
+      var obj=document.getElementById("btn");
+      obj.innerText="恢复颜色";
+      tag=true;
+    }
+    else{
+      cancelColor();
+      var obj=document.getElementById("btn");
+      obj.innerText="修改颜色";
+      tag=false;
+    }
+  }
-      function setScene() {
-        this.viewer.camera.position = aboutCamera.position;
-        this.viewer.camera.target = aboutCamera.target;
-        this.viewer.camera.up = aboutCamera.up;
-        this.viewer.camera.setField(aboutCamera.field, aboutCamera.field);
-        this.viewer.updateDisplay();
-      }
-      function setColor() {
-        let material1 = new BimAir.Material(this.viewer, "test");
-        material1.setColor(127, 250, 0, 1);
-        let material2 = new BimAir.Material(this.viewer, "test2");
-        material2.setColor(127, 0, 0, 1);
-        this.lightModels[0].setAllComponentsVisible(false);
-        let objcet1 = this.lightModels[1].segmentObject;
-        objcet1.setMaterial(material1);
-        this.lightModels[1].setComponentsColor([objectID1], material2);
-        this.viewer.updateDisplay();
-      }
-      function cancelColor() {
-        this.lightModels[1].setAllComponentsColor(null);
-        this.viewer.updateDisplay();
-      }
-    </script>
-  </body>
+  function cancelColor() {
+    this.lightModels[0].setAllComponentsColor(null);
+    this.viewer.updateDisplay();
+  }
+</script>
+</body>
 </html>

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

@@ -1,130 +1,154 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>动画播放</title>
+<head>
+  <meta charset="UTF-8" />
+  <title>动画播放</title>
-    <!-- demo的样式 -->
-    <link rel="stylesheet" href="https://static.belife-bim.com/demo.css" />
-    <link
-      rel="stylesheet"
-      href="https://static.belife-bim.com/bimAir/BimAir.css"
-    />
-    <script src="https://static.belife-bim.com/vue.min.js"></script>
-    <script src="https://static.belife-bim.com/bimAir/BimAir.umd.min.js"></script>
-  </head>
+  <!-- demo的样式 -->
+  <link rel="stylesheet" href="https://static.belife-bim.com/demo.css" />
+  <link
+          rel="stylesheet"
+          href="https://static.belife-bim.com/bimAir/BimAir.css"
+  />
+  <script src="https://static.belife-bim.com/vue.min.js"></script>
+  <script src="https://static.belife-bim.com/bimAir/BimAir.umd.min.js"></script>
+</head>
-  <body>
-    <div id="app">
-      <!-- <div id="viewer">
-        </div> -->
-      <div class="button-group">
-        <button onclick="getAnimation()">播放动画</button>
-        <button onclick="pauseAnimation()">暂停动画</button>
-        <button onclick="continueAnimation()">继续动画</button>
-        <button onclick="stopAnimation()">结束动画</button>
-        <button onclick="restartAnimation()">重启动画</button>
-      </div>
-      <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
-    </div>
+<body>
+<div id="app">
+  <!-- <div id="viewer">
+    </div> -->
+  <div class="button-group">
+    <button onclick="getAnimation()" id="btn">播放动画</button>
+    <button onclick="stopAnimation()" id="btn2">结束动画</button>
+  </div>
+  <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 = {
-        // viewerType: "model",
-        elementId: "viewer",
+  let options = {
+    // viewerType: "model",
+    elementId: "viewer",
-        modelService: "https://static.belife-bim.com/modelApi",
-        fileService: "https://static.belife-bim.com/fileApi",
-      };
-      let aboutCamera = {
-        position: new Float64Array([379633.85, 39084.71, 3129.943]),
-        target: new Float64Array([380036.613, 39459.857, 3066.088]),
-        up: new Float64Array([0.084, 0.079, 0.993]),
-        field: 554.132,
-      };
-      let viewer;
-      let lightModels;
-      let roamTime = 8;
-      let animation;
-      let id = "632273cbbc278049a0898a0e";
-      let model1 = "632273cfbc278049a0898a12";
-      let objectID1 = "QMD+M+4G+HYD+XDRA01+EL002";
+    modelService: "https://static.belife-bim.com/modelApi",
+    fileService: "https://static.belife-bim.com/fileApi",
+  };
+  let aboutCamera = {
+    position: [380037.8171853031, 39324.16306542623, 3080.2530399562834],
+    target: [379881.182, 39790.017, 2818.129],
+    up: [-0.141, 0.450, 0.882],
+    field: 5.132,
+  };
+  let viewer;
+  let lightModels;
+  let roamTime = 8;
+  let animation;
+  //let id = "632273cbbc278049a0898a0e";
+  let model1 = "632273cfbc278049a0898a12";
+  let objectID1 = "QMD+M+4G+HYD+XDRA01+EL002";
-      BimAir.Loader({ url: "https://static.belife-bim.com/bimAir" }).then(
-        () => {
-          viewer = new BimAir.Viewer(options);
-          this.viewer = viewer;
-          this.viewer.loadModels([id, model1]).then((lightModels) => {
-            this.lightModels = lightModels;
+  BimAir.Loader({ url: "https://static.belife-bim.com/bimAir" }).then(
+          () => {
+            viewer = new BimAir.Viewer(options);
+            this.viewer = viewer;
+            this.viewer.loadModels([model1]).then((lightModels) => {
+              this.lightModels = lightModels;
+              this.viewer.camera.position = aboutCamera.position;
+              this.viewer.camera.target = aboutCamera.target;
+              this.viewer.camera.up = aboutCamera.up;
+              this.viewer.camera.setField(aboutCamera.field, aboutCamera.field);
+              this.viewer.fitWorld();
+            });
+          }
+  );
-            this.viewer.camera.position = aboutCamera.position;
-            this.viewer.camera.target = aboutCamera.target;
-            this.viewer.camera.up = aboutCamera.up;
-            this.viewer.camera.setField(aboutCamera.field, aboutCamera.field);
-            this.viewer.fitWorld();
-          });
-        }
-      );
-      function getAnimation() {
-        this.lightModels[0].setAllComponentsIsolation();
-        let moveSegmentObject = this.lightModels[1].getComponent(objectID1);
-        let bb = this.viewer.computeViewBoundingBox(moveSegmentObject.segment);
-        let center = new Float64Array([
-          (bb[0] + bb[3]) / 2,
-          (bb[1] + bb[4]) / 2,
-          (bb[2] + bb[5]) / 2,
-        ]);
-        let p0 = new BimAir.Longan.Point();
-        p0[0] = center[0];
-        p0[1] = center[1];
-        p0[2] = center[2] + 60;
+  let tag=false;
+  function getAnimation() {
+    var obj2=document.getElementById("btn");
+    var obj=document.getElementById("btn2")
+    //obj.innerText="恢复颜色";
+    if(obj2.innerText=="播放动画"){
+      this.lightModels[0].setAllComponentsIsolation();
+      let moveSegmentObject = this.lightModels[0].getComponent(objectID1);
+      let bb = this.viewer.computeViewBoundingBox(moveSegmentObject.segment);
+      let center = new Float64Array([
+        (bb[0] + bb[3]) / 2,
+        (bb[1] + bb[4]) / 2,
+        (bb[2] + bb[5]) / 2,
+      ]);
+      let p0 = new BimAir.Longan.Point();
+      p0[0] = center[0];
+      p0[1] = center[1];
+      p0[2] = center[2] + 10;
-        let p1 = new BimAir.Longan.Point();
-        p1[0] = center[0];
-        p1[1] = center[1];
-        p1[2] = center[2];
-        let points = new Array();
-        points.push(p0);
-        points.push(p1);
+      let p1 = new BimAir.Longan.Point();
+      p1[0] = center[0];
+      p1[1] = center[1];
+      p1[2] = center[2];
+      let points = new Array();
+      points.push(p0);
+      points.push(p1);
-        // this.viewer.process.animationManager.drawStraight(this.viewer, points);
-        this.animation =
-          this.viewer.process.animationManager.objectRoamWithoutRotate(
-            this.viewer,
-            moveSegmentObject,
-            points,
-            roamTime,
-            0,
-            () => {
-              console.log("animation finish");
-            }
-          );
-        this.viewer.process.animationManager.run([this.animation]);
-        // return animationId;
-      }
-      function pauseAnimation() {
+      // this.viewer.process.animationManager.drawStraight(this.viewer, points);
+      this.animation =
+              this.viewer.process.animationManager.objectRoamWithoutRotate(
+                      this.viewer,
+                      moveSegmentObject,
+                      points,
+                      roamTime,
+                      0,
+                      () => {
+                        obj.innerText="播放动画";
+                        console.log("animation finish");
+                      }
+              );
+      this.viewer.process.animationManager.run([this.animation]);
+      obj2.innerText="暂停动画";
+      obj.innerText="结束动画";
+    }
+    else{
+      if(obj2.innerText=="暂停动画"){
         let palyingPercent = this.viewer.process.animationManager.pauseAnime(
-          this.animation
+                this.animation
         );
+        obj2.innerText="继续动画";
       }
+      else{
-      function continueAnimation() {
         this.viewer.process.animationManager.run([this.animation]);
+        obj2.innerText="暂停动画";
       }
+    }
+    // return animationId;
+  }
+  function  getPose(){
+    console.log("position",this.viewer.camera.position);
+    console.log("target",this.viewer.camera.target);
+    console.log("up",this.viewer.camera.up);
+  }
-      function stopAnimation() {
-        this.viewer.process.animationManager.stopAnime(this.animation, true);
-      }
+  function stopAnimation() {
+    var obj=document.getElementById("btn2");
+    var obj2=document.getElementById("btn")
+    if(obj.innerText=="结束动画"){
+      this.viewer.process.animationManager.stopAnime(this.animation, true);
+      obj.innerText="重启动画";
+      obj2.innerText="播放动画";
+    }
+    else{
+      this.viewer.process.animationManager.restartAnime(this.animation, true);
+      obj.innerText="结束动画";
+      obj2.innerText="暂停动画";
+    }
-      function restartAnimation() {
-        this.viewer.process.animationManager.restartAnime(this.animation, true);
-      }
-    </script>
-  </body>
+  }
+</script>
+</body>
 </html>