gs-bim-air 3.0.5 → 3.0.6

package/lib/BimAir.common.js

@@ -35659,6 +35659,7 @@ var RenderObjectManager = /** @class */function (_super) {
     _this.targetRenderObjects = new Map();
     // 包围盒的lineMesh映射表
     _this.bbLineMeshMap = new Map();
+    _this.bbVisible = false;
     // 当次切换相机，需要更新的HLOD块数量.
     _this.currentLoadingKey = new gs_longan__WEBPACK_IMPORTED_MODULE_10__.List();
     _this.currentLoaded = -1;
@@ -35748,13 +35749,17 @@ var RenderObjectManager = /** @class */function (_super) {
       console.log("firstMehsLoaded");
       // viewer.options.isShowLoading = false;
     });
+    _this.viewer.onWindowKeyDown.add(function (sender, e) {
+      if (e.uiEvent.key === "o") {
+        _this.bbVisible = !_this.bbVisible;
+        // this.updateDisable = !this.updateDisable;
+        // console.log("disable:", this.updateDisable);
+        _this.bbLineMeshMap.forEach(function (value, key) {
+          value.isVisible = _this.bbVisible;
+        });
+      }
+    });
     return _this;
-    // this.viewer.onWindowKeyDown.add((sender, e) => {
-    //   if ((e.uiEvent as any).key === "o") {
-    //     this.updateDisable = !this.updateDisable;
-    //     console.log("disable:", this.updateDisable);
-    //   }
-    // });
   }
   RenderObjectManager.prototype.dispose = function () {
     this.viewer.camera.onProjectionMatrixChangedObservable.remove(this.projectionChangedObserver);
@@ -36677,6 +36682,7 @@ var RenderObjectManager = /** @class */function (_super) {
             lines: lines,
             colors: lineColors
           }, this.viewer.scene);
+          line.isVisible = this.bbVisible;
           this.bbLineMeshMap.set(node.id, line);
         }
       }
@@ -38105,7 +38111,7 @@ var StyleManager = /** @class */function (_super) {
           }
         }
         if (!material) {
-          console.log("找不到预设的material，需实时生成：", styleKey);
+          // console.log("找不到预设的material，需实时生成：", styleKey);
           // material = materialOrigin;
           if (!materialOrigin) {
             console.log("没有原始材质，跳过：", styleKey);
@@ -38131,24 +38137,46 @@ var StyleManager = /** @class */function (_super) {
           }
           // 有改颜色则重用material，否则克隆material
           if (color.length > 0) {
-            if (material instanceof gs_longan__WEBPACK_IMPORTED_MODULE_14__.PBRMaterial) {
-              material = this_2.viewer.process.assetManager.materials.get(styleKey);
-              if (!material) {
-                material = materialOrigin.clone(styleKey);
-                this_2.viewer.process.assetManager.materials.add(material);
+            if (material) {
+              if (material instanceof gs_longan__WEBPACK_IMPORTED_MODULE_14__.PBRMaterial) {
+                material = this_2.viewer.process.assetManager.materials.get(styleKey);
+                // if (!material) {
+                //   material = materialOrigin.clone(styleKey) as Longan.PBRMaterial;
+                //   this.viewer.process.assetManager.materials.add(material);
+                // }
+                material.albedoColor = new gs_longan__WEBPACK_IMPORTED_MODULE_14__.Color3(color[0] / 255, color[1] / 255, color[2] / 255);
+                material.customAlbedoFlag = true;
+                material.metallic = 0.5;
+                material.roughness = 0.5;
+              } else {
+                material = this_2.viewer.process.assetManager.materials.get(styleKey);
+                // if (!material) {
+                //   material = materialOrigin.clone(styleKey) as Longan.StandardMaterial;
+                //   this.viewer.process.assetManager.materials.add(material);
+                // }
+                material.diffuseColor = new gs_longan__WEBPACK_IMPORTED_MODULE_14__.Color3(color[0] / 255, color[1] / 255, color[2] / 255);
+                material.customDiffuseFlag = true;
               }
+            } else {
+              // if (material instanceof Longan.PBRMaterial) {
+              //   material = this.viewer.process.assetManager.materials.get(styleKey) as Longan.PBRMaterial;
+              //   if (!material) {
+              material = materialOrigin.clone(styleKey);
+              this_2.viewer.process.assetManager.materials.add(material);
+              // }
               material.albedoColor = new gs_longan__WEBPACK_IMPORTED_MODULE_14__.Color3(color[0] / 255, color[1] / 255, color[2] / 255);
               material.customAlbedoFlag = true;
               material.metallic = 0.5;
               material.roughness = 0.5;
-            } else {
-              material = this_2.viewer.process.assetManager.materials.get(styleKey);
-              if (!material) {
-                material = materialOrigin.clone(styleKey);
-                this_2.viewer.process.assetManager.materials.add(material);
-              }
-              material.diffuseColor = new gs_longan__WEBPACK_IMPORTED_MODULE_14__.Color3(color[0] / 255, color[1] / 255, color[2] / 255);
-              material.customDiffuseFlag = true;
+              // } else {
+              //   material = this.viewer.process.assetManager.materials.get(styleKey) as Longan.StandardMaterial;
+              //   if (!material) {
+              //     material = materialOrigin.clone(styleKey) as Longan.StandardMaterial;
+              //     this.viewer.process.assetManager.materials.add(material);
+              //   }
+              //   material.diffuseColor = new Longan.Color3(color[0] / 255, color[1] / 255, color[2] / 255);
+              //   material.customDiffuseFlag = true;
+              // }
             }
           } else {
             if (styleConfig.isKeepSeparate) {
@@ -440606,7 +440634,7 @@ var Utility = /** @class */function () {
   // 输出时间戳
   Utility.DebugConsole = false;
   // 绘制Mesh包围盒
-  Utility.DebugBB = false;
+  Utility.DebugBB = true;
   return Utility;
 }();
 
@@ -532455,7 +532483,7 @@ var Water = /** @class */function (_super) {
 }(longan_src.RenderLivingObject);
 
 ;// CONCATENATED MODULE: ./packages/bimAir/package.json
-var package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"gs-bim-air","rE":"3.0.5"}');
+var package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"gs-bim-air","rE":"3.0.6"}');
 // EXTERNAL MODULE: ./packages/bimAirCore/src/gsDevFx/registerType.ts + 12 modules
 var registerType = __webpack_require__(13089);
 ;// CONCATENATED MODULE: ./packages/bimAirCore/src/gsDevFx/operators/cameraTouch.ts