spoint 0.1.602 → 0.1.603

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spoint",
-  "version": "0.1.602",
+  "version": "0.1.603",
   "description": "Physics and netcode SDK for multiplayer game servers",
   "type": "module",
   "workspaces": [

package/src/terrain/SplineCarve.js

@@ -6,6 +6,15 @@ function cellKey(cx, cz) {
   return (cx + OFF) * BIG + (cz + OFF)
 }
 
+function carveHash(seed, i) {
+  let h = seed | 0
+  h = Math.imul(h ^ (i | 0), 0x27d4eb2d) >>> 0
+  h ^= h >>> 15; h = Math.imul(h, 0x2c1b3c6d) >>> 0
+  h ^= h >>> 12; h = Math.imul(h, 0x297a2d39) >>> 0
+  h ^= h >>> 15
+  return (h >>> 0) / 4294967296
+}
+
 function catmullRom(p0, p1, p2, p3, t) {
   const getX = (p) => Array.isArray(p) ? p[0] : p.x
   const getZ = (p) => Array.isArray(p) ? p[1] : p.z
@@ -134,30 +143,47 @@ export function createSplineCarveLayer() {
   const cells = new Map()
   const appliedSplines = []
 
-  function carve(controlPoints, width, depth, kind, baseHeightFn) {
+  function carve(controlPoints, width, depth, kind, baseHeightFn, opts = {}) {
     if (!Array.isArray(controlPoints) || controlPoints.length < 2) return { touched: 0 }
     if (!Number.isFinite(width) || width <= 0 || !Number.isFinite(depth)) return { touched: 0 }
     if (kind !== 'river' && kind !== 'road') return { touched: 0 }
+    const { seed = 0, widthVariance = 0, bankErosion = 0 } = opts
+    const isRiver = kind === 'river'
     const stepSize = Math.max(1, width * 0.5)
     const spinePoints = sampleSpline(controlPoints, stepSize)
     if (spinePoints.length === 0) return { touched: 0 }
-    const halfWidth = width * 0.5
+    const maxHalfWidth = (width * 0.5) * (1 + (isRiver ? widthVariance : 0)) + (isRiver ? bankErosion : 0)
     let touched = 0
-    for (const sp of spinePoints) {
+    let arcLen = 0
+    for (let si = 0; si < spinePoints.length; si++) {
+      const sp = spinePoints[si]
       const sx = sp.x, sz = sp.z
-      const cx0 = Math.floor((sx - halfWidth) / CELL_M), cx1 = Math.ceil((sx + halfWidth) / CELL_M)
-      const cz0 = Math.floor((sz - halfWidth) / CELL_M), cz1 = Math.ceil((sz + halfWidth) / CELL_M)
+      if (si > 0) { const px = spinePoints[si - 1].x, pz = spinePoints[si - 1].z; arcLen += Math.hypot(sx - px, sz - pz) }
+      let halfWidth = width * 0.5
+      if (isRiver && widthVariance > 0) {
+        const t = carveHash(seed, Math.round(arcLen * 0.1))
+        halfWidth *= 1 + (t * 2 - 1) * widthVariance
+      }
+      const cx0 = Math.floor((sx - maxHalfWidth) / CELL_M), cx1 = Math.ceil((sx + maxHalfWidth) / CELL_M)
+      const cz0 = Math.floor((sz - maxHalfWidth) / CELL_M), cz1 = Math.ceil((sz + maxHalfWidth) / CELL_M)
       for (let cz = cz0; cz <= cz1; cz++) {
         for (let cx = cx0; cx <= cx1; cx++) {
           const cMinX = cx * CELL_M, cMinZ = cz * CELL_M
+          const ccx = cMinX + CELL_M * 0.5, ccz = cMinZ + CELL_M * 0.5
+          let bankOffset = 0
+          if (isRiver && bankErosion > 0) {
+            const angle = carveHash(seed ^ 0x5bd1e995, cx * 92821 + cz) * Math.PI * 2
+            bankOffset = (carveHash(seed ^ 0x1b873593, cx * 15485863 + cz) * 2 - 1) * bankErosion * (0.5 + 0.5 * Math.cos(angle))
+          }
+          const cellHalfWidth = halfWidth + bankOffset
+          if (cellHalfWidth <= 0) continue
           const nearestX = Math.max(cMinX, Math.min(sx, cMinX + CELL_M))
           const nearestZ = Math.max(cMinZ, Math.min(sz, cMinZ + CELL_M))
           const d = Math.hypot(nearestX - sx, nearestZ - sz)
-          if (d > halfWidth) continue
-          const ccx = cMinX + CELL_M * 0.5, ccz = cMinZ + CELL_M * 0.5
+          if (d > cellHalfWidth) continue
           const dCenter = Math.hypot(ccx - sx, ccz - sz)
-          const falloffDist = Math.min(dCenter, halfWidth)
-          const falloff = 0.5 * (1 + Math.cos((falloffDist / halfWidth) * Math.PI))
+          const falloffDist = Math.min(dCenter, cellHalfWidth)
+          const falloff = 0.5 * (1 + Math.cos((falloffDist / cellHalfWidth) * Math.PI))
           const key = cellKey(cx, cz)
           const base = typeof baseHeightFn === 'function' ? baseHeightFn(ccx, ccz) : null
           const targetDelta = Number.isFinite(base) ? -depth * falloff : 0
@@ -169,7 +195,7 @@ export function createSplineCarveLayer() {
         }
       }
     }
-    if (touched > 0) appliedSplines.push({ controlPoints: controlPoints.map(p => Array.isArray(p) ? [p[0], p[1]] : [p.x, p.z]), width, depth, kind })
+    if (touched > 0) appliedSplines.push({ controlPoints: controlPoints.map(p => Array.isArray(p) ? [p[0], p[1]] : [p.x, p.z]), width, depth, kind, seed, widthVariance, bankErosion })
     return { touched }
   }
 
@@ -224,7 +250,7 @@ export function loadSplineCarveLayer(json, baseHeightFn) {
   if (json && Array.isArray(json.splines)) {
     for (const s of json.splines) {
       if (!s || !Array.isArray(s.controlPoints) || !Number.isFinite(s.width) || !Number.isFinite(s.depth)) continue
-      layer.carve(s.controlPoints, s.width, s.depth, s.kind, baseHeightFn)
+      layer.carve(s.controlPoints, s.width, s.depth, s.kind, baseHeightFn, { seed: s.seed ?? 0, widthVariance: s.widthVariance ?? 0, bankErosion: s.bankErosion ?? 0 })
     }
   }
   return layer