npm - gs-bim-air - Versions diffs - 2.0.0-beta.3 → 2.0.0-beta.7 - Mend

gs-bim-air 2.0.0-beta.3 → 2.0.0-beta.7

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

package/README.md CHANGED Viewed

@@ -1,5 +1,24 @@
 ## 更新日志
+### 2.0.0-beta.7
+> 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
+>
+> Longan 更新 v2.0.0-beta.3
+- fix: 修复点击 RenderObject 浮起不起效的 bug
+- fix: 修复多 viewer 下多线程加载无法显示模型
+### 2.0.0-beta.4
+- fix: 碰撞结束后初始化碰撞进度
+- fix: 修复漫游工具栏被销毁后命令出现异常
+- fix: 修复多选没有选中对象报错问题
+- fix: 修复六面体剖切和 style 颜色重叠的问题
+- fix: 修复剖切盒没有 UpdateCameraNearFar 的问题
+- fix: 修复通过样式修改的构件颜色与修改构件颜色 API 设置的颜色的在 lockLevel 相同时的颜色重叠问题，现在他们的 lockFaceLevel 不相同.
+- fix: 取消路径绘制 point 和 target 的球体
 ### 2.0.0-beta.3
 > 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
@@ -12,9 +31,14 @@
 > 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
-- 添加 normals，texcoords，tangents，colors，borders 的预计算支持；
-- 添加自定义 vbo 支持；
-- 优化绘制效率；
+- fix: 修复多选没有选中对象报错问题
+- fix: 修复六面体剖切和 style 颜色重叠的问题
+- fix: 修复剖切盒没有 UpdateCameraNearFar 的问题
+- fix: 修复通过样式修改的构件颜色与修改构件颜色 API 设置的颜色的在 lockLevel 相同时的颜色重叠问题，现在他们的 lockFaceLevel 不相同
+- fix: 取消路径绘制 point 和 target 的球体
+- fix: 修复漫游工具栏被销毁后命令出现异常
+- fix: 修复材质管理器
+- fix: 修改各种效果使用的 RO 为 BimAir 的 RO，修复添加效果后加载模型的情况下结构树消失
 ### 1.6.1-beta.6

package/demo/assets/demo.css ADDED Viewed

@@ -0,0 +1,28 @@
+body {
+  margin: 0;
+  padding: 0;
+  height: 100vh;
+}
+#app {
+  height: 100vh;
+  position: relative;
+}
+button {
+  margin: 20px 20px 20px 20px;
+  width: 180px;
+  height: 40px;
+  border-radius: 3px;
+  border: none;
+  background: #0066ffe4;
+  color: #ffffff;
+  outline: none;
+}
+.button-group {
+  position: absolute;
+  z-index: 100;
+  top: 5px;
+  left: 70px;
+}

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

@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>修改颜色</title>
+    <!-- demo的样式 -->
+    <link rel="stylesheet" href="../assets/demo.css" />
+    <link
+      rel="stylesheet"
+      href="https://static.belife-bim.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;
+      }
+      button {
+        margin: 20px 20px 20px 20px;
+        width: 120px;
+        height: 40px;
+        border-radius: 3px;
+        border: none;
+        background: #006fe4;
+        color: #ffffff;
+        outline: none;
+      }
+      .button-group {
+        position: absolute;
+        z-index: 100;
+        top: 5px;
+        left: 70px;
+      }
+    </style>
+    <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>
+    <script type="text/javascript">
+      new Vue({
+        el: "#app",
+      });
+      let options = {
+        // viewerType: "model",
+        elementId: "viewer",
+        id: "6253e9d6b0545a0a6e49bf85",
+        modelService: "https://static.graphicstone.com/modelApi",
+        fileService: "https://static.graphicstone.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";
+      let objectID1 = "QMD+M+4G+HYD+XDRA01+EL002";
+      BimAir.Loader({ url: "https://static.graphicstone.com/bimAir" }).then(
+        () => {
+          viewer = new BimAir.Viewer(options);
+          this.viewer = viewer;
+          this.viewer.loadModels([id, model1]).then((lightModels) => {
+            this.lightModels = lightModels;
+            this.viewer.fitWorld();
+          });
+        }
+      );
+      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>
+</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,160 +1,160 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <meta charset="UTF-8">
+  <head>
+    <meta charset="UTF-8" />
     <title>动画播放</title>
-    <link rel="stylesheet" href="https://static.graphicstone.com/bimAir/BimAir.css">
+    <!-- demo的样式 -->
+    <link rel="stylesheet" href="../assets/demo.css" />
+    <link
+      rel="stylesheet"
+      href="https://static.belife-bim.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>
-    </link>
+  </head>
-</head>
-<body>
+  <body>
     <style>
-        body {
-            margin: 0;
-            padding: 0;
-            height: 100vh;
-        }
-        #app {
-            height: 100vh;
-            position: relative;
-        }
-        button {
-            margin: 20px 20px 20px 20px;
-            width: 120px;
-            height: 40px;
-            border-radius: 3px;
-            border: none;
-            background: #006fe4;
-            color: #FFFFFF;
-            outline: none;
-        }
-        .button-group {
-            position: absolute;
-            z-index: 100;
-            top: 5px;
-            left: 70px;
-        }
+      body {
+        margin: 0;
+        padding: 0;
+        height: 100vh;
+      }
+      #app {
+        height: 100vh;
+        position: relative;
+      }
+      button {
+        margin: 20px 20px 20px 20px;
+        width: 120px;
+        height: 40px;
+        border-radius: 3px;
+        border: none;
+        background: #006fe4;
+        color: #ffffff;
+        outline: none;
+      }
+      .button-group {
+        position: absolute;
+        z-index: 100;
+        top: 5px;
+        left: 70px;
+      }
     </style>
     <div id="app">
-        <!-- <div id="viewer">
+      <!-- <div id="viewer">
         </div> -->
-        <div class="button-group">
-            <button onclick="setScene()">设置视角</button>
-            <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 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>
     <script type="text/javascript">
-        new Vue({
-            el: '#app',
-        });
-        let options = {
-            // viewerType: "model",
-            elementId: "viewer",
-            id: "6253e9d6b0545a0a6e49bf85",
-            modelService: "https://static.graphicstone.com/modelApi",
-            fileService: "https://static.graphicstone.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";
-        BimAir.Loader({ url: "https://static.graphicstone.com/bimAir" }).then(() => {
-            viewer = new BimAir.Viewer(options);
-            this.viewer = viewer;
-            this.viewer.loadModels([id, model1]).then((lightModels) => {
-                this.lightModels = lightModels;
-                this.viewer.fitWorld();
-            });
-        })
-        function setScene() {
+      new Vue({
+        el: "#app",
+      });
+      let options = {
+        // viewerType: "model",
+        elementId: "viewer",
+        id: "6253e9d6b0545a0a6e49bf85",
+        modelService: "https://static.graphicstone.com/modelApi",
+        fileService: "https://static.graphicstone.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";
+      BimAir.Loader({ url: "https://static.graphicstone.com/bimAir" }).then(
+        () => {
+          viewer = new BimAir.Viewer(options);
+          this.viewer = viewer;
+          this.viewer.loadModels([id, 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.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 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() {
-            let palyingPercent = this.viewer.process.animationManager.pauseAnime(this.animation);
-        }
-        function continueAnimation() {
-            this.viewer.process.animationManager.run([this.animation]);
-        }
-        function stopAnimation() {
-            this.viewer.process.animationManager.stopAnime(this.animation, true);
-        }
-        function restartAnimation() {
-            this.viewer.process.animationManager.restartAnime(this.animation, true);
-        }
+      );
+      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 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() {
+        let palyingPercent = this.viewer.process.animationManager.pauseAnime(
+          this.animation
+        );
+      }
+      function continueAnimation() {
+        this.viewer.process.animationManager.run([this.animation]);
+      }
+      function stopAnimation() {
+        this.viewer.process.animationManager.stopAnime(this.animation, true);
+      }
+      function restartAnimation() {
+        this.viewer.process.animationManager.restartAnime(this.animation, true);
+      }
     </script>
-</body>
-</html>
+  </body>
+</html>