@hello-terrain/three 0.0.0-alpha.7 → 0.0.0-alpha.8

package/dist/index.cjs

@@ -411,25 +411,25 @@ function resolveType(format) {
 function resolveFilter(mode) {
   return mode === "linear" ? three.LinearFilter : three.NearestFilter;
 }
-function configureStorageTexture(texture, format, filter) {
-  texture.format = three.RGBAFormat;
-  texture.type = resolveType(format);
-  texture.magFilter = resolveFilter(filter);
-  texture.minFilter = resolveFilter(filter);
-  texture.wrapS = three.ClampToEdgeWrapping;
-  texture.wrapT = three.ClampToEdgeWrapping;
-  texture.generateMipmaps = false;
-  texture.needsUpdate = true;
+function configureStorageTexture(texture2, format, filter) {
+  texture2.format = three.RGBAFormat;
+  texture2.type = resolveType(format);
+  texture2.magFilter = resolveFilter(filter);
+  texture2.minFilter = resolveFilter(filter);
+  texture2.wrapS = three.ClampToEdgeWrapping;
+  texture2.wrapT = three.ClampToEdgeWrapping;
+  texture2.generateMipmaps = false;
+  texture2.needsUpdate = true;
 }
 function ArrayTextureBackend(edgeVertexCount, tileCount, options) {
   let currentEdgeVertexCount = edgeVertexCount;
   let currentTileCount = tileCount;
-  const texture = new webgpu.StorageArrayTexture(
+  const tex = new webgpu.StorageArrayTexture(
     edgeVertexCount,
     edgeVertexCount,
     tileCount
   );
-  configureStorageTexture(texture, options.format, options.filter);
+  configureStorageTexture(tex, options.format, options.filter);
   return {
     backendType: "array-texture",
     get edgeVertexCount() {
@@ -438,18 +438,21 @@ function ArrayTextureBackend(edgeVertexCount, tileCount, options) {
     get tileCount() {
       return currentTileCount;
     },
-    texture,
+    texture: tex,
     uv(ix, iy, _tileIndex) {
       return tsl.vec2(ix.toFloat(), iy.toFloat());
     },
     texel(ix, iy, tileIndex) {
       return tsl.ivec3(ix, iy, tileIndex);
     },
+    sample(u, v, tileIndex) {
+      return tsl.texture(tex, tsl.vec2(u, v)).depth(tsl.int(tileIndex));
+    },
     resize(width, height, nextTileCount) {
       currentEdgeVertexCount = width;
       currentTileCount = nextTileCount;
-      texture.setSize(width, height, nextTileCount);
-      texture.needsUpdate = true;
+      tex.setSize(width, height, nextTileCount);
+      tex.needsUpdate = true;
     }
   };
 }
@@ -468,8 +471,8 @@ function AtlasBackend(edgeVertexCount, tileCount, options) {
   let currentTileCount = tileCount;
   let tilesPerRow = Math.max(1, Math.ceil(Math.sqrt(tileCount)));
   const atlasSize = tilesPerRow * edgeVertexCount;
-  const texture = new webgpu.StorageTexture(atlasSize, atlasSize);
-  configureStorageTexture(texture, options.format, options.filter);
+  const tex = new webgpu.StorageTexture(atlasSize, atlasSize);
+  configureStorageTexture(tex, options.format, options.filter);
   return {
     backendType: "atlas",
     get edgeVertexCount() {
@@ -478,7 +481,7 @@ function AtlasBackend(edgeVertexCount, tileCount, options) {
     get tileCount() {
       return currentTileCount;
     },
-    texture,
+    texture: tex,
     uv(ix, iy, tileIndex) {
       const { atlasX, atlasY } = atlasCoord(
         tilesPerRow,
@@ -503,27 +506,37 @@ function AtlasBackend(edgeVertexCount, tileCount, options) {
       );
       return tsl.ivec2(atlasX, atlasY);
     },
+    sample(u, v, tileIndex) {
+      const tile = tsl.int(tileIndex);
+      const tilesPerRowNode = tsl.int(tilesPerRow);
+      const col = tile.mod(tilesPerRowNode);
+      const row = tile.div(tilesPerRowNode);
+      const invTilesPerRow = tsl.float(1 / tilesPerRow);
+      const atlasU = col.toFloat().add(u).mul(invTilesPerRow);
+      const atlasV = row.toFloat().add(v).mul(invTilesPerRow);
+      return tsl.texture(tex, tsl.vec2(atlasU, atlasV));
+    },
     resize(width, height, nextTileCount) {
       currentEdgeVertexCount = width;
       currentTileCount = nextTileCount;
       tilesPerRow = Math.max(1, Math.ceil(Math.sqrt(nextTileCount)));
       const nextAtlasSize = tilesPerRow * width;
-      const image = texture.image;
+      const image = tex.image;
       image.width = nextAtlasSize;
       image.height = nextAtlasSize;
-      texture.needsUpdate = true;
+      tex.needsUpdate = true;
     }
   };
 }
 function Texture3DBackend(edgeVertexCount, tileCount, options) {
   let currentEdgeVertexCount = edgeVertexCount;
   let currentTileCount = tileCount;
-  const texture = new webgpu.StorageArrayTexture(
+  const tex = new webgpu.StorageArrayTexture(
     edgeVertexCount,
     edgeVertexCount,
     tileCount
   );
-  configureStorageTexture(texture, options.format, options.filter);
+  configureStorageTexture(tex, options.format, options.filter);
   return {
     backendType: "texture-3d",
     get edgeVertexCount() {
@@ -532,18 +545,21 @@ function Texture3DBackend(edgeVertexCount, tileCount, options) {
     get tileCount() {
       return currentTileCount;
     },
-    texture,
+    texture: tex,
     uv(ix, iy, _tileIndex) {
       return tsl.vec2(ix.toFloat(), iy.toFloat());
     },
     texel(ix, iy, tileIndex) {
       return tsl.ivec3(ix, iy, tileIndex);
     },
+    sample(u, v, tileIndex) {
+      return tsl.texture(tex, tsl.vec2(u, v)).depth(tsl.int(tileIndex));
+    },
     resize(width, height, nextTileCount) {
       currentEdgeVertexCount = width;
       currentTileCount = nextTileCount;
-      texture.setSize(width, height, nextTileCount);
-      texture.needsUpdate = true;
+      tex.setSize(width, height, nextTileCount);
+      tex.needsUpdate = true;
     }
   };
 }
@@ -552,7 +568,7 @@ function tryGetDeviceLimits(renderer) {
   return backend.backend?.device?.limits ?? {};
 }
 function createTerrainFieldStorage(edgeVertexCount, tileCount, renderer, options = {}) {
-  const filter = options.filter ?? "nearest";
+  const filter = options.filter ?? "linear";
   const format = options.format ?? "rgba16float";
   const forcedBackend = options.backend;
   if (forcedBackend === "atlas") {
@@ -593,8 +609,18 @@ function loadTerrainFieldElevation(storage, ix, iy, tileIndex) {
   return loadTerrainField(storage, ix, iy, tileIndex).r;
 }
 function loadTerrainFieldNormal(storage, ix, iy, tileIndex) {
-  const sample = loadTerrainField(storage, ix, iy, tileIndex);
-  return tsl.vec2(sample.g, sample.b);
+  const raw = loadTerrainField(storage, ix, iy, tileIndex);
+  return tsl.vec2(raw.g, raw.b);
+}
+function sampleTerrainField(storage, u, v, tileIndex) {
+  return storage.sample(u, v, tileIndex);
+}
+function sampleTerrainFieldElevation(storage, u, v, tileIndex) {
+  return sampleTerrainField(storage, u, v, tileIndex).r;
+}
+function sampleTerrainFieldNormal(storage, u, v, tileIndex) {
+  const raw = sampleTerrainField(storage, u, v, tileIndex);
+  return tsl.vec2(raw.g, raw.b);
 }
 function packTerrainFieldSample(height, normalXZ, extra = tsl.float(0)) {
   return tsl.vec4(height, normalXZ.x, normalXZ.y, extra);
@@ -724,6 +750,7 @@ const quadtreeUpdate = work.param({
   distanceFactor: 1.5
 }).displayName("quadtreeUpdate");
 const surface = work.param(null).displayName("surface");
+const terrainFieldFilter = work.param("linear").displayName("terrainFieldFilter");
 const elevationFn = work.param(() => tsl.float(0));
 
 function createLeafStorage(maxNodes) {
@@ -1535,11 +1562,13 @@ const createTerrainFieldTextureTask = work.task(
   (get, work, { resources }) => {
     const edgeVertexCount = get(innerTileSegments) + 3;
     const maxNodesValue = get(maxNodes);
+    const filter = get(terrainFieldFilter);
     return work(
       () => createTerrainFieldStorage(
         edgeVertexCount,
         maxNodesValue,
-        resources?.renderer
+        resources?.renderer,
+        { filter }
       )
     );
   }
@@ -1865,10 +1894,14 @@ exports.quadtreeUpdateTask = quadtreeUpdateTask;
 exports.resetLeafSet = resetLeafSet;
 exports.resetSeamTable = resetSeamTable;
 exports.rootSize = rootSize;
+exports.sampleTerrainField = sampleTerrainField;
+exports.sampleTerrainFieldElevation = sampleTerrainFieldElevation;
+exports.sampleTerrainFieldNormal = sampleTerrainFieldNormal;
 exports.skirtScale = skirtScale;
 exports.storeTerrainField = storeTerrainField;
 exports.surface = surface;
 exports.surfaceTask = surfaceTask;
+exports.terrainFieldFilter = terrainFieldFilter;
 exports.terrainFieldStageTask = terrainFieldStageTask;
 exports.terrainGraph = terrainGraph;
 exports.terrainTasks = terrainTasks;

package/dist/index.d.cts

@@ -404,6 +404,8 @@ interface TerrainFieldStorage {
     readonly texture: StorageArrayTexture | StorageTexture;
     uv(ix: Node, iy: Node, tileIndex: Node): Node;
     texel(ix: Node, iy: Node, tileIndex: Node): Node;
+    /** UV-based filtered sample. `u, v` in [0, 1] tile-local space. */
+    sample(u: Node, v: Node, tileIndex: Node): Node;
     resize(width: number, height: number, tileCount: number): void;
 }
 declare function ArrayTextureBackend(edgeVertexCount: number, tileCount: number, options: Required<Pick<TerrainFieldStorageOptions, "format" | "filter">>): TerrainFieldStorage;
@@ -418,6 +420,13 @@ declare function storeTerrainField(storage: TerrainFieldStorage, ix: Node, iy: N
 declare function loadTerrainField(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
 declare function loadTerrainFieldElevation(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
 declare function loadTerrainFieldNormal(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
+/**
+ * UV-based filtered sample. `u, v` are in [0, 1] tile-local space.
+ * Respects the filter mode (nearest / linear) set on the storage.
+ */
+declare function sampleTerrainField(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
+declare function sampleTerrainFieldElevation(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
+declare function sampleTerrainFieldNormal(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
 declare function packTerrainFieldSample(height: Node, normalXZ: Node, extra?: Node): Node;
 
 interface TerrainUniformsParams {
@@ -557,6 +566,8 @@ declare const maxLevel: _hello_terrain_work.ParamRef<number>;
 declare const quadtreeUpdate: _hello_terrain_work.ParamRef<UpdateParams>;
 /** Optional custom terrain surface; defaults to bounded flat surface when null. */
 declare const surface: _hello_terrain_work.ParamRef<Surface | null>;
+/** Terrain field texture filter mode. */
+declare const terrainFieldFilter: _hello_terrain_work.ParamRef<"nearest" | "linear">;
 /** Terrain elevation control function (per vertex, in gpu compute) */
 declare const elevationFn: _hello_terrain_work.ParamRef<ElevationCallback>;
 
@@ -740,5 +751,5 @@ declare const voronoiCells: three_src_nodes_TSL_js.ShaderNodeFn<[three_tsl.Proxi
     uv: Node;
 }>]>;
 
-export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
+export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, sampleTerrainField, sampleTerrainFieldElevation, sampleTerrainFieldNormal, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldFilter, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
 export type { ComputePipeline, ComputeStageCallback, CubeSphereSurfaceConfig, ElevationCallback, ElevationFieldContext, ElevationParams, FlatSurfaceConfig, InfiniteFlatSurfaceConfig, IntNodeInput, LeafGpuBufferState, LeafSet, LeafStorageState, LodMode, QuadtreeConfig, QuadtreeConfigState, QuadtreeState, SeamTable, SpatialIndex, Surface, TerrainFieldStorage, TerrainFieldStorageBackendType, TerrainFieldStorageFormat, TerrainFieldStorageOptions, TerrainGraph, TerrainTasks, TerrainUniformsContext, TerrainUniformsParams, TileBounds, TileId, UpdateParams };

package/dist/index.d.mts

@@ -404,6 +404,8 @@ interface TerrainFieldStorage {
     readonly texture: StorageArrayTexture | StorageTexture;
     uv(ix: Node, iy: Node, tileIndex: Node): Node;
     texel(ix: Node, iy: Node, tileIndex: Node): Node;
+    /** UV-based filtered sample. `u, v` in [0, 1] tile-local space. */
+    sample(u: Node, v: Node, tileIndex: Node): Node;
     resize(width: number, height: number, tileCount: number): void;
 }
 declare function ArrayTextureBackend(edgeVertexCount: number, tileCount: number, options: Required<Pick<TerrainFieldStorageOptions, "format" | "filter">>): TerrainFieldStorage;
@@ -418,6 +420,13 @@ declare function storeTerrainField(storage: TerrainFieldStorage, ix: Node, iy: N
 declare function loadTerrainField(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
 declare function loadTerrainFieldElevation(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
 declare function loadTerrainFieldNormal(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
+/**
+ * UV-based filtered sample. `u, v` are in [0, 1] tile-local space.
+ * Respects the filter mode (nearest / linear) set on the storage.
+ */
+declare function sampleTerrainField(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
+declare function sampleTerrainFieldElevation(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
+declare function sampleTerrainFieldNormal(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
 declare function packTerrainFieldSample(height: Node, normalXZ: Node, extra?: Node): Node;
 
 interface TerrainUniformsParams {
@@ -557,6 +566,8 @@ declare const maxLevel: _hello_terrain_work.ParamRef<number>;
 declare const quadtreeUpdate: _hello_terrain_work.ParamRef<UpdateParams>;
 /** Optional custom terrain surface; defaults to bounded flat surface when null. */
 declare const surface: _hello_terrain_work.ParamRef<Surface | null>;
+/** Terrain field texture filter mode. */
+declare const terrainFieldFilter: _hello_terrain_work.ParamRef<"nearest" | "linear">;
 /** Terrain elevation control function (per vertex, in gpu compute) */
 declare const elevationFn: _hello_terrain_work.ParamRef<ElevationCallback>;
 
@@ -740,5 +751,5 @@ declare const voronoiCells: three_src_nodes_TSL_js.ShaderNodeFn<[three_tsl.Proxi
     uv: Node;
 }>]>;
 
-export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
+export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, sampleTerrainField, sampleTerrainFieldElevation, sampleTerrainFieldNormal, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldFilter, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
 export type { ComputePipeline, ComputeStageCallback, CubeSphereSurfaceConfig, ElevationCallback, ElevationFieldContext, ElevationParams, FlatSurfaceConfig, InfiniteFlatSurfaceConfig, IntNodeInput, LeafGpuBufferState, LeafSet, LeafStorageState, LodMode, QuadtreeConfig, QuadtreeConfigState, QuadtreeState, SeamTable, SpatialIndex, Surface, TerrainFieldStorage, TerrainFieldStorageBackendType, TerrainFieldStorageFormat, TerrainFieldStorageOptions, TerrainGraph, TerrainTasks, TerrainUniformsContext, TerrainUniformsParams, TileBounds, TileId, UpdateParams };

package/dist/index.d.ts

@@ -404,6 +404,8 @@ interface TerrainFieldStorage {
     readonly texture: StorageArrayTexture | StorageTexture;
     uv(ix: Node, iy: Node, tileIndex: Node): Node;
     texel(ix: Node, iy: Node, tileIndex: Node): Node;
+    /** UV-based filtered sample. `u, v` in [0, 1] tile-local space. */
+    sample(u: Node, v: Node, tileIndex: Node): Node;
     resize(width: number, height: number, tileCount: number): void;
 }
 declare function ArrayTextureBackend(edgeVertexCount: number, tileCount: number, options: Required<Pick<TerrainFieldStorageOptions, "format" | "filter">>): TerrainFieldStorage;
@@ -418,6 +420,13 @@ declare function storeTerrainField(storage: TerrainFieldStorage, ix: Node, iy: N
 declare function loadTerrainField(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
 declare function loadTerrainFieldElevation(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
 declare function loadTerrainFieldNormal(storage: TerrainFieldStorage, ix: Node, iy: Node, tileIndex: Node): Node;
+/**
+ * UV-based filtered sample. `u, v` are in [0, 1] tile-local space.
+ * Respects the filter mode (nearest / linear) set on the storage.
+ */
+declare function sampleTerrainField(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
+declare function sampleTerrainFieldElevation(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
+declare function sampleTerrainFieldNormal(storage: TerrainFieldStorage, u: Node, v: Node, tileIndex: Node): Node;
 declare function packTerrainFieldSample(height: Node, normalXZ: Node, extra?: Node): Node;
 
 interface TerrainUniformsParams {
@@ -557,6 +566,8 @@ declare const maxLevel: _hello_terrain_work.ParamRef<number>;
 declare const quadtreeUpdate: _hello_terrain_work.ParamRef<UpdateParams>;
 /** Optional custom terrain surface; defaults to bounded flat surface when null. */
 declare const surface: _hello_terrain_work.ParamRef<Surface | null>;
+/** Terrain field texture filter mode. */
+declare const terrainFieldFilter: _hello_terrain_work.ParamRef<"nearest" | "linear">;
 /** Terrain elevation control function (per vertex, in gpu compute) */
 declare const elevationFn: _hello_terrain_work.ParamRef<ElevationCallback>;
 
@@ -740,5 +751,5 @@ declare const voronoiCells: three_src_nodes_TSL_js.ShaderNodeFn<[three_tsl.Proxi
     uv: Node;
 }>]>;
 
-export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
+export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, sampleTerrainField, sampleTerrainFieldElevation, sampleTerrainFieldNormal, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldFilter, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
 export type { ComputePipeline, ComputeStageCallback, CubeSphereSurfaceConfig, ElevationCallback, ElevationFieldContext, ElevationParams, FlatSurfaceConfig, InfiniteFlatSurfaceConfig, IntNodeInput, LeafGpuBufferState, LeafSet, LeafStorageState, LodMode, QuadtreeConfig, QuadtreeConfigState, QuadtreeState, SeamTable, SpatialIndex, Surface, TerrainFieldStorage, TerrainFieldStorageBackendType, TerrainFieldStorageFormat, TerrainFieldStorageOptions, TerrainGraph, TerrainTasks, TerrainUniformsContext, TerrainUniformsParams, TileBounds, TileId, UpdateParams };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { BufferGeometry, BufferAttribute, RGBAFormat, ClampToEdgeWrapping, HalfFloatType, FloatType, LinearFilter, NearestFilter, Vector3 as Vector3$1 } from 'three';
 import { MeshStandardNodeMaterial, InstancedMesh, InstancedBufferAttribute, StorageTexture, StorageArrayTexture, StorageBufferAttribute, Vector3 } from 'three/webgpu';
 import { param, task, graph } from '@hello-terrain/work';
-import { uniform, Fn, float, globalId, int, vec2, uint, If, workgroupBarrier, textureStore, uvec3, vec4, ivec2, ivec3, textureLoad, instanceIndex, min, max, pow, vec3, storage, vertexIndex, uv, select, positionLocal, normalLocal, remap, dot, varyingProperty, mx_noise_float, Loop, mix } from 'three/tsl';
+import { uniform, Fn, float, globalId, int, vec2, uint, If, workgroupBarrier, textureStore, uvec3, vec4, texture, ivec2, ivec3, textureLoad, instanceIndex, min, max, pow, vec3, storage, vertexIndex, uv, select, positionLocal, normalLocal, remap, dot, varyingProperty, mx_noise_float, Loop, mix } from 'three/tsl';
 import { Fn as Fn$1 } from 'three/src/nodes/TSL.js';
 
 class TerrainGeometry extends BufferGeometry {
@@ -409,25 +409,25 @@ function resolveType(format) {
 function resolveFilter(mode) {
   return mode === "linear" ? LinearFilter : NearestFilter;
 }
-function configureStorageTexture(texture, format, filter) {
-  texture.format = RGBAFormat;
-  texture.type = resolveType(format);
-  texture.magFilter = resolveFilter(filter);
-  texture.minFilter = resolveFilter(filter);
-  texture.wrapS = ClampToEdgeWrapping;
-  texture.wrapT = ClampToEdgeWrapping;
-  texture.generateMipmaps = false;
-  texture.needsUpdate = true;
+function configureStorageTexture(texture2, format, filter) {
+  texture2.format = RGBAFormat;
+  texture2.type = resolveType(format);
+  texture2.magFilter = resolveFilter(filter);
+  texture2.minFilter = resolveFilter(filter);
+  texture2.wrapS = ClampToEdgeWrapping;
+  texture2.wrapT = ClampToEdgeWrapping;
+  texture2.generateMipmaps = false;
+  texture2.needsUpdate = true;
 }
 function ArrayTextureBackend(edgeVertexCount, tileCount, options) {
   let currentEdgeVertexCount = edgeVertexCount;
   let currentTileCount = tileCount;
-  const texture = new StorageArrayTexture(
+  const tex = new StorageArrayTexture(
     edgeVertexCount,
     edgeVertexCount,
     tileCount
   );
-  configureStorageTexture(texture, options.format, options.filter);
+  configureStorageTexture(tex, options.format, options.filter);
   return {
     backendType: "array-texture",
     get edgeVertexCount() {
@@ -436,18 +436,21 @@ function ArrayTextureBackend(edgeVertexCount, tileCount, options) {
     get tileCount() {
       return currentTileCount;
     },
-    texture,
+    texture: tex,
     uv(ix, iy, _tileIndex) {
       return vec2(ix.toFloat(), iy.toFloat());
     },
     texel(ix, iy, tileIndex) {
       return ivec3(ix, iy, tileIndex);
     },
+    sample(u, v, tileIndex) {
+      return texture(tex, vec2(u, v)).depth(int(tileIndex));
+    },
     resize(width, height, nextTileCount) {
       currentEdgeVertexCount = width;
       currentTileCount = nextTileCount;
-      texture.setSize(width, height, nextTileCount);
-      texture.needsUpdate = true;
+      tex.setSize(width, height, nextTileCount);
+      tex.needsUpdate = true;
     }
   };
 }
@@ -466,8 +469,8 @@ function AtlasBackend(edgeVertexCount, tileCount, options) {
   let currentTileCount = tileCount;
   let tilesPerRow = Math.max(1, Math.ceil(Math.sqrt(tileCount)));
   const atlasSize = tilesPerRow * edgeVertexCount;
-  const texture = new StorageTexture(atlasSize, atlasSize);
-  configureStorageTexture(texture, options.format, options.filter);
+  const tex = new StorageTexture(atlasSize, atlasSize);
+  configureStorageTexture(tex, options.format, options.filter);
   return {
     backendType: "atlas",
     get edgeVertexCount() {
@@ -476,7 +479,7 @@ function AtlasBackend(edgeVertexCount, tileCount, options) {
     get tileCount() {
       return currentTileCount;
     },
-    texture,
+    texture: tex,
     uv(ix, iy, tileIndex) {
       const { atlasX, atlasY } = atlasCoord(
         tilesPerRow,
@@ -501,27 +504,37 @@ function AtlasBackend(edgeVertexCount, tileCount, options) {
       );
       return ivec2(atlasX, atlasY);
     },
+    sample(u, v, tileIndex) {
+      const tile = int(tileIndex);
+      const tilesPerRowNode = int(tilesPerRow);
+      const col = tile.mod(tilesPerRowNode);
+      const row = tile.div(tilesPerRowNode);
+      const invTilesPerRow = float(1 / tilesPerRow);
+      const atlasU = col.toFloat().add(u).mul(invTilesPerRow);
+      const atlasV = row.toFloat().add(v).mul(invTilesPerRow);
+      return texture(tex, vec2(atlasU, atlasV));
+    },
     resize(width, height, nextTileCount) {
       currentEdgeVertexCount = width;
       currentTileCount = nextTileCount;
       tilesPerRow = Math.max(1, Math.ceil(Math.sqrt(nextTileCount)));
       const nextAtlasSize = tilesPerRow * width;
-      const image = texture.image;
+      const image = tex.image;
       image.width = nextAtlasSize;
       image.height = nextAtlasSize;
-      texture.needsUpdate = true;
+      tex.needsUpdate = true;
     }
   };
 }
 function Texture3DBackend(edgeVertexCount, tileCount, options) {
   let currentEdgeVertexCount = edgeVertexCount;
   let currentTileCount = tileCount;
-  const texture = new StorageArrayTexture(
+  const tex = new StorageArrayTexture(
     edgeVertexCount,
     edgeVertexCount,
     tileCount
   );
-  configureStorageTexture(texture, options.format, options.filter);
+  configureStorageTexture(tex, options.format, options.filter);
   return {
     backendType: "texture-3d",
     get edgeVertexCount() {
@@ -530,18 +543,21 @@ function Texture3DBackend(edgeVertexCount, tileCount, options) {
     get tileCount() {
       return currentTileCount;
     },
-    texture,
+    texture: tex,
     uv(ix, iy, _tileIndex) {
       return vec2(ix.toFloat(), iy.toFloat());
     },
     texel(ix, iy, tileIndex) {
       return ivec3(ix, iy, tileIndex);
     },
+    sample(u, v, tileIndex) {
+      return texture(tex, vec2(u, v)).depth(int(tileIndex));
+    },
     resize(width, height, nextTileCount) {
       currentEdgeVertexCount = width;
       currentTileCount = nextTileCount;
-      texture.setSize(width, height, nextTileCount);
-      texture.needsUpdate = true;
+      tex.setSize(width, height, nextTileCount);
+      tex.needsUpdate = true;
     }
   };
 }
@@ -550,7 +566,7 @@ function tryGetDeviceLimits(renderer) {
   return backend.backend?.device?.limits ?? {};
 }
 function createTerrainFieldStorage(edgeVertexCount, tileCount, renderer, options = {}) {
-  const filter = options.filter ?? "nearest";
+  const filter = options.filter ?? "linear";
   const format = options.format ?? "rgba16float";
   const forcedBackend = options.backend;
   if (forcedBackend === "atlas") {
@@ -591,8 +607,18 @@ function loadTerrainFieldElevation(storage, ix, iy, tileIndex) {
   return loadTerrainField(storage, ix, iy, tileIndex).r;
 }
 function loadTerrainFieldNormal(storage, ix, iy, tileIndex) {
-  const sample = loadTerrainField(storage, ix, iy, tileIndex);
-  return vec2(sample.g, sample.b);
+  const raw = loadTerrainField(storage, ix, iy, tileIndex);
+  return vec2(raw.g, raw.b);
+}
+function sampleTerrainField(storage, u, v, tileIndex) {
+  return storage.sample(u, v, tileIndex);
+}
+function sampleTerrainFieldElevation(storage, u, v, tileIndex) {
+  return sampleTerrainField(storage, u, v, tileIndex).r;
+}
+function sampleTerrainFieldNormal(storage, u, v, tileIndex) {
+  const raw = sampleTerrainField(storage, u, v, tileIndex);
+  return vec2(raw.g, raw.b);
 }
 function packTerrainFieldSample(height, normalXZ, extra = float(0)) {
   return vec4(height, normalXZ.x, normalXZ.y, extra);
@@ -722,6 +748,7 @@ const quadtreeUpdate = param({
   distanceFactor: 1.5
 }).displayName("quadtreeUpdate");
 const surface = param(null).displayName("surface");
+const terrainFieldFilter = param("linear").displayName("terrainFieldFilter");
 const elevationFn = param(() => float(0));
 
 function createLeafStorage(maxNodes) {
@@ -1533,11 +1560,13 @@ const createTerrainFieldTextureTask = task(
   (get, work, { resources }) => {
     const edgeVertexCount = get(innerTileSegments) + 3;
     const maxNodesValue = get(maxNodes);
+    const filter = get(terrainFieldFilter);
     return work(
       () => createTerrainFieldStorage(
         edgeVertexCount,
         maxNodesValue,
-        resources?.renderer
+        resources?.renderer,
+        { filter }
       )
     );
   }
@@ -1812,4 +1841,4 @@ const voronoiCells = Fn((params) => {
   return k;
 });
 
-export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };
+export { ArrayTextureBackend, AtlasBackend, Dir, TerrainGeometry, TerrainMesh, Texture3DBackend, U32_EMPTY, allocLeafSet, allocSeamTable, beginUpdate, blendAngleCorrectedNormals, buildLeafIndex, buildSeams2to1, compileComputeTask, createComputePipelineTasks, createCubeSphereSurface, createElevationFieldContextTask, createFlatSurface, createInfiniteFlatSurface, createSpatialIndex, createState, createTerrainFieldStorage, createTerrainFieldTextureTask, createTerrainUniforms, createUniformsTask, deriveNormalZ, elevationFieldStageTask, elevationFn, elevationScale, executeComputeTask, getDeviceComputeLimits, innerTileSegments, instanceIdTask, isSkirtUV, isSkirtVertex, leafGpuBufferTask, leafStorageTask, loadTerrainField, loadTerrainFieldElevation, loadTerrainFieldNormal, maxLevel, maxNodes, origin, packTerrainFieldSample, positionNodeTask, quadtreeConfigTask, quadtreeUpdate, quadtreeUpdateTask, resetLeafSet, resetSeamTable, rootSize, sampleTerrainField, sampleTerrainFieldElevation, sampleTerrainFieldNormal, skirtScale, storeTerrainField, surface, surfaceTask, terrainFieldFilter, terrainFieldStageTask, terrainGraph, terrainTasks, textureSpaceToVectorSpace, tileNodesTask, update, updateUniformsTask, vElevation, vGlobalVertexIndex, vectorSpaceToTextureSpace, voronoiCells };

package/package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/kenjinp/hello-terrain.git"
   },
-  "version": "0.0.0-alpha.7",
+  "version": "0.0.0-alpha.8",
   "type": "module",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",