xl-public-utils 1.0.12 → 1.0.14

package/index.d.ts

@@ -988,7 +988,7 @@ declare module "xl-public-utils" {
     bevelSize: number;
     bevelEnabled: boolean;
   }
-
+  export interface  IndexData { zeroIndexs: number[], oneIndexs: number[] };
   export class FontManager {
     private constructor(); // 使用单例模式
     static Mgr(): FontManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xl-public-utils",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "",
   "main": "index.js",
   "module": "index.js",

package/src/drcUtils.js

@@ -1,6 +1,7 @@
 import { vec3 } from "gl-matrix";
 import { int8ArrayToBase64 } from './utils.js'
 import vtkPolyData from "@kitware/vtk.js/Common/DataModel/PolyData.js";
+import vtkDracoReader from "@kitware/vtk.js/IO/Geometry/DracoReader";
 /**
  * @typedef {Object} AttrOption
  * @property {number[]} [colors] 颜色数组

package/src/threeFont/index.js

@@ -68,7 +68,7 @@ class FontManager {
    * @param {string} text 
    * @param {string} fontName 
    * @param {vec3} scale 
-   * @returns {{ polyData: import('@kitware/vtk.js/Common/DataModel/PolyData').default, indexData: { zeroIndexs: number[], oneIndexs: number[] } }}
+   * @returns {{ polyData: vtkPolyData, indexData: { zeroIndexs: number[], oneIndexs: number[] } }}
    */
   generateShapes(text, fontName = 'defaultFont', scale = [0.018, 0.018, 0.018]) {
     const scaleM4 = mat4.scale(mat4.create(), mat4.create(), scale);
@@ -87,7 +87,9 @@ class FontManager {
 
     let polyData = this.createPolyData(extrude.vertices, extrude.faces);
     polyData = deduplicatePolyData(polyData);
+    polyData = this.reIndexPolyData(polyData);
     const indexData = this.getPointsMapData(polyData);
+    // console.log(indexData);
 
     const _polyData = clonePolyData(polyData);
     pointsApplyMat4(scaleM4, _polyData);
@@ -103,7 +105,7 @@ class FontManager {
 
   /**
    * 获取前后层顶点索引映射数据
-   * @param {import('@kitware/vtk.js/Common/DataModel/PolyData').default} polydata 
+   * @param {vtkPolyData} polydata 
    * @returns {{ zeroIndexs: number[], oneIndexs: number[] }}
    */
   getPointsMapData(polydata) {
@@ -134,6 +136,40 @@ class FontManager {
       oneIndexs
     };
   }
+  /**
+   * 
+   * @param {vtkPolyData} polydata 
+   * @returns {vtkPolyData} 重组索引之后的polydata
+   */
+  reIndexPolyData(polydata) {
+    const indexData = this.getPointsMapData(polydata);
+    const allIndexData = [...indexData.zeroIndexs, ...indexData.oneIndexs]
+    const nowPoints = polydata.getPoints().getData();
+    const nowFaces = polydata.getPolys().getData();
+    const newPoints = new Float32Array(nowPoints.length);
+    const indexMap = {};
+    for(let i = 0; i < allIndexData.length; i++) {
+      const index = allIndexData[i];
+      const x = nowPoints[index * 3];
+      const y = nowPoints[index * 3 + 1];
+      const z = nowPoints[index * 3 + 2];
+      newPoints[i * 3] = x
+      newPoints[i * 3 + 1] = y
+      newPoints[i * 3 + 2] = z
+      indexMap[index] = i;
+    }
+    for(let i =0; i< nowFaces.length; i += 4) {
+      const p1 = nowFaces[i + 1];
+      const p2 = nowFaces[i + 2]
+      const p3 = nowFaces[i + 3]
+      nowFaces[i + 1] = indexMap[p1]
+      nowFaces[i + 2] = indexMap[p2]
+      nowFaces[i + 3] = indexMap[p3]
+    }
+    polydata.getPoints().setData(newPoints);
+    polydata.getPolys().setData(nowFaces);
+    return polydata
+  }
 
   /**
    * 创建 vtkPolyData 对象