rm-webgpu-compute-tasks 0.0.7 → 0.0.8

package/package.json

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

package/src/index.d.ts

@@ -423,6 +423,7 @@ declare interface Option_2 {
     kernelSize?: number;
     gridSize?: number;
     gridAmount?: number;
+    groundZ?: number;
 }
 
 export declare class PerspectiveCamera extends THREE.PerspectiveCamera {

package/src/index.js

@@ -457,7 +457,12 @@ async function initWebgpu(opt = {}) {
   if (!navigator.gpu) throw new Error("该环境不支持webgpu");
   if (!adapter) adapter = await navigator.gpu.requestAdapter(opt);
   if (!adapter) throw new Error("获取适配器失败");
-  device = await adapter.requestDevice(opt);
+  device = await adapter.requestDevice({
+    requiredLimits: {
+      maxBufferSize: adapter.limits.maxBufferSize
+    },
+    ...opt
+  });
   if (!adapter) throw new Error("获取设备失败");
   GpuComputed.set(adapter, device);
   return { device, adapter };
@@ -1333,7 +1338,7 @@ class ShaderMaterial {
         set value(v) {
           if (getUniformType(v, uniforms[key]?.atomic) !== type) return;
           v = set(v, value_);
-          if ("copy" in value_ && typeof value_.copy === "function") value_.copy(v);
+          if (typeof value_ === "object" && "copy" in value_ && typeof value_.copy === "function") value_.copy(v);
           else value_ = v;
         }
       };
@@ -2570,7 +2575,7 @@ class PointCloudsIndexMaterial extends ShaderMaterial {
         cameraMat: { value: new Matrix3() },
         T_cw: { value: new Matrix4() },
         imageSize: { value: new Vector2(width, height) },
-        groundZ: { value: -0.911335763281652 + 0.1 },
+        groundZ: { value: -1 },
         depth: { value: depthU32, write: true, atomic: true }
       },
       topology: "point-list"
@@ -3165,7 +3170,7 @@ function getInfo(itemsFile, cindex) {
         (index) => itemPosition.push(
           path[index].x,
           path[index].y,
-          cindex * 200 + i
+          cindex * 200 + i + 1
         )
       )
     );
@@ -3185,7 +3190,8 @@ async function sopc_(opt) {
     erodeMaskSize = 3,
     kernelSize = 15,
     gridSize = 0.05,
-    gridAmount = 2
+    gridAmount = 2,
+    groundZ = 0
   } = opt;
   console.log("开始计算");
   let t = performance.now();
@@ -3203,6 +3209,7 @@ async function sopc_(opt) {
     polyAreaIndexMaterial
   );
   camera.position.set(1, 1, 1);
+  pcIndexMaterial.groundZ = groundZ;
   console.log("文件加载耗时：", performance.now() - t);
   t = performance.now();
   for (let i = 0; i < itemsFiles.length; i++) {
@@ -3241,7 +3248,7 @@ async function sopc_(opt) {
       arrayMap = new ArrayMap();
       map.set(fileIndex, arrayMap);
     }
-    arrayMap.append(itemIndex, i);
+    arrayMap.append(itemIndex - 1, i);
   }
   const transcendingCreation = ["window", "calcony railing", "glass balcony railing", "metal balcony railing", "temporary construction guardrail"];
   const results = new Array(itemsFiles.length);
@@ -3273,11 +3280,11 @@ async function sopc_(opt) {
       const type = itemsFile.sam3Objects[itemIndex].category;
       const isTranscendingCreation = transcendingCreation.includes(type);
       pointarr = sort(pointarr, isTranscendingCreation, itemsFile.position)[0];
-      if (pointarr.length <= 6 * 3) return;
       if (!results[fileIndex]) results[fileIndex] = new Array(itemsFiles[fileIndex].sam3Objects.length).fill([]);
       results[fileIndex][itemIndex] = pointarr;
     });
   });
+  console.log(results, itemsFiles[0]);
   renderer.renderTarget = null;
   renderer.depthTarget = null;
   console.log("整理结果消耗时间：", performance.now() - t, "点云数量", pointsArray.length / 3, "文件数量", itemsFiles.length);