fl-web-component 1.2.1 → 1.2.2

package/src/utils/instance-parser.js

@@ -293,7 +293,7 @@ function draw3Dmodel(geom, instanceName, instanceCount, nColor, nOpacity) {
   if (Array.isArray(color) && color.length) {
     colors = color;
     opacity = colors[3];
-  } else if (color) {
+  } else if (typeof color === 'string') {
     colors = color.split(',');
     opacity = colors[3];
   } else {
@@ -302,19 +302,25 @@ function draw3Dmodel(geom, instanceName, instanceCount, nColor, nOpacity) {
   }
 
   // 使用自定义材质或创建标准材质（默认参数配置）
-  material =
-    customMaterial ||
+  let materialOptions = {
+    userData: {
+      nColor: nColor
+        ? new THREE.Color(nColor)
+        : new THREE.Color(`rgb(${colors[0]}, ${colors[1]}, ${colors[2]})`),
+      nOpacity: nOpacity ? nOpacity : opacity,
+    },
+    side: THREE.DoubleSide,
+    transparent: true, // 着色器中需要设置透明度
+  };
+
+  customMaterial && Object.assign(customMaterial, materialOptions)
+
+  material = customMaterial ||
     new THREE.MeshStandardMaterial({
+      ...materialOptions,
       roughness: 0.8,
       envMapIntensity: 0.5, // 调低环境贴图的强度
-      side: THREE.DoubleSide,
-      userData: {
-        nColor: nColor
-          ? new THREE.Color(nColor)
-          : new THREE.Color(`rgb(${colors[0]}, ${colors[1]}, ${colors[2]})`),
-        nOpacity: nOpacity ? nOpacity : opacity,
-      },
-      transparent: true, // 着色器中需要设置透明度
+      // wireframe: true
     });
 
   // 为每个实例存储透明度（opacity）
@@ -359,9 +365,9 @@ function draw3Dmodel(geom, instanceName, instanceCount, nColor, nOpacity) {
   }
   mesh = new THREE.InstancedMesh(geometry, material, instanceCount);
   mesh.userData.drawObjectId = instanceName;
+  mesh.userData.is3D = geom.type == GEOM_TYPES.geom_3d || geom.type == GEOM_TYPES.geom_3d_obj;
 
   // mesh.material = material;
-
   return mesh;
 }