rm-webgpu-compute-tasks 0.0.4 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rm-webgpu-compute-tasks",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/index.d.ts

@@ -283,6 +283,29 @@ declare interface IData {
     }[];
 }
 
+declare interface IItemsFile {
+    cameraMat: number[];
+    extrinsicMat: number[];
+    filename: string;
+    imageSize: [number, number];
+    position: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    quaternion: {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+    };
+    sam3Objects: {
+        category: string;
+        objId: string;
+        coordinates: [number, number][];
+    }[];
+}
+
 declare type InitOption = {
     featureLevel?: string;
     powerPreference?: GPUPowerPreference;
@@ -487,7 +510,11 @@ export declare class Renderer {
 }
 
 export declare const segmentObjectPointClouds: typeof sopc_ & {
-    getResult(opt: Option_2): Promise<number[][][]>;
+    getResult(opt: Option_2): Promise<{
+        results: number[][][];
+        objIds: string[][];
+        itemsFiles: IItemsFile[];
+    }>;
 };
 
 export declare const shaderLocationMap: Map<string, number>;
@@ -592,6 +619,8 @@ declare function sopc_(opt: Option_2): Promise<{
     camera: PerspectiveCamera;
     results: number[][][];
     pointsArray: Float32Array<ArrayBufferLike>;
+    objIds: string[][];
+    itemsFiles: IItemsFile[];
 }>;
 
 export declare class Texture {

package/src/index.js

@@ -3190,7 +3190,12 @@ async function sopc_(opt) {
   console.log("开始计算");
   let t = performance.now();
   await initWebgpu();
-  const canvasWidth = window?.innerWidth ?? 256, canvasHeight = window?.innerHeight ?? 256, renderer = new Renderer(canvasWidth, canvasHeight, "rgba8unorm"), camera = new PerspectiveCamera(75, canvasWidth / canvasHeight, 1e-3, 100), { points: pointsArray, itemsFiles, width, height } = await load(base, urls), pointCount = pointsArray.length / 3, pcIndexMaterial = new PointCloudsIndexMaterial(width, height), polyAreaIndexMaterial = new PolyAreaIndexMaterial(width, height), erodeMaskComputeMaterial = new ErodeMaskComputeMaterial(width, height, polyAreaIndexMaterial.resultTexture, erodeMaskSize), sopcComputeMaterial = new SOPCComputeMaterial(width, height, pointCount, pcIndexMaterial.resultTexture, kernelSize), points = new Object3D(
+  let canvasWidth = 256, canvasHeight = 256;
+  if (typeof window !== "undefined") {
+    canvasWidth = window.innerWidth ?? canvasWidth;
+    canvasHeight = window.innerHeight ?? canvasHeight;
+  }
+  const renderer = new Renderer(canvasWidth, canvasHeight, "rgba8unorm"), camera = new PerspectiveCamera(75, canvasWidth / canvasHeight, 1e-3, 100), { points: pointsArray, itemsFiles, width, height } = await load(base, urls), pointCount = pointsArray.length / 3, pcIndexMaterial = new PointCloudsIndexMaterial(width, height), polyAreaIndexMaterial = new PolyAreaIndexMaterial(width, height), erodeMaskComputeMaterial = new ErodeMaskComputeMaterial(width, height, polyAreaIndexMaterial.resultTexture, erodeMaskSize), sopcComputeMaterial = new SOPCComputeMaterial(width, height, pointCount, pcIndexMaterial.resultTexture, kernelSize), points = new Object3D(
     new BufferGeometry().setAttribute("position", new THREE.BufferAttribute(pointsArray, 3)),
     pcIndexMaterial
   ), mesh = new Object3D(
@@ -3280,15 +3285,17 @@ async function sopc_(opt) {
     renderer,
     camera,
     results,
-    pointsArray
+    pointsArray,
+    objIds: itemsFiles.map((item) => item.sam3Objects.map((sam3Object) => sam3Object.objId)),
+    itemsFiles
   };
 }
 const segmentObjectPointClouds = Object.assign(sopc_, {
   async getResult(opt) {
     await initWebgpu();
-    const { results } = await sopc_(opt);
+    const { results, objIds, itemsFiles } = await sopc_(opt);
     await destroyWebgpu();
-    return results;
+    return { results, objIds, itemsFiles };
   }
 });
 export {