fl-web-component 2.1.1-beta.5 → 2.1.1-beta.7

package/packages/components/com-graphics/index.vue

@@ -213,27 +213,27 @@ export default {
         loadedCount: 0,
         totalCount: 0,
         isPaused: false,
-      },
-      isolateMode: false,
-      sceneBoundingBoxDebugEnabled: false,
-      // collisionObbDebugEnabled: isDebug,
-      collisionObbDebugEnabled: false,
-    };
+      },
+      isolateMode: false,
+      sceneBoundingBoxDebugEnabled: false,
+      // collisionObbDebugEnabled: isDebug,
+      collisionObbDebugEnabled: false,
+    };
+  },
+  watch: {
+    transformEditDisabled(val) {
+      if (val) {
+        this.detachTransformControls();
+      }
+    },
+    sceneBoundingBoxDebugEnabled(val) {
+      if (val) {
+        this.refreshSceneBoundingBoxHelper(true);
+      } else {
+        this.hideSceneBoundingBox();
+      }
+    },
   },
-  watch: {
-    transformEditDisabled(val) {
-      if (val) {
-        this.detachTransformControls();
-      }
-    },
-    sceneBoundingBoxDebugEnabled(val) {
-      if (val) {
-        this.refreshSceneBoundingBoxHelper(true);
-      } else {
-        this.hideSceneBoundingBox();
-      }
-    },
-  },
   beforeCreate() {
     this.spaceUp = true;
     let arr = [
@@ -1513,12 +1513,12 @@ export default {
 
       if (hasValidBox) {
         this.sceneBoundingBox = mergedBox;
-        this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
+        this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
         return this.sceneBoundingBox;
       }
 
       this.sceneBoundingBox = new this.THREE.Box3();
-      this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
+      this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
       return this.sceneBoundingBox;
     },
     upsertIndexedBox(indexMap, modelId, box) {
@@ -4353,7 +4353,7 @@ export default {
           },
           maxBorder,
         });
-        this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
+        this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
       }
       // this.cameraControls.this.camera.far = maxBorder * 10; // 设置相机的远裁剪面
       this.cameraControls.minDistance = maxBorder * 0.2; // 动态设置视角滚轮的距离
@@ -7623,9 +7623,9 @@ export default {
       return true;
     },
 
-    showSceneBoundingBox() {
-      this.sceneBoundingBoxDebugEnabled = true;
-      const shown = this.refreshSceneBoundingBoxHelper(true);
+    showSceneBoundingBox() {
+      this.sceneBoundingBoxDebugEnabled = true;
+      const shown = this.refreshSceneBoundingBoxHelper(true);
       if (!shown) {
         console.warn('sceneBoundingBox 无有效范围，无法绘制调试线框');
         return;
@@ -7647,9 +7647,9 @@ export default {
       });
     },
 
-    hideSceneBoundingBox() {
-      this.sceneBoundingBoxDebugEnabled = false;
-      if (this.sceneBoundingBoxHelper && this.scene) {
+    hideSceneBoundingBox() {
+      this.sceneBoundingBoxDebugEnabled = false;
+      if (this.sceneBoundingBoxHelper && this.scene) {
         this.scene.remove(this.sceneBoundingBoxHelper);
         this.sceneBoundingBoxHelper.geometry && this.sceneBoundingBoxHelper.geometry.dispose();
         if (Array.isArray(this.sceneBoundingBoxHelper.material)) {
@@ -7671,11 +7671,11 @@ export default {
     /**
      * 切换场景包围盒显示状态
      */
-    toggleSceneBoundingBox() {
-      if (this.sceneBoundingBoxDebugEnabled) {
-        this.hideSceneBoundingBox();
-      } else {
-        this.showSceneBoundingBox();
+    toggleSceneBoundingBox() {
+      if (this.sceneBoundingBoxDebugEnabled) {
+        this.hideSceneBoundingBox();
+      } else {
+        this.showSceneBoundingBox();
       }
     },
   },

package/src/utils/instance-parser.js

@@ -1068,10 +1068,10 @@ function draw3Dmodel(
  * @param {String} instanceName - 模型实例的名称
  * @returns {Object} - 包含所有 2D 模型的组对象
  */
-function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, options = {}) {
-  const points = geom.points;
-  const normals = geom.normals;
-  const geometry = new THREE.BufferGeometry();
+function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, options = {}) {
+  const points = geom.points;
+  const normals = geom.normals;
+  const geometry = new THREE.BufferGeometry();
 
   if (points && points.length) {
     const position = new Float32Array(points);
@@ -1082,18 +1082,18 @@ function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, option
     const normal = new Float32Array(normals);
     geometry.setAttribute('normal', new THREE.BufferAttribute(normal, 3));
   }
-
-  const { color, linewidth } = geom.prop;
-  const formatLinewidth = (linewidth < 1 ? linewidth * 50 : linewidth) || 5;
-  const meshLineResolution = options.meshLineResolution || {};
-  const resolutionWidth = meshLineResolution.width || window.innerWidth || 1;
-  const resolutionHeight = meshLineResolution.height || window.innerHeight || 1;
-  const material = new MeshLineMaterial({
-    color: new THREE.Color(`rgb(${color[0]}, ${color[1]}, ${color[2]})`),
-    lineWidth: formatLinewidth,
-    resolution: new THREE.Vector2(resolutionWidth, resolutionHeight),
-    sizeAttenuation: 0,
-  });
+
+  const { color, linewidth } = geom.prop;
+  const formatLinewidth = (linewidth < 1 ? linewidth * 50 : linewidth) || 5;
+  const meshLineResolution = options.meshLineResolution || {};
+  const resolutionWidth = meshLineResolution.width || window.innerWidth || 1;
+  const resolutionHeight = meshLineResolution.height || window.innerHeight || 1;
+  const material = new MeshLineMaterial({
+    color: new THREE.Color(`rgb(${color[0]}, ${color[1]}, ${color[2]})`),
+    lineWidth: formatLinewidth,
+    resolution: new THREE.Vector2(resolutionWidth, resolutionHeight),
+    sizeAttenuation: 0,
+  });
 
   const lineGeometry = new MeshLineGeometry();
   lineGeometry.setPoints(geometry);