fl-web-component 2.1.1-beta.2 → 2.1.1-beta.21

package/packages/utils/StreamLoader.js

@@ -49,7 +49,7 @@ export class StreamLoader {
 
     // Initialize worker
     try {
-      this.worker = new StreamLoaderParserWorker();
+      this.worker = this.debug ? null : new StreamLoaderParserWorker();
       // this.worker = null; // TODO
     } catch (e) {
       this.worker = null;

package/packages/utils/StreamLoaderParser.worker.js

@@ -402,26 +402,26 @@ function parsePrimitive(dataView, uint8Array, offset, isFullProps = true) {
     primitive.documentId = '';
   }
 
-  if (dataView.byteLength < offset + 4) {
-    throw new Error('Insufficient data for Material length');
-  }
-  const materialTextLen = dataView.getUint32(offset, false);
-  offset += 4;
-  if (materialTextLen === 0xffffffff) {
-    primitive.material = null;
-  } else if (materialTextLen > 0) {
-    if (dataView.byteLength < offset + materialTextLen) {
-      throw new Error('Insufficient data for Material content');
-    }
-    const textBytes = uint8Array.subarray(offset, offset + materialTextLen);
-    primitive.material = utf8Decoder.decode(textBytes);
-    offset += materialTextLen;
-  } else {
-    primitive.material = '';
-  }
-
-  if (dataView.byteLength < offset + 4) {
-    throw new Error('Insufficient data for GeomText length');
+  if (dataView.byteLength < offset + 4) {
+    throw new Error('Insufficient data for Material length');
+  }
+  const materialTextLen = dataView.getUint32(offset, false);
+  offset += 4;
+  if (materialTextLen === 0xffffffff) {
+    primitive.material = null;
+  } else if (materialTextLen > 0) {
+    if (dataView.byteLength < offset + materialTextLen) {
+      throw new Error('Insufficient data for Material content');
+    }
+    const textBytes = uint8Array.subarray(offset, offset + materialTextLen);
+    primitive.material = utf8Decoder.decode(textBytes);
+    offset += materialTextLen;
+  } else {
+    primitive.material = '';
+  }
+
+  if (dataView.byteLength < offset + 4) {
+    throw new Error('Insufficient data for GeomText length');
   }
   const geomTextLen = dataView.getUint32(offset, false);
   offset += 4;

package/src/utils/instance-parser.js

@@ -91,46 +91,46 @@ function requestInstancedMapping(instances, drawObjs) {
   });
 }
 
-function getInstanceNormalSign(matrix) {
-  if (!matrix || typeof matrix.determinant !== 'function') return 1;
-  return matrix.determinant() < 0 ? -1 : 1;
-}
-
-function getMatrixVal(matrix) {
-  const val = matrix && matrix.val ? matrix.val : matrix;
-  return val && val.length >= 16 ? val : null;
-}
-
-function composeInstanceMatrix(instance, mesh, geometry) {
-  const resultMatrix = new THREE.Matrix4();
-  const meshMatrix = new THREE.Matrix4();
-  const primitiveMatrix = new THREE.Matrix4();
-  const meshMatrixVal = getMatrixVal(instance && instance.matrix);
-  const primitiveMatrixVal = getMatrixVal(mesh && mesh.matrix);
-
-  if (meshMatrixVal) {
-    meshMatrix.fromArray(meshMatrixVal);
-  }
-  if (primitiveMatrixVal) {
-    primitiveMatrix.fromArray(primitiveMatrixVal);
-  }
-
-  const { points, alignType } = mesh || {};
-  if (mesh && isTextType(mesh.type) && points && points.length >= 3) {
-    const positionMatrix = new THREE.Matrix4();
-    const alignMatrix = createAlignedText(alignType, geometry);
-    positionMatrix.identity().makeTranslation(points[0], points[1], points[2]);
-    primitiveMatrix.multiply(alignMatrix).multiply(positionMatrix);
-  }
-
-  resultMatrix.multiplyMatrices(meshMatrix, primitiveMatrix);
-  return resultMatrix;
-}
-
-/**
- * 重置处理状态，用于新的批量加载会话
- */
-function resetProcessingState() {
+function getInstanceNormalSign(matrix) {
+  if (!matrix || typeof matrix.determinant !== 'function') return 1;
+  return matrix.determinant() < 0 ? -1 : 1;
+}
+
+function getMatrixVal(matrix) {
+  const val = matrix && matrix.val ? matrix.val : matrix;
+  return val && val.length >= 16 ? val : null;
+}
+
+function composeInstanceMatrix(instance, mesh, geometry) {
+  const resultMatrix = new THREE.Matrix4();
+  const meshMatrix = new THREE.Matrix4();
+  const primitiveMatrix = new THREE.Matrix4();
+  const meshMatrixVal = getMatrixVal(instance && instance.matrix);
+  const primitiveMatrixVal = getMatrixVal(mesh && mesh.matrix);
+
+  if (meshMatrixVal) {
+    meshMatrix.fromArray(meshMatrixVal);
+  }
+  if (primitiveMatrixVal) {
+    primitiveMatrix.fromArray(primitiveMatrixVal);
+  }
+
+  const { points, alignType } = mesh || {};
+  if (mesh && isTextType(mesh.type) && points && points.length >= 3) {
+    const positionMatrix = new THREE.Matrix4();
+    const alignMatrix = createAlignedText(alignType, geometry);
+    positionMatrix.identity().makeTranslation(points[0], points[1], points[2]);
+    primitiveMatrix.multiply(alignMatrix).multiply(positionMatrix);
+  }
+
+  resultMatrix.multiplyMatrices(meshMatrix, primitiveMatrix);
+  return resultMatrix;
+}
+
+/**
+ * 重置处理状态，用于新的批量加载会话
+ */
+function resetProcessingState() {
   drawObjMapInstance = {};
   // instanceToInstancedMeshMap.clear();
   // processedDrawObjects.clear();
@@ -465,27 +465,27 @@ function setInstanceMatricesAndColors(model, drawObj, mesh, meshName, customColo
 
     // const instancedMesh = instanceToInstancedMeshMap.get(item.instanceId);
 
-    const m4 = composeInstanceMatrix(item, mesh, model.geometry);
-    model.setMatrixAt(index, m4);
-
-    const normalSignAttr = model.geometry && model.geometry.getAttribute('instanceNormalSign');
-    if (normalSignAttr && normalSignAttr.array && index < normalSignAttr.array.length) {
-      normalSignAttr.array[index] = getInstanceNormalSign(m4);
-    }
-
-    const copyMatrix = new THREE.Matrix4().copy(m4);
-    model.userData.copyMatrix = copyMatrix;
-
-    const temp = model.userData.instancesMap.get(item.instanceId);
-    temp.copyMatrix = copyMatrix;
-    if (sourceVisible === false) {
-      const offsetMatrix = new THREE.Matrix4()
-        .copy(copyMatrix)
-        .makeTranslation(9999999, 9999999, 9999999);
-      model.setMatrixAt(index, offsetMatrix);
-    }
-
-    // 设置颜色
+    const m4 = composeInstanceMatrix(item, mesh, model.geometry);
+    model.setMatrixAt(index, m4);
+
+    const normalSignAttr = model.geometry && model.geometry.getAttribute('instanceNormalSign');
+    if (normalSignAttr && normalSignAttr.array && index < normalSignAttr.array.length) {
+      normalSignAttr.array[index] = getInstanceNormalSign(m4);
+    }
+
+    const copyMatrix = new THREE.Matrix4().copy(m4);
+    model.userData.copyMatrix = copyMatrix;
+
+    const temp = model.userData.instancesMap.get(item.instanceId);
+    temp.copyMatrix = copyMatrix;
+    if (sourceVisible === false) {
+      const offsetMatrix = new THREE.Matrix4()
+        .copy(copyMatrix)
+        .makeTranslation(9999999, 9999999, 9999999);
+      model.setMatrixAt(index, offsetMatrix);
+    }
+
+    // 设置颜色
     model.setColorAt(index, meshColor);
   });
 
@@ -560,9 +560,9 @@ function appendInstanceToInstancedMesh(model, drawObj, mesh, instance, customCol
     ? new THREE.Color(customColor)
     : new THREE.Color(`rgb(${colorArr[0]}, ${colorArr[1]}, ${colorArr[2]})`);
 
-  if (!mesh) return;
-
-  const m4 = composeInstanceMatrix(instance, mesh, model.geometry);
+  if (!mesh) return;
+
+  const m4 = composeInstanceMatrix(instance, mesh, model.geometry);
   const renderMatrix =
     sourceVisible === false
       ? new THREE.Matrix4().copy(m4).makeTranslation(9999999, 9999999, 9999999)
@@ -1085,9 +1085,14 @@ function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, option
 
   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();