rm-webgpu-compute-tasks 0.0.1 → 0.0.2

package/package.json

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

package/src/index.d.ts

@@ -239,6 +239,7 @@ export declare interface ICreateObstacleDetection {
     canvasWidth?: number;
     canvasHeight?: number;
     fov?: number;
+    linesJson?: any;
 }
 
 export declare interface ICubeTextureOption {
@@ -333,7 +334,7 @@ export declare interface IVertexInputDes {
 /**
  * @param base
  */
-export declare function loadData(base: string): Promise<IData & {
+export declare function loadData(base: string, linesJson_?: any): Promise<IData & {
     map: Map<number, [number, number, number, number]>;
     linesJson: any[];
 }>;
@@ -355,7 +356,7 @@ export declare class Object3D extends THREE.Object3D {
 }
 
 export declare const obstacleDetection: typeof obstacleDetection_ & {
-    getResult(base: string): Promise<number[]>;
+    getResult(base: string, linesJson?: any): Promise<number[]>;
 };
 
 declare function obstacleDetection_(opt: ICreateObstacleDetection): Promise<{

package/src/index.js

@@ -2206,9 +2206,9 @@ async function trajectoryHandle(baseUrl, trajectoryData) {
     pointCloudArray
   };
 }
-async function loadData(base) {
+async function loadData(base, linesJson_) {
   const t = performance.now();
-  const trajectory = await loadTrajectory(base), { pointClouds, pointCloudArray, trajectoryList } = await trajectoryHandle(base, trajectory), linesJson = await loadLines(base), { map, rectArray, indexArray } = linesToBuffer(linesJson);
+  const trajectory = await loadTrajectory(base), { pointClouds, pointCloudArray, trajectoryList } = await trajectoryHandle(base, trajectory), linesJson = linesJson_ ?? await loadLines(base), { map, rectArray, indexArray } = linesToBuffer(linesJson);
   console.log("加载耗时", performance.now() - t);
   return {
     pointClouds,
@@ -2228,10 +2228,11 @@ async function obstacleDetection_(opt) {
     far = 100,
     canvasWidth = 1400,
     canvasHeight = 800,
-    fov = 75
+    fov = 75,
+    linesJson
   } = opt;
   let t = performance.now();
-  const data = await loadData(base), { indexArray, rectArray, trajectoryList, pointClouds, map } = data, renderer = new Renderer(canvasWidth, canvasHeight, "rgba8unorm"), camera = new PerspectiveCamera(fov, canvasWidth / canvasHeight, 1e-3, 100);
+  const data = await loadData(base, linesJson), { indexArray, rectArray, trajectoryList, pointClouds, map } = data, renderer = new Renderer(canvasWidth, canvasHeight, "rgba8unorm"), camera = new PerspectiveCamera(fov, canvasWidth / canvasHeight, 1e-3, 100);
   console.log("数据加载耗时", performance.now() - t);
   t = performance.now();
   camera.up = new THREE.Vector3(0, 0, 1);
@@ -2283,9 +2284,9 @@ async function obstacleDetection_(opt) {
   };
 }
 const obstacleDetection = Object.assign(obstacleDetection_, {
-  async getResult(base) {
+  async getResult(base, linesJson) {
     await initWebgpu();
-    const { result } = await obstacleDetection_({ base });
+    const { result } = await obstacleDetection_({ base, linesJson });
     await destroyWebgpu();
     return result;
   }