Use object args for march function

Author: iwoplaza

apps/phoure-www/src/lib-ray-marching/coneTracer.ts

@@ -16,10 +16,10 @@ import {
   vec2u,
 } from 'typegpu/data';
 
-import { roundUp } from '../mathUtils';
-import { constructRayDir, constructRayPos } from './camera';
-import { MarchResult } from './marchSdf';
-import worldSdf, { FAR, ShapeContext } from './worldSdf';
+import { roundUp } from '../mathUtils.ts';
+import { constructRayDir, constructRayPos } from './camera.ts';
+import { MarchResult } from './marchSdf.ts';
+import worldSdf, { FAR, ShapeContext } from './worldSdf.ts';
 
 const BlockSize = 8;
 

apps/phoure-www/src/lib-ray-marching/index.ts

@@ -1,3 +1,3 @@
-export { ShapeContext } from './types';
-export { estimateNormal } from './estimateNormal';
-export { march, MarchParams, MarchResult } from './marchSdf';
+export { ShapeContext } from './types.ts';
+export { estimateNormal } from './estimateNormal.ts';
+export { march, MarchParams, MarchResult } from './marchSdf.ts';

apps/phoure-www/src/lib-ray-marching/marchSdf.ts

@@ -27,59 +27,56 @@ export const MarchResult = d.struct({
   position: d.vec3f,
 });
 
-export const march = tgpu['~unstable']
-  .fn([
-    d.ptrFn(ShapeContext),
-    d.u32,
-    d.ptrFn(MarchResult),
-  ])(`(ctx: ptr<function, ShapeContext>, limit: u32, out: ptr<function, MarchResult>) {
-    var pos = (*ctx).rayPos;
-    var prev_dist = -1.;
-    var min_dist: f32 = MarchParams.farPlane;
-
-    var step = 0u;
-    var progress = 0.;
-
-    for (; step <= limit; step++) {
-      pos = (*ctx).rayPos + (*ctx).rayDir * progress;
-      min_dist = MarchParams.sampleSdf(pos);
-
-      // Inside volume?
-      if (min_dist <= 0.) {
-        // No need to check more objects.
-        break;
-      }
-
-      if (min_dist < MarchParams.getSurfaceThreshold(*ctx) && min_dist < prev_dist) {
-        // No need to check more objects.
-        break;
-      }
-
-      // march forward safely
-      progress += min_dist;
-      (*ctx).rayDistance += min_dist;
-
-      if (progress > MarchParams.farPlane) {
-        // Stop checking.
-        break;
-      }
-
-      prev_dist = min_dist;
+export const march = tgpu['~unstable'].fn({
+  ctx: d.ptrFn(ShapeContext),
+  limit: d.u32,
+  out: d.ptrFn(MarchResult),
+})`{
+  var pos = (*ctx).rayPos;
+  var prev_dist = -1.;
+  var min_dist: f32 = MarchParams.farPlane;
+
+  var step = 0u;
+  var progress = 0.;
+
+  for (; step <= limit; step++) {
+    pos = (*ctx).rayPos + (*ctx).rayDir * progress;
+    min_dist = MarchParams.sampleSdf(pos);
+
+    // Inside volume?
+    if (min_dist <= 0.) {
+      // No need to check more objects.
+      break;
     }
 
-    (*out).position = pos;
+    if (min_dist < MarchParams.getSurfaceThreshold(*ctx) && min_dist < prev_dist) {
+      // No need to check more objects.
+      break;
+    }
+
+    // march forward safely
+    progress += min_dist;
+    (*ctx).rayDistance += min_dist;
 
-    // Not near surface or distance rising?
-    if (min_dist > MarchParams.getSurfaceThreshold(*ctx) * 2. || min_dist > prev_dist) {
-      // Sky
-      (*out).steps = MarchParams.maxSteps + 1u;
-      return;
+    if (progress > MarchParams.farPlane) {
+      // Stop checking.
+      break;
     }
 
-    (*out).steps = step;
-  }`)
-  .$uses({
-    ShapeContext,
-    MarchResult,
-    MarchParams,
-  });
+    prev_dist = min_dist;
+  }
+
+  (*out).position = pos;
+
+  // Not near surface or distance rising?
+  if (min_dist > MarchParams.getSurfaceThreshold(*ctx) * 2. || min_dist > prev_dist) {
+    // Sky
+    (*out).steps = MarchParams.maxSteps + 1u;
+    return;
+  }
+
+  (*out).steps = step;
+}
+`.$uses({
+  MarchParams,
+});